Transfer move item implementation to PaneGroup

zed-industries · Dec 11, 2024 · 63a60f9 · 63a60f9
1 parent f6e85f3
commit 63a60f9
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 47 deletions.
diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rs
@@ -36,9 +36,9 @@ use workspace::{
     move_item, pane,
     ui::IconName,
     ActivateNextPane, ActivatePane, ActivatePaneInDirection, ActivatePreviousPane, DraggedTab,
-    ItemId, MovableActiveItem, MoveItemToPane, MoveItemToPaneInDirection, NewTerminal, Pane,
-    PaneGroup, SplitDirection, SplitDown, SplitLeft, SplitRight, SplitUp, SwapPaneInDirection,
-    ToggleZoom, Workspace,
+    ItemId, MoveItemToPane, MoveItemToPaneInDirection, NewTerminal, Pane, PaneGroup,
+    SplitDirection, SplitDown, SplitLeft, SplitRight, SplitUp, SwapPaneInDirection, ToggleZoom,
+    Workspace,
 };
 
 use anyhow::Result;
@@ -1145,7 +1145,13 @@ impl Render for TerminalPanel {
                         return;
                     };
                     let source_pane = terminal_panel.active_pane.clone();
-                    source_pane.move_active_item_to(target_pane, true, true, cx);
+                    terminal_panel.center.move_active_item(
+                        &source_pane,
+                        &target_pane,
+                        true,
+                        true,
+                        cx,
+                    );
                 }))
                 .on_action(cx.listener(
                     |terminal_panel, action: &MoveItemToPaneInDirection, cx| {
@@ -1157,7 +1163,13 @@ impl Render for TerminalPanel {
                         else {
                             return;
                         };
-                        source_pane.move_active_item_to(target_pane, true, true, cx);
+                        terminal_panel.center.move_active_item(
+                            &source_pane,
+                            &target_pane,
+                            true,
+                            true,
+                            cx,
+                        );
                     },
                 ))
             })

diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
@@ -121,6 +121,35 @@ impl PaneGroup {
         };
     }
 
+    pub fn move_active_item(
+        &self,
+        from: &View<Pane>,
+        to: &View<Pane>,
+        focus_target: bool,
+        close_if_empty: bool,
+        cx: &mut WindowContext,
+    ) {
+        if from == to {
+            return;
+        }
+        let Some(active_item) = from.read(cx).active_item() else {
+            return;
+        };
+        from.update(cx, |source_pane, cx| {
+            let item_id = active_item.item_id();
+            source_pane.remove_item(item_id, false, close_if_empty, cx);
+            to.update(cx, |target_pane, cx| {
+                target_pane.add_item(
+                    active_item,
+                    focus_target,
+                    focus_target,
+                    Some(target_pane.items_len()),
+                    cx,
+                );
+            });
+        });
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub fn render(
         &self,

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
@@ -2846,7 +2846,8 @@ impl Workspace {
         let Some(target_pane) = panes.get(action.0).map(|p| (*p).clone()) else {
             return;
         };
-        source_pane.move_active_item_to(target_pane, true, true, cx);
+        self.center
+            .move_active_item(&source_pane, &target_pane, true, true, cx);
     }
 
     pub fn activate_next_pane(&mut self, cx: &mut WindowContext) {
@@ -2974,7 +2975,8 @@ impl Workspace {
     ) {
         if let Some(target_pane) = self.find_pane_in_direction(direction, cx) {
             let source_pane = self.active_pane.clone();
-            source_pane.move_active_item_to(target_pane, true, true, cx);
+            self.center
+                .move_active_item(&source_pane, &target_pane, true, true, cx);
         }
     }
 
@@ -5171,46 +5173,6 @@ impl WorkspaceHandle for View<Workspace> {
     }
 }
 
-pub trait MovableActiveItem {
-    fn move_active_item_to(
-        &self,
-        target_pane: View<Pane>,
-        focus_target: bool,
-        close_if_empty: bool,
-        cx: &mut WindowContext,
-    );
-}
-
-impl MovableActiveItem for View<Pane> {
-    fn move_active_item_to(
-        &self,
-        target_pane: View<Pane>,
-        focus_target: bool,
-        close_if_empty: bool,
-        cx: &mut WindowContext,
-    ) {
-        if &target_pane == self {
-            return;
-        }
-        let Some(active_item) = self.read(cx).active_item() else {
-            return;
-        };
-        self.update(cx, |pane, cx| {
-            let item_id = active_item.item_id();
-            pane.remove_item(item_id, false, close_if_empty, cx);
-            target_pane.update(cx, |target_pane, cx| {
-                target_pane.add_item(
-                    active_item,
-                    focus_target,
-                    focus_target,
-                    Some(target_pane.items_len()),
-                    cx,
-                );
-            });
-        });
-    }
-}
-
 impl std::fmt::Debug for OpenPaths {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("OpenPaths")