From 244111330bb2aadbd1f05e0e312b296031121a0d Mon Sep 17 00:00:00 2001
From: Ilia Malanin <iliam@pastila.org>
Date: Fri, 13 Feb 2026 23:52:42 +0100
Subject: [PATCH] shell: Preserve maximized/snapped state on move between
 workspaces

---
 src/shell/mod.rs | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index a15f03c3..8023558d 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -3349,13 +3349,31 @@ impl Shell {
 
         let to_workspace = self.workspaces.space_for_handle_mut(to).unwrap(); // checked above
         if !to_workspace.tiling_enabled {
-            let position = match window_state {
-                WorkspaceRestoreData::Floating(Some(data)) => {
-                    Some(data.position_relative(to_workspace.output.geometry().size.as_logical()))
-                }
-                _ => None,
+            let (position, was_maximized, was_snapped) = match &window_state {
+                WorkspaceRestoreData::Floating(Some(data)) => (
+                    Some(data.position_relative(to_workspace.output.geometry().size.as_logical())),
+                    data.was_maximized,
+                    data.was_snapped,
+                ),
+                _ => (None, false, None),
             };
             to_workspace.floating_layer.map(mapped.clone(), position);
+            if was_maximized {
+                let geometry = to_workspace.floating_layer.element_geometry(mapped).unwrap();
+                *mapped.maximized_state.lock().unwrap() = Some(MaximizedState {
+                    original_geometry: geometry,
+                    original_layer: ManagedLayer::Floating,
+                });
+                to_workspace
+                    .floating_layer
+                    .map_maximized(mapped.clone(), geometry, false);
+            } else if let Some(corners) = was_snapped {
+                *mapped.floating_tiled.lock().unwrap() = Some(corners);
+                mapped.set_tiled(true);
+                let snapped_geo = to_workspace.floating_layer.snapped_geometry(&corners);
+                mapped.set_geometry(snapped_geo.to_global(&to_workspace.output));
+                mapped.configure();
+            }
         } else {
             for mapped in to_workspace
                 .mapped()