layout: replace panel icon with lead element and optional title

This commit is contained in:
2026-11-11 16:26:47 +07:00
parent a0ede5e15a
commit 9326fca63d
5 changed files with 282 additions and 214 deletions
+32 -26
View File
@@ -15,7 +15,7 @@ use gpui_native_core::common::{h_flex, v_flex};
use gpui_native_core::context_menu::ContextMenu; use gpui_native_core::context_menu::ContextMenu;
use gpui_native_core::menu::MenuItem; use gpui_native_core::menu::MenuItem;
use gpui_native_data::tabs::{Tab, Tabs, TabsVariant}; use gpui_native_data::tabs::{Tab, Tabs, TabsVariant};
use gpui_native_icons::{Icon, IconRole}; use gpui_native_icons::IconRole;
use gpui_native_theme::{ActiveTheme as _, Size}; use gpui_native_theme::{ActiveTheme as _, Size};
use crate::resize_handle::ResizeHandle; use crate::resize_handle::ResizeHandle;
@@ -36,35 +36,44 @@ type OpenRightSidebarHandler = Rc<dyn Fn(&mut App)>;
#[must_use] #[must_use]
pub struct PanelDescriptor { pub struct PanelDescriptor {
id: SharedString, id: SharedString,
title: SharedString, title: Option<SharedString>,
icon: Option<Icon>, lead: Option<Rc<dyn Fn() -> AnyElement>>,
build: PanelBuilder, build: PanelBuilder,
right_sidebar: Option<PanelBuilder>, right_sidebar: Option<PanelBuilder>,
} }
impl PanelDescriptor { impl PanelDescriptor {
/// Creates a panel descriptor that opens through `build`. /// Creates a panel descriptor that opens through `build`.
pub fn new<I, T, F>(id: I, title: T, build: F) -> Self pub fn new<I, F>(id: I, build: F) -> Self
where where
I: Into<SharedString>, I: Into<SharedString>,
T: Into<SharedString>,
F: Fn(&mut Window, &mut App) -> AnyView + 'static, F: Fn(&mut Window, &mut App) -> AnyView + 'static,
{ {
Self { Self {
id: id.into(), id: id.into(),
title: title.into(), title: None,
icon: None, lead: None,
build: Box::new(build), build: Box::new(build),
right_sidebar: None, right_sidebar: None,
} }
} }
/// Shows an icon leading the tab label. /// Shows `title` as the panel's tab label.
pub fn icon<I>(mut self, icon: I) -> Self pub fn title<T>(mut self, title: T) -> Self
where where
I: Into<Icon>, T: Into<SharedString>,
{ {
self.icon = Some(icon.into()); self.title = Some(title.into());
self
}
/// Shows an element, e.g. an icon or avatar, leading the tab label.
pub fn lead<F, E>(mut self, build: F) -> Self
where
F: Fn() -> E + 'static,
E: IntoElement,
{
self.lead = Some(Rc::new(move || build().into_any_element()));
self self
} }
@@ -111,7 +120,7 @@ pub struct PanelDrag {
/// The card that follows the cursor while a tab is dragged. /// The card that follows the cursor while a tab is dragged.
struct DragPreview { struct DragPreview {
title: SharedString, title: Option<SharedString>,
} }
impl Render for DragPreview { impl Render for DragPreview {
@@ -127,15 +136,15 @@ impl Render for DragPreview {
.text_size(theme.sizes.medium.text_size) .text_size(theme.sizes.medium.text_size)
.text_color(theme.colors.foreground) .text_color(theme.colors.foreground)
.opacity(0.85) .opacity(0.85)
.child(self.title.clone()) .children(self.title.clone())
} }
} }
/// One open panel view. /// One open panel view.
struct PanelTab { struct PanelTab {
panel: SharedString, panel: SharedString,
title: SharedString, title: Option<SharedString>,
icon: Option<Icon>, lead: Option<Rc<dyn Fn() -> AnyElement>>,
view: AnyView, view: AnyView,
right_view: Option<AnyView>, right_view: Option<AnyView>,
} }
@@ -220,7 +229,7 @@ impl DockState {
let tab = PanelTab { let tab = PanelTab {
panel: SharedString::from(id), panel: SharedString::from(id),
title: panel.title.clone(), title: panel.title.clone(),
icon: panel.icon.clone(), lead: panel.lead.clone(),
view: (panel.build)(window, cx), view: (panel.build)(window, cx),
right_view, right_view,
}; };
@@ -684,7 +693,7 @@ impl DockState {
.map(|tab| TabView { .map(|tab| TabView {
panel: tab.panel.clone(), panel: tab.panel.clone(),
title: tab.title.clone(), title: tab.title.clone(),
icon: tab.icon.clone(), lead: tab.lead.clone(),
view: tab.view.clone(), view: tab.view.clone(),
}) })
.collect(), .collect(),
@@ -745,8 +754,8 @@ impl DockState {
#[derive(Clone)] #[derive(Clone)]
struct TabView { struct TabView {
panel: SharedString, panel: SharedString,
title: SharedString, title: Option<SharedString>,
icon: Option<Icon>, lead: Option<Rc<dyn Fn() -> AnyElement>>,
view: AnyView, view: AnyView,
} }
@@ -1047,15 +1056,12 @@ fn render_pane(
.selected(selected) .selected(selected)
.tabs({ .tabs({
let tabs = pane.tabs.clone(); let tabs = pane.tabs.clone();
move |_, cx| { move |_, _| {
let theme = cx.theme();
let metrics = theme.sizes.resolve(Size::default());
tabs.iter() tabs.iter()
.map(|tab| { .map(|tab| {
Tab::new(tab.panel.clone(), tab.title.clone()) Tab::new(tab.panel.clone(), tab.title.clone().unwrap_or_default())
.when_some(tab.icon.clone(), |entry, icon| { .when_some(tab.lead.as_ref().map(|build| build()), |entry, lead| {
entry.lead(icon.size(metrics.icon_size)) entry.lead(lead)
}) })
.closeable(true) .closeable(true)
.wrap({ .wrap({
+3 -2
View File
@@ -36,11 +36,12 @@ impl Render for SidePanel {
} }
fn descriptor(tag: &'static str) -> PanelDescriptor { fn descriptor(tag: &'static str) -> PanelDescriptor {
PanelDescriptor::new(tag, tag, move |_, cx| cx.new(|_| Panel { tag }).into()) PanelDescriptor::new(tag, move |_, cx| cx.new(|_| Panel { tag }).into()).title(tag)
} }
fn descriptor_with_right_sidebar(tag: &'static str) -> PanelDescriptor { fn descriptor_with_right_sidebar(tag: &'static str) -> PanelDescriptor {
PanelDescriptor::new(tag, tag, move |_, cx| cx.new(|_| Panel { tag }).into()) PanelDescriptor::new(tag, move |_, cx| cx.new(|_| Panel { tag }).into())
.title(tag)
.right_sidebar(move |_, cx| cx.new(|_| SidePanel { tag }).into()) .right_sidebar(move |_, cx| cx.new(|_| SidePanel { tag }).into())
} }
+6 -6
View File
@@ -392,15 +392,15 @@ mod tabbar_toggles {
let dock = cx.update(|cx| { let dock = cx.update(|cx| {
let dock = DockState::new(cx); let dock = DockState::new(cx);
dock.update(cx, |dock, _| { dock.update(cx, |dock, _| {
dock.register_panel(PanelDescriptor::new("one", "One", |_, cx| { dock.register_panel(
cx.new(|_| DockPanel).into() PanelDescriptor::new("one", |_, cx| cx.new(|_| DockPanel).into()).title("One"),
})); );
for index in 0..14 { for index in 0..14 {
let tag = format!("panel-{index}"); let tag = format!("panel-{index}");
let id = tag.clone(); let id = tag.clone();
dock.register_panel(PanelDescriptor::new(id, tag, |_, cx| { dock.register_panel(
cx.new(|_| DockPanel).into() PanelDescriptor::new(id, |_, cx| cx.new(|_| DockPanel).into()).title(tag),
})); );
} }
}); });
dock dock
+1 -1
View File
@@ -22,7 +22,7 @@ impl Render for Panel {
} }
fn descriptor(tag: &'static str) -> PanelDescriptor { fn descriptor(tag: &'static str) -> PanelDescriptor {
PanelDescriptor::new(tag, tag, move |_, cx| cx.new(|_| Panel { tag }).into()) PanelDescriptor::new(tag, move |_, cx| cx.new(|_| Panel { tag }).into()).title(tag)
} }
struct Harness { struct Harness {
+191 -130
View File
@@ -407,7 +407,7 @@ impl Gallery {
let dock_state = cx.entity(); let dock_state = cx.entity();
dock.register_panel( dock.register_panel(
PanelDescriptor::new("welcome", "Welcome", { PanelDescriptor::new("welcome", {
let layout_state = layout_state.clone(); let layout_state = layout_state.clone();
let dock_state = dock_state.clone(); let dock_state = dock_state.clone();
let gallery = gallery.clone(); let gallery = gallery.clone();
@@ -420,6 +420,7 @@ impl Gallery {
.into() .into()
} }
}) })
.title("Welcome")
.right_sidebar(|_, cx| { .right_sidebar(|_, cx| {
cx.new(|_| RightDetails { cx.new(|_| RightDetails {
title: "Welcome", title: "Welcome",
@@ -428,82 +429,122 @@ impl Gallery {
.into() .into()
}), }),
); );
dock.register_panel(PanelDescriptor::new("button", "Button", |_, cx| { dock.register_panel(
PanelDescriptor::new("button", |_, cx| {
cx.new(|_| ButtonDemo { clicks: 0 }).into() cx.new(|_| ButtonDemo { clicks: 0 }).into()
})); })
dock.register_panel(PanelDescriptor::new("input", "Input", |_, cx| { .title("Button"),
cx.new(InputDemo::new).into() );
})); dock.register_panel(
dock.register_panel(PanelDescriptor::new("field", "Field", |window, cx| { PanelDescriptor::new("input", |_, cx| cx.new(InputDemo::new).into()).title("Input"),
);
dock.register_panel(
PanelDescriptor::new("field", |window, cx| {
cx.new(|cx| FieldDemo::new(window, cx)).into() cx.new(|cx| FieldDemo::new(window, cx)).into()
})); })
dock.register_panel(PanelDescriptor::new( .title("Field"),
"combobox", );
"Combobox", dock.register_panel(
|window, cx| cx.new(|cx| ComboboxDemo::new(window, cx)).into(), PanelDescriptor::new("combobox", |window, cx| {
)); cx.new(|cx| ComboboxDemo::new(window, cx)).into()
dock.register_panel(PanelDescriptor::new("status-dot", "Status dot", |_, cx| { })
cx.new(|_| StatusDotDemo).into() .title("Combobox"),
})); );
dock.register_panel(PanelDescriptor::new("checkbox", "Checkbox", |_, cx| { dock.register_panel(
PanelDescriptor::new("status-dot", |_, cx| cx.new(|_| StatusDotDemo).into())
.title("Status dot"),
);
dock.register_panel(
PanelDescriptor::new("checkbox", |_, cx| {
cx.new(|_| CheckboxDemo { checked: false }).into() cx.new(|_| CheckboxDemo { checked: false }).into()
})); })
dock.register_panel(PanelDescriptor::new("radio", "Radio", |_, cx| { .title("Checkbox"),
);
dock.register_panel(
PanelDescriptor::new("radio", |_, cx| {
cx.new(|_| RadioDemo { cx.new(|_| RadioDemo {
plan: SharedString::from("starter"), plan: SharedString::from("starter"),
}) })
.into() .into()
})); })
dock.register_panel(PanelDescriptor::new("switch", "Switch", |_, cx| { .title("Radio"),
);
dock.register_panel(
PanelDescriptor::new("switch", |_, cx| {
cx.new(|_| SwitchDemo { checked: true }).into() cx.new(|_| SwitchDemo { checked: true }).into()
})); })
dock.register_panel(PanelDescriptor::new("toggle", "Toggle", |_, cx| { .title("Switch"),
);
dock.register_panel(
PanelDescriptor::new("toggle", |_, cx| {
cx.new(|_| ToggleDemo { pressed: false }).into() cx.new(|_| ToggleDemo { pressed: false }).into()
})); })
dock.register_panel(PanelDescriptor::new("slider", "Slider", |_, cx| { .title("Toggle"),
);
dock.register_panel(
PanelDescriptor::new("slider", |_, cx| {
cx.new(|_| SliderDemo { volume: 40.0 }).into() cx.new(|_| SliderDemo { volume: 40.0 }).into()
})); })
dock.register_panel(PanelDescriptor::new("segmented", "Segmented", |_, cx| { .title("Slider"),
);
dock.register_panel(
PanelDescriptor::new("segmented", |_, cx| {
cx.new(|_| SegmentedDemo { cx.new(|_| SegmentedDemo {
filter: ExploreFilter::default(), filter: ExploreFilter::default(),
}) })
.into() .into()
})); })
dock.register_panel(PanelDescriptor::new("select", "Select", |_, cx| { .title("Segmented"),
);
dock.register_panel(
PanelDescriptor::new("select", |_, cx| {
cx.new(|_| SelectDemo { cx.new(|_| SelectDemo {
strategy: Some(Strategy::Curated), strategy: Some(Strategy::Curated),
}) })
.into() .into()
})); })
dock.register_panel(PanelDescriptor::new("link", "Link", |_, cx| { .title("Select"),
cx.new(|_| LinkDemo { clicks: 0 }).into() );
})); dock.register_panel(
dock.register_panel(PanelDescriptor::new("clipboard", "Clipboard", |_, cx| { PanelDescriptor::new("link", |_, cx| cx.new(|_| LinkDemo { clicks: 0 }).into())
cx.new(|_| ClipboardDemo).into() .title("Link"),
})); );
dock.register_panel(PanelDescriptor::new("badge", "Badge", |_, cx| { dock.register_panel(
cx.new(|_| BadgeDemo).into() PanelDescriptor::new("clipboard", |_, cx| cx.new(|_| ClipboardDemo).into())
})); .title("Clipboard"),
dock.register_panel(PanelDescriptor::new("avatar", "Avatar", |_, cx| { );
cx.new(|_| AvatarDemo).into() dock.register_panel(
})); PanelDescriptor::new("badge", |_, cx| cx.new(|_| BadgeDemo).into()).title("Badge"),
dock.register_panel(PanelDescriptor::new("progress", "Progress", |_, cx| { );
cx.new(|_| ProgressDemo).into() dock.register_panel(
})); PanelDescriptor::new("avatar", |_, cx| cx.new(|_| AvatarDemo).into()).title("Avatar"),
dock.register_panel(PanelDescriptor::new("spinner", "Spinner", |_, cx| { );
cx.new(|_| SpinnerDemo).into() dock.register_panel(
})); PanelDescriptor::new("progress", |_, cx| cx.new(|_| ProgressDemo).into())
dock.register_panel(PanelDescriptor::new("list", "List", |_, cx| { .title("Progress"),
);
dock.register_panel(
PanelDescriptor::new("spinner", |_, cx| cx.new(|_| SpinnerDemo).into())
.title("Spinner"),
);
dock.register_panel(
PanelDescriptor::new("list", |_, cx| {
cx.new(|_| ListDemo { selected: None }).into() cx.new(|_| ListDemo { selected: None }).into()
})); })
dock.register_panel(PanelDescriptor::new("tree", "Tree", |_, cx| { .title("List"),
);
dock.register_panel(
PanelDescriptor::new("tree", |_, cx| {
cx.new(|_| TreeDemo { cx.new(|_| TreeDemo {
nodes: TreeDemo::demo(), nodes: TreeDemo::demo(),
selected: None, selected: None,
}) })
.into() .into()
})); })
dock.register_panel(PanelDescriptor::new("tabs", "Tabs", |_, cx| { .title("Tree"),
);
dock.register_panel(
PanelDescriptor::new("tabs", |_, cx| {
cx.new(|_| TabsDemo { cx.new(|_| TabsDemo {
selected: 0, selected: 0,
pill_tabs: vec![ pill_tabs: vec![
@@ -515,8 +556,11 @@ impl Gallery {
lead_selected: 0, lead_selected: 0,
}) })
.into() .into()
})); })
dock.register_panel(PanelDescriptor::new("alert", "Alert", { .title("Tabs"),
);
dock.register_panel(
PanelDescriptor::new("alert", {
let layout_state = layout_state.clone(); let layout_state = layout_state.clone();
move |_, cx| { move |_, cx| {
cx.new(|_| AlertDemo { cx.new(|_| AlertDemo {
@@ -525,8 +569,11 @@ impl Gallery {
}) })
.into() .into()
} }
})); })
dock.register_panel(PanelDescriptor::new("toast", "Toast", { .title("Alert"),
);
dock.register_panel(
PanelDescriptor::new("toast", {
let layout_state = layout_state.clone(); let layout_state = layout_state.clone();
move |_, cx| { move |_, cx| {
cx.new(|_| ToastDemo { cx.new(|_| ToastDemo {
@@ -534,8 +581,11 @@ impl Gallery {
}) })
.into() .into()
} }
})); })
dock.register_panel(PanelDescriptor::new("dialog", "Dialog", { .title("Toast"),
);
dock.register_panel(
PanelDescriptor::new("dialog", {
let gallery = gallery.clone(); let gallery = gallery.clone();
move |_, cx| { move |_, cx| {
cx.new(|_| DialogDemo { cx.new(|_| DialogDemo {
@@ -543,97 +593,108 @@ impl Gallery {
}) })
.into() .into()
} }
})); })
dock.register_panel(PanelDescriptor::new( .title("Dialog"),
"command-palette", );
"Command palette", dock.register_panel(
{ PanelDescriptor::new("command-palette", {
let palette = palette.clone(); let palette = palette.clone();
move |_, cx| { move |_, cx| {
cx.new(|cx| CommandPaletteDemo::new(gallery.clone(), palette.clone(), cx)) cx.new(|cx| CommandPaletteDemo::new(gallery.clone(), palette.clone(), cx))
.into() .into()
} }
}, })
)); .title("Command palette"),
dock.register_panel(PanelDescriptor::new("menu", "Menu", |_, cx| { );
cx.new(|_| MenuDemo { open: false }).into() dock.register_panel(
})); PanelDescriptor::new("menu", |_, cx| cx.new(|_| MenuDemo { open: false }).into())
dock.register_panel(PanelDescriptor::new( .title("Menu"),
"dropdown-menu", );
"Dropdown menu", dock.register_panel(
|_, cx| { PanelDescriptor::new("dropdown-menu", |_, cx| {
cx.new(|_| DropdownMenuDemo { cx.new(|_| DropdownMenuDemo {
open_menu: None, open_menu: None,
status: None, status: None,
}) })
.into() .into()
}, })
)); .title("Dropdown menu"),
dock.register_panel(PanelDescriptor::new( );
"context-menu", dock.register_panel(
"Context menu", PanelDescriptor::new("context-menu", |_, cx| {
|_, cx| {
cx.new(|_| ContextMenuDemo { cx.new(|_| ContextMenuDemo {
action: SharedString::from("Right-click the card"), action: SharedString::from("Right-click the card"),
}) })
.into() .into()
}, })
)); .title("Context menu"),
dock.register_panel(PanelDescriptor::new("popover", "Popover", |_, cx| { );
dock.register_panel(
PanelDescriptor::new("popover", |_, cx| {
cx.new(|_| PopoverDemo { open: false }).into() cx.new(|_| PopoverDemo { open: false }).into()
})); })
dock.register_panel(PanelDescriptor::new("tooltip", "Tooltip", |_, cx| { .title("Popover"),
cx.new(|_| TooltipDemo).into() );
})); dock.register_panel(
dock.register_panel(PanelDescriptor::new( PanelDescriptor::new("tooltip", |_, cx| cx.new(|_| TooltipDemo).into())
"empty-state", .title("Tooltip"),
"Empty state", );
|_, cx| cx.new(|_| EmptyStateDemo).into(), dock.register_panel(
)); PanelDescriptor::new("empty-state", |_, cx| cx.new(|_| EmptyStateDemo).into())
dock.register_panel(PanelDescriptor::new( .title("Empty state"),
"scroll-area", );
"Scroll area", dock.register_panel(
|_, cx| cx.new(|_| ScrollAreaDemo).into(), PanelDescriptor::new("scroll-area", |_, cx| cx.new(|_| ScrollAreaDemo).into())
)); .title("Scroll area"),
dock.register_panel(PanelDescriptor::new("scrollbar", "Scrollbar", |_, cx| { );
cx.new(|_| ScrollbarDemo::new()).into() dock.register_panel(
})); PanelDescriptor::new("scrollbar", |_, cx| cx.new(|_| ScrollbarDemo::new()).into())
dock.register_panel(PanelDescriptor::new("code-view", "Code view", |_, cx| { .title("Scrollbar"),
cx.new(CodeViewDemo::new).into() );
})); dock.register_panel(
dock.register_panel(PanelDescriptor::new("diff-view", "Diff view", |_, cx| { PanelDescriptor::new("code-view", |_, cx| cx.new(CodeViewDemo::new).into())
cx.new(DiffViewDemo::new).into() .title("Code view"),
})); );
dock.register_panel(PanelDescriptor::new( dock.register_panel(
"markdown-view", PanelDescriptor::new("diff-view", |_, cx| cx.new(DiffViewDemo::new).into())
"Markdown view", .title("Diff view"),
|_, cx| cx.new(MarkdownViewDemo::new).into(), );
)); dock.register_panel(
dock.register_panel(PanelDescriptor::new("text-view", "Text view", |_, cx| { PanelDescriptor::new("markdown-view", |_, cx| {
cx.new(TextViewDemo::new).into() cx.new(MarkdownViewDemo::new).into()
})); })
dock.register_panel(PanelDescriptor::new("sidebar", "Sidebar", |_, cx| { .title("Markdown view"),
);
dock.register_panel(
PanelDescriptor::new("text-view", |_, cx| cx.new(TextViewDemo::new).into())
.title("Text view"),
);
dock.register_panel(
PanelDescriptor::new("sidebar", |_, cx| {
cx.new(|_| SidebarDemo { selected: None }).into() cx.new(|_| SidebarDemo { selected: None }).into()
})); })
dock.register_panel(PanelDescriptor::new( .title("Sidebar"),
"resize-handle", );
"Resize handle", dock.register_panel(
|window, cx| { PanelDescriptor::new("resize-handle", |window, cx| {
cx.new(|_| ResizeDemo { cx.new(|_| ResizeDemo {
width: rems(ResizeDemo::WIDTH_DEFAULT_REMS).to_pixels(window.rem_size()), width: rems(ResizeDemo::WIDTH_DEFAULT_REMS).to_pixels(window.rem_size()),
}) })
.into() .into()
}, })
)); .title("Resize handle"),
dock.register_panel(PanelDescriptor::new("resizable", "Resizable", |_, cx| { );
cx.new(ResizableDemo::new).into() dock.register_panel(
})); PanelDescriptor::new("resizable", |_, cx| cx.new(ResizableDemo::new).into())
dock.register_panel(PanelDescriptor::new("separator", "Separator", |_, cx| { .title("Resizable"),
cx.new(|_| SeparatorDemo).into() );
})); dock.register_panel(
dock.register_panel(PanelDescriptor::new("theme", "Theme", |_, cx| { PanelDescriptor::new("separator", |_, cx| cx.new(|_| SeparatorDemo).into())
cx.new(|_| ThemeDemo).into() .title("Separator"),
})); );
dock.register_panel(
PanelDescriptor::new("theme", |_, cx| cx.new(|_| ThemeDemo).into()).title("Theme"),
);
} }
} }