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

focus: Fix active/focused output on refresh_focus

Browse source 
Previously removing the last output could have left seats with an
invalid active output. We already have logic to check this in
`refresh_focus` but failed to apply it before `update_pointer_focus`.
Let's fix that.
This commit is contained in:
Victoria Brekenfeld 2024-12-16 20:14:37 +01:00
parent f2e53f09c9
commit 7ac204ee79
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -344,19 +344,27 @@ impl Common {
.cloned()
.collect::<Vec<_>>();
for seat in &seats {
update_pointer_focus(state, &seat);
{
let shell = state.common.shell.read().unwrap();
let focused_output = seat.focused_output();
let active_output = seat.active_output();
let mut shell = state.common.shell.write().unwrap();
let output = seat.focused_or_active_output();
// If the focused or active output is not in the list of outputs, switch to the first output
if !shell.outputs().any(|o| o == &output) {
if let Some(other) = shell.outputs().next() {
seat.set_active_output(other);
// If the focused or active output is not in the list of outputs, switch to the first output
if focused_output.is_some_and(|f| !shell.outputs().any(|o| &f == o)) {
seat.set_focused_output(None);
}
if !shell.outputs().any(|o| o == &active_output) {
if let Some(other) = shell.outputs().next() {
seat.set_active_output(other);
}
continue;
}
continue;
}
update_pointer_focus(state, &seat);
let output = seat.focused_or_active_output();
let mut shell = state.common.shell.write().unwrap();
let last_known_focus = ActiveFocus::get(&seat);
if let Some(target) = last_known_focus {