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

shell: Return surface from take_fullscreen for symmetry with remove_fullscreen

Browse source
This commit is contained in:
Ilia Malanin 2026-03-13 22:19:09 +01:00 • committed by Victoria Brekenfeld
parent 07d584dadd
commit 06ece0fdcd
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shell/mod.rs
View file

@ -3130,7 +3130,7 @@ impl Shell {
let is_minimized = window.is_minimized(); let is_minimized = window.is_minimized();
let is_fullscreen = from_workspace.get_fullscreen().is_some_and(|f| f == window); let is_fullscreen = from_workspace.get_fullscreen().is_some_and(|f| f == window);
let mut window_state = if is_fullscreen { let mut window_state = if is_fullscreen {
let (previous_state, previous_geometry) = from_workspace.take_fullscreen().unwrap(); let (_, previous_state, previous_geometry) = from_workspace.take_fullscreen().unwrap();
WorkspaceRestoreData::Fullscreen(previous_state.zip(previous_geometry).map( WorkspaceRestoreData::Fullscreen(previous_state.zip(previous_geometry).map(
|(previous_state, previous_geometry)| FullscreenRestoreData { |(previous_state, previous_geometry)| FullscreenRestoreData {
previous_state, previous_state,

7
src/shell/workspace.rs
View file

@ -1239,6 +1239,7 @@ impl Workspace {
pub fn take_fullscreen( pub fn take_fullscreen(
&mut self, &mut self,
) -> Option<( ) -> Option<(
CosmicSurface,
Option<FullscreenRestoreState>, Option<FullscreenRestoreState>,
Option<Rectangle<i32, Local>>, Option<Rectangle<i32, Local>>,
)> { )> {
@ -1248,7 +1249,11 @@ impl Workspace {
focus_stack.retain(|t| t != &surface.surface); focus_stack.retain(|t| t != &surface.surface);
} }
Some((surface.previous_state, surface.previous_geometry)) Some((
surface.surface,
surface.previous_state,
surface.previous_geometry,
))
} }
#[must_use] #[must_use]