Fix sticky toggle on maximized windows

pop-os · Jan 3, 2025 · ae38783 · ae38783
1 parent 9b78a2d
commit ae38783
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/src/shell/mod.rs b/src/shell/mod.rs
@@ -3604,6 +3604,27 @@ impl Shell {
                 ManagedLayer::Sticky => unreachable!(),
                 _ => workspace.floating_layer.map(mapped.clone(), geometry.loc),
             }
+
+            let mut state = mapped.maximized_state.lock().unwrap();
+            if let Some(MaximizedState {
+                original_geometry,
+                original_layer: _,
+            }) = *state
+            {
+                *state = Some(MaximizedState {
+                    original_geometry,
+                    original_layer: mapped
+                        .previous_layer
+                        .lock()
+                        .unwrap()
+                        .take()
+                        .unwrap_or(ManagedLayer::Floating),
+                });
+                std::mem::drop(state);
+                workspace
+                    .floating_layer
+                    .map_maximized(mapped.clone(), geometry, false);
+            }
         }
 
         self.append_focus_stack(&mapped, seat);