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

shell: Populate focus_stack when unstacking

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-07-03 21:04:28 +02:00
parent dc882ffc36
commit b9a323c9ff
4 changed files with 61 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/shell/mod.rs
View file

@ -3076,19 +3076,29 @@ impl Shell {
}
#[must_use]
pub fn toggle_stacking(&mut self, window: &CosmicMapped) -> Option<KeyboardFocusTarget> {
pub fn toggle_stacking(
&mut self,
seat: &Seat<State>,
window: &CosmicMapped,
) -> Option<KeyboardFocusTarget> {
if let Some(set) = self
.workspaces
.sets
.values_mut()
.find(|set| set.sticky_layer.mapped().any(|m| m == window))
{
set.sticky_layer.toggle_stacking(window)
let workspace = &mut set.workspaces[set.active];
set.sticky_layer
.toggle_stacking(window, workspace.focus_stack.get_mut(seat))
} else if let Some(workspace) = self.space_for_mut(window) {
if workspace.tiling_layer.mapped().any(|(m, _)| m == window) {
workspace.tiling_layer.toggle_stacking(window)
workspace
.tiling_layer
.toggle_stacking(window, workspace.focus_stack.get_mut(seat))
} else if workspace.floating_layer.mapped().any(|w| w == window) {
workspace.floating_layer.toggle_stacking(window)
workspace
.floating_layer
.toggle_stacking(window, workspace.focus_stack.get_mut(seat))
} else {
None
}