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

focus: Only consider focused output

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-12-05 18:31:34 +01:00 • committed by Victoria Brekenfeld
parent fce52cb6a2
commit 7829e7696d
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/shell/focus/mod.rs
View file

@ -172,7 +172,7 @@ impl Shell {
let focused_windows = self let focused_windows = self
.seats .seats
.iter() .iter()
.flat_map(|seat| { .map(|seat| {
if matches!( if matches!(
seat.get_keyboard().unwrap().current_focus(), seat.get_keyboard().unwrap().current_focus(),
Some(KeyboardFocusTarget::Group(_)) Some(KeyboardFocusTarget::Group(_))
@ -180,11 +180,10 @@ impl Shell {
return None; return None;
} }
Some(self.outputs().flat_map(|o| { let output = seat.focused_or_active_output();
let space = self.active_space(o); let space = self.active_space(&output);
let stack = space.focus_stack.get(seat); let stack = space.focus_stack.get(seat);
stack.last().cloned() stack.last().cloned()
}))
}) })
.flatten() .flatten()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -223,7 +222,7 @@ impl Shell {
for window in workspace.mapped() { for window in workspace.mapped() {
window.set_activated(false); window.set_activated(false);
window.configure(); window.configure();
} }
} }
} }
} }