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

Don't unnecessarily use Option in WorkspaceRestoreData

Browse source 
Unless we expect to need this again in the future, it's best not to have
an `Option` here unnecessarily.
This commit is contained in:
Ian Douglas Scott 2026-06-23 14:49:11 -07:00 • committed by Ian Douglas Scott
parent 9e6d46c17e
commit 5c0c22988e
2 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/shell/workspace.rs
View file

@ -282,8 +282,8 @@ impl FullscreenRestoreState {
#[derive(Debug, Clone)]
pub enum WorkspaceRestoreData {
Fullscreen(Option<FullscreenRestoreData>),
Tiling(Option<TilingRestoreData>),
Floating(Option<FloatingRestoreData>),
Tiling(TilingRestoreData),
Floating(FloatingRestoreData),
Stack(StackRestoreData),
}
@ -643,32 +643,30 @@ impl Workspace {
mapped.set_minimized(false);
return Some(match state {
MinimizedWindow::Floating { previous, .. } => {
WorkspaceRestoreData::Floating(Some(previous))
}
MinimizedWindow::Tiling { previous, .. } => {
WorkspaceRestoreData::Tiling(Some(previous))
WorkspaceRestoreData::Floating(previous)
}
MinimizedWindow::Tiling { previous, .. } => WorkspaceRestoreData::Tiling(previous),
MinimizedWindow::Fullscreen { .. } => unreachable!(),
});
}
if let Ok(state) = self.tiling_layer.unmap(mapped, None) {
return Some(WorkspaceRestoreData::Tiling(Some(TilingRestoreData {
return Some(WorkspaceRestoreData::Tiling(TilingRestoreData {
state,
was_maximized: was_maximized.is_some(),
})));
}));
}
let was_snapped = *mapped.floating_tiled.lock().unwrap();
// unmaximize_request might have triggered a `floating_layer.refresh()`,
// which may have already removed a non-alive surface.
if let Some(floating_geometry) = self.floating_layer.unmap(mapped, None).or(was_maximized) {
return Some(WorkspaceRestoreData::Floating(Some(FloatingRestoreData {
return Some(WorkspaceRestoreData::Floating(FloatingRestoreData {
geometry: floating_geometry,
output_size: self.output.geometry().size.as_logical(),
was_maximized: was_maximized.is_some(),
was_snapped,
})));
}));
};
None