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

Merge remote-tracking branch 'origin/rich_text2' into editor2

Browse source
This commit is contained in:
Nathan Sobo 2023-11-02 20:34:52 -06:00
commit 2a12e8f307
15 changed files with 930 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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);