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

shell: fix fullscreening tiled windows

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-12-23 22:49:56 +00:00 • committed by Victoria Brekenfeld
parent c306e11a22
commit 2174474012
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/shell/mod.rs
View file

@ -2622,20 +2622,22 @@ impl Shell {
} }
pub fn maximize_request(&mut self, mapped: &CosmicMapped) { pub fn maximize_request(&mut self, mapped: &CosmicMapped) {
let (managed_layer, floating_layer) = if let Some(set) = self let (original_layer, floating_layer, original_geometry) = if let Some(set) = self
.workspaces .workspaces
.sets .sets
.values_mut() .values_mut()
.find(|set| set.sticky_layer.mapped().any(|m| m == mapped)) .find(|set| set.sticky_layer.mapped().any(|m| m == mapped))
{ {
(ManagedLayer::Sticky, &mut set.sticky_layer) let geometry = set.sticky_layer.element_geometry(mapped).unwrap();
(ManagedLayer::Sticky, &mut set.sticky_layer, geometry)
} else if let Some(workspace) = self.space_for_mut(&mapped) { } else if let Some(workspace) = self.space_for_mut(&mapped) {
let layer = if workspace.is_floating(&mapped) { let layer = if workspace.is_floating(&mapped) {
ManagedLayer::Floating ManagedLayer::Floating
} else { } else {
ManagedLayer::Tiling ManagedLayer::Tiling
}; };
(layer, &mut workspace.floating_layer) let geometry = workspace.element_geometry(mapped).unwrap();
(layer, &mut workspace.floating_layer, geometry)
} else { } else {
return; return;
}; };
@ -2643,8 +2645,8 @@ impl Shell {
let mut state = mapped.maximized_state.lock().unwrap(); let mut state = mapped.maximized_state.lock().unwrap();
if state.is_none() { if state.is_none() {
*state = Some(MaximizedState { *state = Some(MaximizedState {
original_geometry: floating_layer.element_geometry(&mapped).unwrap(), original_geometry,
original_layer: managed_layer, original_layer,
}); });
std::mem::drop(state); std::mem::drop(state);
floating_layer.map_maximized(mapped.clone()); floating_layer.map_maximized(mapped.clone());