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

workspace: potential crash fix

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-10-12 12:05:43 +02:00
parent 64143e75e7
commit ab522dc4ca
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/shell/workspace.rs
View file

@ -346,7 +346,7 @@ impl Workspace {
.unwrap_or(false) .unwrap_or(false)
.then(|| self.fullscreen.take().unwrap()); .then(|| self.fullscreen.take().unwrap());
if mapped.is_maximized(true) { if mapped.maximized_state.lock().unwrap().is_some() {
// If surface is maximized then unmaximize it, so it is assigned to only one layer // If surface is maximized then unmaximize it, so it is assigned to only one layer
let _ = self.unmaximize_request(&mapped.active_window()); let _ = self.unmaximize_request(&mapped.active_window());
} }
@ -657,7 +657,7 @@ impl Workspace {
.loc .loc
.to_global(&self.output); .to_global(&self.output);
if mapped.is_maximized(true) { if mapped.maximized_state.lock().unwrap().is_some() {
// If surface is maximized then unmaximize it // If surface is maximized then unmaximize it
let new_size = self.unmaximize_request(window); let new_size = self.unmaximize_request(window);
let ratio = pos.x / output.geometry().size.w as f64; let ratio = pos.x / output.geometry().size.w as f64;
@ -669,7 +669,7 @@ impl Workspace {
} }
let was_floating = self.floating_layer.unmap(&mapped); let was_floating = self.floating_layer.unmap(&mapped);
let was_tiled = dbg!(self.tiling_layer.unmap_as_placeholder(&mapped)); let was_tiled = self.tiling_layer.unmap_as_placeholder(&mapped);
assert!(was_floating != was_tiled.is_some()); assert!(was_floating != was_tiled.is_some());
Some(MoveGrab::new( Some(MoveGrab::new(