oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move channels panel into collab and rename to collab panel

Browse Source 
remove contacts popover and add to collab panel
This commit is contained in:
Mikayla Maki
2023-07-28 13:24:42 -07:00
parent fe5db3035f
commit 7f9df6dd24
18 changed files with 95 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/zed/src/main.rs
-1
View File
@@ -155,7 +155,6 @@ fn main() {
outline::init(cx);
project_symbols::init(cx);
project_panel::init(Assets, cx);
channels::init(client.clone(), cx);
diagnostics::init(cx);
search::init(cx);
semantic_index::init(fs.clone(), http.clone(), languages.clone(), cx);
crates/zed/src/zed.rs
+7 -19
View File
@@ -9,9 +9,8 @@ use ai::AssistantPanel;
use anyhow::Context;
use assets::Assets;
use breadcrumbs::Breadcrumbs;
use channels::ChannelsPanel;
pub use client;
use collab_ui::{CollabTitlebarItem, ToggleContactsMenu};
use collab_ui::CollabTitlebarItem; // TODO: Add back toggle collab ui shortcut
use collections::VecDeque;
pub use editor;
use editor::{Editor, MultiBuffer};
@@ -86,20 +85,6 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::AppContext) {
cx.toggle_full_screen();
},
);
cx.add_action(
|workspace: &mut Workspace, _: &ToggleContactsMenu, cx: &mut ViewContext<Workspace>| {
if let Some(item) = workspace
.titlebar_item()
.and_then(|item| item.downcast::<CollabTitlebarItem>())
{
cx.defer(move |_, cx| {
item.update(cx, |item, cx| {
item.toggle_contacts_popover(&Default::default(), cx);
});
});
}
},
);
cx.add_global_action(quit);
cx.add_global_action(move |action: &OpenBrowser, cx| cx.platform().open_url(&action.url));
cx.add_global_action(move |_: &IncreaseBufferFontSize, cx| {
@@ -223,8 +208,10 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::AppContext) {
},
);
cx.add_action(
|workspace: &mut Workspace, _: &channels::ToggleFocus, cx: &mut ViewContext<Workspace>| {
workspace.toggle_panel_focus::<channels::ChannelsPanel>(cx);
|workspace: &mut Workspace,
_: &collab_ui::panel::ToggleFocus,
cx: &mut ViewContext<Workspace>| {
workspace.toggle_panel_focus::<collab_ui::panel::CollabPanel>(cx);
},
);
cx.add_action(
@@ -345,7 +332,8 @@ pub fn initialize_workspace(
let project_panel = ProjectPanel::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 channels_panel = ChannelsPanel::load(workspace_handle.clone(), cx.clone());
let channels_panel =
collab_ui::panel::CollabPanel::load(workspace_handle.clone(), cx.clone());
let (project_panel, terminal_panel, assistant_panel, channels_panel) = futures::try_join!(
project_panel,
terminal_panel,