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

actions: Shortcut handling changes for #1005

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-02-26 17:13:31 +01:00 • committed by Victoria Brekenfeld
parent 638684642c
commit d76f372c29
6 changed files with 286 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/shell/mod.rs
View file

@ -2653,11 +2653,27 @@ impl Shell {
) -> Result<Option<(KeyboardFocusTarget, Point<i32, Global>)>, InvalidWorkspaceIndex> {
let (to_output, to_idx) = to;
let to_idx = to_idx.unwrap_or(self.workspaces.active_num(to_output).1);
let from_idx = self.workspaces.active_num(from_output).1;
if from_output == to_output && to_idx == self.workspaces.active_num(from_output).1 {
return Ok(None);
}
if from_output == to_output
&& to_idx.checked_sub(1).is_some_and(|idx| idx == from_idx)
&& to_idx == self.workspaces.len(to_output) - 1
&& self
.workspaces
.get(from_idx, from_output)
.is_some_and(|w| w.mapped().count() == 1)
&& self
.workspaces
.get(to_idx, to_output)
.is_some_and(|w| w.is_empty())
{
return Err(InvalidWorkspaceIndex);
}
let to = self
.workspaces
.get(to_idx, to_output)