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

Enable panel switching

Browse source
This commit is contained in:
Conrad Irwin 2023-11-15 21:01:00 -07:00
parent 7f70712dac
commit 0a9fb3978b
15 changed files with 203 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,8 +158,9 @@ actions!(
use std::sync::Arc;
use gpui::{
actions, div, AppContext, AsyncWindowContext, Div, EventEmitter, FocusHandle, ParentComponent,
Render, Task, View, ViewContext, VisualContext, WeakView,
actions, div, AppContext, AsyncWindowContext, Div, EventEmitter, FocusHandle, Focusable,
InteractiveComponent, ParentComponent, Render, Task, View, ViewContext, VisualContext,
WeakView,
};
use project::Fs;
use settings::Settings;
@ -171,6 +172,12 @@ use workspace::{
use crate::CollaborationPanelSettings;
pub fn init(cx: &mut AppContext) {
cx.observe_new_views(|workspace: &mut Workspace, _| {
workspace.register_action(|workspace, _: &ToggleFocus, cx| {
workspace.toggle_panel_focus::<CollabPanel>(cx);
});
})
.detach();
// contact_finder::init(cx);
// channel_modal::init(cx);
// channel_view::init(cx);
@ -3293,10 +3300,13 @@ impl CollabPanel {
// }
impl Render for CollabPanel {
type Element = Div<Self>;
type Element = Focusable<Self, Div<Self>>;
fn render(&mut self, _cx: &mut ViewContext<Self>) -> Self::Element {
div().child("COLLAB PANEL")
div()
.key_context("CollabPanel")
.track_focus(&self.focus_handle)
.child("COLLAB PANEL")
}
}
@ -3430,17 +3440,14 @@ impl Panel for CollabPanel {
cx.notify();
}
fn icon_path(&self, cx: &gpui::WindowContext) -> Option<&'static str> {
fn icon(&self, cx: &gpui::WindowContext) -> Option<ui::Icon> {
CollaborationPanelSettings::get_global(cx)
.button
.then(|| "icons/user_group_16.svg")
.then(|| ui::Icon::Collab)
}
fn icon_tooltip(&self) -> (String, Option<Box<dyn gpui::Action>>) {
(
"Collaboration Panel".to_string(),
Some(Box::new(ToggleFocus)),
)
fn toggle_action(&self) -> Box<dyn gpui::Action> {
Box::new(ToggleFocus)
}
fn has_focus(&self, cx: &gpui::WindowContext) -> bool {
@ -3448,10 +3455,10 @@ impl Panel for CollabPanel {
}
fn persistent_name(&self) -> &'static str {
"Collab Panel"
"Collaboration Panel"
}
fn focus_handle(&self, cx: &ui::prelude::WindowContext) -> gpui::FocusHandle {
fn focus_handle(&self, _cx: &ui::prelude::WindowContext) -> gpui::FocusHandle {
self.focus_handle.clone()
}
}

14
crates/collab_ui2/src/collab_titlebar_item.rs
View file

@ -37,7 +37,7 @@ use gpui::{
};
use project::Project;
use theme::ActiveTheme;
use ui::{h_stack, Button, ButtonVariant, KeyBinding, Label, TextColor, TextTooltip};
use ui::{h_stack, Button, ButtonVariant, KeyBinding, Label, TextColor, Tooltip};
use workspace::Workspace;
// const MAX_PROJECT_NAME_LENGTH: usize = 40;
@ -111,18 +111,14 @@ impl Render for CollabTitlebarItem {
.variant(ButtonVariant::Ghost)
.color(Some(TextColor::Player(0))),
)
.tooltip(move |_, cx| {
cx.build_view(|_| TextTooltip::new("Toggle following"))
}),
.tooltip(move |_, cx| Tooltip::text("Toggle following", cx)),
)
// TODO - Add project menu
.child(
div()
.id("titlebar_project_menu_button")
.child(Button::new("project_name").variant(ButtonVariant::Ghost))
.tooltip(move |_, cx| {
cx.build_view(|_| TextTooltip::new("Recent Projects"))
}),
.tooltip(move |_, cx| Tooltip::text("Recent Projects", cx)),
)
// TODO - Add git menu
.child(
@ -137,9 +133,8 @@ impl Render for CollabTitlebarItem {
// todo!() Replace with real action.
#[gpui::action]
struct NoAction {}
cx.build_view(|_| {
TextTooltip::new("Recent Branches")
Tooltip::new("Recent Branches")
.key_binding(KeyBinding::new(gpui::KeyBinding::new(
"cmd-b",
NoAction {},
@ -147,6 +142,7 @@ impl Render for CollabTitlebarItem {
)))
.meta("Only local branches shown")
})
.into()
}),
),
) // self.titlebar_item