From 54969877a4660ea4cb2691d9f2daecd52780b4bf Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 2 Nov 2023 21:17:31 +0100
Subject: [PATCH] Make the Zed2 window movable (#3218)

This PR makes the Zed2 window movable and fixes a crash related to a
`todo!()` that wasn't necessary.

Release Notes:

- N/A
---
 crates/workspace2/src/dock.rs       |  2 +-
 crates/workspace2/src/workspace2.rs |  6 +++---
 crates/zed2/src/zed2.rs             | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/crates/workspace2/src/dock.rs b/crates/workspace2/src/dock.rs
index 20a06d165891fe91ac461d24e8cadc723a549813..9da9123a2f980b017f46835decb6c744f96c601f 100644
--- a/crates/workspace2/src/dock.rs
+++ b/crates/workspace2/src/dock.rs
@@ -622,7 +622,7 @@ impl StatusItemView for PanelButtons {
         _active_pane_item: Option<&dyn crate::ItemHandle>,
         _cx: &mut ViewContext<Self>,
     ) {
-        todo!()
+        // todo!(This is empty in the old `workspace::dock`)
     }
 }
 
diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs
index 6d29751073e386cfd04c871df6e333e267fda51c..3d9b86a0513c2a7aed03dc9d8398e0a399d0f8c2 100644
--- a/crates/workspace2/src/workspace2.rs
+++ b/crates/workspace2/src/workspace2.rs
@@ -1043,9 +1043,9 @@ impl Workspace {
     //         dock.update(cx, |dock, cx| dock.add_panel(panel, cx));
     //     }
 
-    //     pub fn status_bar(&self) -> &View<StatusBar> {
-    //         &self.status_bar
-    //     }
+    pub fn status_bar(&self) -> &View<StatusBar> {
+        &self.status_bar
+    }
 
     pub fn app_state(&self) -> &Arc<AppState> {
         &self.app_state
diff --git a/crates/zed2/src/zed2.rs b/crates/zed2/src/zed2.rs
index 04778f29dd8e96ad6d440faeb83d7caed43eff1e..4f285360853d104d8d8be6017738cb8f8fca58d3 100644
--- a/crates/zed2/src/zed2.rs
+++ b/crates/zed2/src/zed2.rs
@@ -242,7 +242,7 @@ pub fn build_window_options(
         focus: false,
         show: false,
         kind: WindowKind::Normal,
-        is_movable: false,
+        is_movable: true,
         display_id: display.map(|display| display.id()),
     }
 }
@@ -317,16 +317,16 @@ pub fn initialize_workspace(
             //         feedback::deploy_feedback_button::DeployFeedbackButton::new(workspace)
             //     });
             //     let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new());
-            //     workspace.status_bar().update(cx, |status_bar, cx| {
-            //         status_bar.add_left_item(diagnostic_summary, cx);
-            //         status_bar.add_left_item(activity_indicator, cx);
+            workspace.status_bar().update(cx, |status_bar, cx| {
+                // status_bar.add_left_item(diagnostic_summary, cx);
+                // status_bar.add_left_item(activity_indicator, cx);
 
-            //         status_bar.add_right_item(feedback_button, cx);
-            //         status_bar.add_right_item(copilot, cx);
-            //         status_bar.add_right_item(active_buffer_language, cx);
-            //         status_bar.add_right_item(vim_mode_indicator, cx);
-            //         status_bar.add_right_item(cursor_position, cx);
-            //     });
+                // status_bar.add_right_item(feedback_button, cx);
+                // status_bar.add_right_item(copilot, cx);
+                // status_bar.add_right_item(active_buffer_language, cx);
+                // status_bar.add_right_item(vim_mode_indicator, cx);
+                // status_bar.add_right_item(cursor_position, cx);
+            });
 
             //     auto_update::notify_of_any_new_update(cx.weak_handle(), cx);