layout: Preserve the Tile when moving across workspaces

YaLTeR · Dec 22, 2024 · b6101ea · b6101ea
1 parent 4ff4bfb
commit b6101ea
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 24 deletions.
diff --git a/src/layout/floating.rs b/src/layout/floating.rs
@@ -606,6 +606,9 @@ impl<W: LayoutElement> FloatingSpace<W> {
 
         let win_size = Size::from((win_width, win_height));
         win.request_size_once(win_size, animate);
+
+        // Store it right away so pending resizes are not lost when moving across floating spaces.
+        tile.set_floating_window_size(win_size);
     }
 
     pub fn set_window_height(&mut self, id: Option<&W::Id>, change: SizeChange, animate: bool) {
@@ -636,6 +639,9 @@ impl<W: LayoutElement> FloatingSpace<W> {
 
         let win_size = Size::from((win_width, win_height));
         win.request_size_once(win_size, animate);
+
+        // Store it right away so pending resizes are not lost when moving across floating spaces.
+        tile.set_floating_window_size(win_size);
     }
 
     fn focus_directional(

diff --git a/src/layout/monitor.rs b/src/layout/monitor.rs
@@ -530,14 +530,18 @@ impl<W: LayoutElement> Monitor<W> {
             return;
         };
 
-        self.add_window(
-            new_idx,
-            removed.tile.into_window(),
-            true,
-            removed.width,
-            removed.is_full_width,
-            removed.is_floating,
-        );
+        if removed.is_floating {
+            self.add_floating_tile(new_idx, removed.tile, None, true);
+        } else {
+            self.add_tile(
+                new_idx,
+                None,
+                removed.tile,
+                true,
+                removed.width,
+                removed.is_full_width,
+            );
+        }
     }
 
     pub fn move_to_workspace_down(&mut self) {
@@ -553,14 +557,18 @@ impl<W: LayoutElement> Monitor<W> {
             return;
         };
 
-        self.add_window(
-            new_idx,
-            removed.tile.into_window(),
-            true,
-            removed.width,
-            removed.is_full_width,
-            removed.is_floating,
-        );
+        if removed.is_floating {
+            self.add_floating_tile(new_idx, removed.tile, None, true);
+        } else {
+            self.add_tile(
+                new_idx,
+                None,
+                removed.tile,
+                true,
+                removed.width,
+                removed.is_full_width,
+            );
+        }
     }
 
     pub fn move_to_workspace(&mut self, window: Option<&W::Id>, idx: usize) {
@@ -592,14 +600,18 @@ impl<W: LayoutElement> Monitor<W> {
             return;
         };
 
-        self.add_window(
-            new_idx,
-            removed.tile.into_window(),
-            activate,
-            removed.width,
-            removed.is_full_width,
-            removed.is_floating,
-        );
+        if removed.is_floating {
+            self.add_floating_tile(new_idx, removed.tile, None, activate);
+        } else {
+            self.add_tile(
+                new_idx,
+                None,
+                removed.tile,
+                activate,
+                removed.width,
+                removed.is_full_width,
+            );
+        }
 
         if self.workspace_switch.is_none() {
             self.clean_up_workspaces();