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

shell: Restore fullscreen surface to stack

Browse source 
Previously, a surface that was in a stack that is fullscreened would be
removed from the stack, and on unfullscreening, restored to the
floating/tiling layer as though it were a new window outside the stack.

Instead, if the stack still exists, add the window to it at the same
position it previously occupied.
This commit is contained in:
Ian Douglas Scott 2026-06-18 20:41:28 -07:00 • committed by Ian Douglas Scott
parent f765696834
commit 9e6d46c17e
2 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/shell/mod.rs
View file

@ -2592,9 +2592,21 @@ impl Shell {
pub fn remap_unfullscreened_window(
&mut self,
surface: CosmicSurface,
state: Option<FullscreenRestoreState>,
mut state: Option<FullscreenRestoreState>,
loop_handle: &LoopHandle<'static, State>,
) -> CosmicMapped {
if let Some(FullscreenRestoreState::Stack { state: stack_state }) = &state {
if let Some(mapped) = self.mapped().find(|m| **m == stack_state.stack)
&& let Some(stack) = mapped.stack_ref()
{
let idx = stack_state.idx.min(stack.len());
stack.add_window(surface, Some(idx), None);
return mapped.clone();
} else {
state = None;
}
}
let window = CosmicMapped::from(CosmicWindow::new(
surface,
loop_handle.clone(),
@ -2637,7 +2649,9 @@ impl Shell {
workspace
}
None => self.workspaces.active_mut(&seat.active_output()).unwrap(),
Some(FullscreenRestoreState::Sticky { .. }) => unreachable!(),
Some(FullscreenRestoreState::Sticky { .. } | FullscreenRestoreState::Stack { .. }) => {
unreachable!()
}
};
let fullscreen_geometry = workspace.output.geometry().to_local(&workspace.output);
@ -2752,7 +2766,9 @@ impl Shell {
}
}
}
Some(FullscreenRestoreState::Sticky { .. }) => unreachable!(),
Some(FullscreenRestoreState::Sticky { .. } | FullscreenRestoreState::Stack { .. }) => {
unreachable!()
}
}
window
@ -4878,6 +4894,9 @@ impl Shell {
state,
})
}
WorkspaceRestoreData::Stack(stack_state) => {
Some(FullscreenRestoreState::Stack { state: stack_state })
}
WorkspaceRestoreData::Fullscreen(_) => unreachable!(),
},
Some(from),