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

shell: Fix stacking maximized windows

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-12-13 17:48:42 +01:00 • committed by Victoria Brekenfeld
parent 6707c92522
commit f2e53f09c9
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/shell/mod.rs
View file

@ -3501,7 +3501,12 @@ impl Shell {
let workspace = &mut set.workspaces[set.active]; let workspace = &mut set.workspaces[set.active];
let maybe_window = workspace.focus_stack.get(seat).iter().next().cloned(); let maybe_window = workspace.focus_stack.get(seat).iter().next().cloned();
if let Some(window) = maybe_window { if let Some(window) = maybe_window {
if set.sticky_layer.mapped().any(|m| m == &window) { let was_maximized = window.is_maximized(false);
if was_maximized {
workspace.unmaximize_request(&window);
}
let res = if set.sticky_layer.mapped().any(|m| m == &window) {
set.sticky_layer set.sticky_layer
.toggle_stacking_focused(seat, workspace.focus_stack.get_mut(seat)) .toggle_stacking_focused(seat, workspace.focus_stack.get_mut(seat))
} else if workspace.tiling_layer.mapped().any(|(m, _)| m == &window) { } else if workspace.tiling_layer.mapped().any(|(m, _)| m == &window) {
@ -3514,7 +3519,15 @@ impl Shell {
.toggle_stacking_focused(seat, workspace.focus_stack.get_mut(seat)) .toggle_stacking_focused(seat, workspace.focus_stack.get_mut(seat))
} else { } else {
None None
};
if was_maximized {
if let Some(KeyboardFocusTarget::Element(mapped)) = res.as_ref() {
self.maximize_request(mapped, seat);
}
} }
res
} else { } else {
None None
} }