leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gestures: Cycle through workspaces

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-11-18 18:21:24 +01:00 • committed by Jeremy Soller
parent 1f2863fa18
commit 8624928052
4 changed files with 123 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/input/actions.rs
View file

@ -1108,18 +1108,21 @@ fn to_next_workspace(
workspace_state: &mut WorkspaceUpdateGuard<'_, State>,
) -> Result<Point<i32, Global>, InvalidWorkspaceIndex> {
let current_output = seat.active_output();
let workspace = shell
.workspaces
.active_num(&current_output)
.1
.checked_add(1)
.ok_or(InvalidWorkspaceIndex)?;
let active = shell.workspaces.active_num(&current_output).1;
let mut workspace = active.checked_add(1).ok_or(InvalidWorkspaceIndex)?;
if workspace >= shell.workspaces.len(&current_output) {
workspace = 0;
}
if workspace == active {
return Err(InvalidWorkspaceIndex);
}
shell.activate(
&current_output,
workspace,
if gesture {
WorkspaceDelta::new_gesture()
WorkspaceDelta::new_gesture(true)
} else {
WorkspaceDelta::new_shortcut()
},
@ -1134,18 +1137,24 @@ fn to_previous_workspace(
workspace_state: &mut WorkspaceUpdateGuard<'_, State>,
) -> Result<Point<i32, Global>, InvalidWorkspaceIndex> {
let current_output = seat.active_output();
let workspace = shell
.workspaces
.active_num(&current_output)
.1
.checked_sub(1)
.ok_or(InvalidWorkspaceIndex)?;
let active = shell.workspaces.active_num(&current_output).1;
let workspace = active.checked_sub(1).unwrap_or(
shell
.workspaces
.len(&current_output)
.checked_sub(1)
.ok_or(InvalidWorkspaceIndex)?,
);
if workspace == active {
return Err(InvalidWorkspaceIndex);
}
shell.activate(
&current_output,
workspace,
if gesture {
WorkspaceDelta::new_gesture()
WorkspaceDelta::new_gesture(false)
} else {
WorkspaceDelta::new_shortcut()
},

4
src/input/mod.rs
View file

@ -1056,10 +1056,12 @@ impl State {
}
match gesture_state.action {
Some(SwipeAction::NextWorkspace) | Some(SwipeAction::PrevWorkspace) => {
Some(x @ SwipeAction::NextWorkspace)
| Some(x @ SwipeAction::PrevWorkspace) => {
self.common.shell.write().update_workspace_delta(
&seat.active_output(),
gesture_state.delta,
matches!(x, SwipeAction::NextWorkspace),
)
}
_ => {}