Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the Zed2 window movable (#3218)

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

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2023-11-02 21:17:31 +01:00 • committed by GitHub
parent 6eeaa64e62
commit 54969877a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/workspace2/src/dock.rs
View file

@ -622,7 +622,7 @@ impl StatusItemView for PanelButtons {
_active_pane_item: Option<&dyn crate::ItemHandle>, _active_pane_item: Option<&dyn crate::ItemHandle>,
_cx: &mut ViewContext<Self>, _cx: &mut ViewContext<Self>,
) { ) {
todo!() // todo!(This is empty in the old `workspace::dock`)
} }
} }

6
crates/workspace2/src/workspace2.rs
View file

@ -1043,9 +1043,9 @@ impl Workspace {
// dock.update(cx, |dock, cx| dock.add_panel(panel, cx)); // dock.update(cx, |dock, cx| dock.add_panel(panel, cx));
// } // }
// pub fn status_bar(&self) -> &View<StatusBar> { pub fn status_bar(&self) -> &View<StatusBar> {
// &self.status_bar &self.status_bar
// } }
pub fn app_state(&self) -> &Arc<AppState> { pub fn app_state(&self) -> &Arc<AppState> {
&self.app_state &self.app_state

20
crates/zed2/src/zed2.rs
View file

@ -242,7 +242,7 @@ pub fn build_window_options(
focus: false, focus: false,
show: false, show: false,
kind: WindowKind::Normal, kind: WindowKind::Normal,
is_movable: false, is_movable: true,
display_id: display.map(|display| display.id()), display_id: display.map(|display| display.id()),
} }
} }
@ -317,16 +317,16 @@ pub fn initialize_workspace(
// feedback::deploy_feedback_button::DeployFeedbackButton::new(workspace) // feedback::deploy_feedback_button::DeployFeedbackButton::new(workspace)
// }); // });
// let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new()); // let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new());
// workspace.status_bar().update(cx, |status_bar, cx| { workspace.status_bar().update(cx, |status_bar, cx| {
// status_bar.add_left_item(diagnostic_summary, cx); // status_bar.add_left_item(diagnostic_summary, cx);
// status_bar.add_left_item(activity_indicator, cx); // status_bar.add_left_item(activity_indicator, cx);
// status_bar.add_right_item(feedback_button, cx); // status_bar.add_right_item(feedback_button, cx);
// status_bar.add_right_item(copilot, cx); // status_bar.add_right_item(copilot, cx);
// status_bar.add_right_item(active_buffer_language, cx); // status_bar.add_right_item(active_buffer_language, cx);
// status_bar.add_right_item(vim_mode_indicator, cx); // status_bar.add_right_item(vim_mode_indicator, cx);
// status_bar.add_right_item(cursor_position, cx); // status_bar.add_right_item(cursor_position, cx);
// }); });
// auto_update::notify_of_any_new_update(cx.weak_handle(), cx); // auto_update::notify_of_any_new_update(cx.weak_handle(), cx);