layout: Replace move_window_to_output with move_to_output

3 files changed, 2 insertions, 36 deletions

diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index efb492a4..5b44caf0 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -474,7 +474,7 @@ impl ForeignToplevelHandler for State {
                 if &requested_output != current_output {
                     self.niri
                         .layout
-                        .move_window_to_output(&window, &requested_output);
+                        .move_to_output(Some(&window), &requested_output, None);
                 }
             }
 
diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs
index 031ef571..be7dc813 100644
--- a/src/handlers/xdg_shell.rs
+++ b/src/handlers/xdg_shell.rs
@@ -288,7 +288,7 @@ impl XdgShellHandler for State {
                 if &requested_output != current_output {
                     self.niri
                         .layout
-                        .move_window_to_output(&window, &requested_output);
+                        .move_to_output(Some(&window), &requested_output, None);
                 }
             }
 
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index 58be1e1f..710ba848 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -2173,40 +2173,6 @@ impl<W: LayoutElement> Layout<W> {
         }
     }
 
-    pub fn move_window_to_output(&mut self, window: &W::Id, output: &Output) {
-        let mut width = None;
-        let mut is_full_width = false;
-
-        if let MonitorSet::Normal { monitors, .. } = &mut self.monitor_set {
-            for mon in &*monitors {
-                for ws in &mon.workspaces {
-                    for col in &ws.columns {
-                        if col.contains(window) {
-                            width = Some(col.width);
-                            is_full_width = col.is_full_width;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        let Some(width) = width else { return };
-
-        let window = self.remove_window(window, Transaction::new()).unwrap();
-
-        if let MonitorSet::Normal { monitors, .. } = &mut self.monitor_set {
-            let new_idx = monitors
-                .iter()
-                .position(|mon| &mon.output == output)
-                .unwrap();
-
-            let workspace_idx = monitors[new_idx].active_workspace_idx;
-            // FIXME: activate only if it was already active and focused.
-            self.add_window_by_idx(new_idx, workspace_idx, window, true, width, is_full_width);
-        }
-    }
-
     pub fn move_workspace_to_output(&mut self, output: &Output) {
         let MonitorSet::Normal {
             monitors,