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

Uncomment enough to register the panel

Browse source
This commit is contained in:
Conrad Irwin 2023-11-15 16:44:21 -07:00
parent 793fa6e3a4
commit 7f70712dac
3 changed files with 3056 additions and 3032 deletions
Download patch file Download diff file Expand all files Collapse all files

6073
crates/collab_ui2/src/collab_panel.rs
View file

File diff suppressed because it is too large Load diff

3
crates/collab_ui2/src/collab_ui.rs
View file

@ -9,6 +9,7 @@ mod panel_settings;
use std::sync::Arc; use std::sync::Arc;
pub use collab_panel::CollabPanel;
pub use collab_titlebar_item::CollabTitlebarItem; pub use collab_titlebar_item::CollabTitlebarItem;
use gpui::AppContext; use gpui::AppContext;
pub use panel_settings::{ pub use panel_settings::{
@ -29,7 +30,7 @@ pub fn init(_app_state: &Arc<AppState>, cx: &mut AppContext) {
// vcs_menu::init(cx); // vcs_menu::init(cx);
collab_titlebar_item::init(cx); collab_titlebar_item::init(cx);
// collab_panel::init(cx); collab_panel::init(cx);
// chat_panel::init(cx); // chat_panel::init(cx);
// notifications::init(&app_state, cx); // notifications::init(&app_state, cx);

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

@ -383,8 +383,8 @@ pub fn initialize_workspace(
let project_panel = ProjectPanel::load(workspace_handle.clone(), cx.clone()); let project_panel = ProjectPanel::load(workspace_handle.clone(), cx.clone());
// let terminal_panel = TerminalPanel::load(workspace_handle.clone(), cx.clone()); // let terminal_panel = TerminalPanel::load(workspace_handle.clone(), cx.clone());
// let assistant_panel = AssistantPanel::load(workspace_handle.clone(), cx.clone()); // let assistant_panel = AssistantPanel::load(workspace_handle.clone(), cx.clone());
// let channels_panel = let channels_panel =
// collab_ui::collab_panel::CollabPanel::load(workspace_handle.clone(), cx.clone()); collab_ui::collab_panel::CollabPanel::load(workspace_handle.clone(), cx.clone());
// let chat_panel = // let chat_panel =
// collab_ui::chat_panel::ChatPanel::load(workspace_handle.clone(), cx.clone()); // collab_ui::chat_panel::ChatPanel::load(workspace_handle.clone(), cx.clone());
// let notification_panel = collab_ui::notification_panel::NotificationPanel::load( // let notification_panel = collab_ui::notification_panel::NotificationPanel::load(
@ -395,16 +395,16 @@ pub fn initialize_workspace(
project_panel, project_panel,
// terminal_panel, // terminal_panel,
// assistant_panel, // assistant_panel,
// channels_panel, channels_panel,
// chat_panel, // chat_panel,
// notification_panel, // notification_panel,
) = futures::try_join!( ) = futures::try_join!(
project_panel, project_panel,
// terminal_panel, // terminal_panel,
// assistant_panel, // assistant_panel,
// channels_panel, channels_panel,
// chat_panel, // chat_panel,
// notification_panel, // notification_panel,/
)?; )?;
workspace_handle.update(&mut cx, |workspace, cx| { workspace_handle.update(&mut cx, |workspace, cx| {
@ -412,7 +412,7 @@ pub fn initialize_workspace(
workspace.add_panel(project_panel, cx); workspace.add_panel(project_panel, cx);
// workspace.add_panel(terminal_panel, cx); // workspace.add_panel(terminal_panel, cx);
// workspace.add_panel(assistant_panel, cx); // workspace.add_panel(assistant_panel, cx);
// workspace.add_panel(channels_panel, cx); workspace.add_panel(channels_panel, cx);
// workspace.add_panel(chat_panel, cx); // workspace.add_panel(chat_panel, cx);
// workspace.add_panel(notification_panel, cx); // workspace.add_panel(notification_panel, cx);