sidebar: fall back to theme sidebar color when opaque

This commit is contained in:
2026-11-16 05:16:46 +07:00
parent 1cb86c497a
commit a7abeea8c6
7 changed files with 83 additions and 20 deletions
+59 -19
View File
@@ -4199,6 +4199,8 @@ impl Render for SidebarDemo {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let view = cx.entity();
let view_slots = view.clone();
let view_opaque = view.clone();
let view_options = view.clone();
let theme = cx.theme();
let colors = theme.colors;
let radius = theme.radius;
@@ -4210,16 +4212,16 @@ impl Render for SidebarDemo {
"standalone; the app's own left sidebar is this component",
colors,
div()
.w(rems(15.))
.w(px(240.))
.h(rems(22.5))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
.bg(colors.surface)
.overflow_hidden()
.child(
Sidebar::new("sidebar-demo-list")
.selected(self.selected)
.transparent(true)
.on_change(move |selected, _, cx| {
view.update(cx, |demo, cx| {
demo.selected = selected;
@@ -4260,11 +4262,12 @@ impl Render for SidebarDemo {
"custom entries slot user content around the rows",
colors,
div()
.w(rems(15.))
.w(px(240.))
.h(rems(22.5))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
.bg(colors.surface)
.overflow_hidden()
.child(
Sidebar::new("sidebar-demo-slots")
@@ -4304,31 +4307,68 @@ impl Render for SidebarDemo {
),
))
.child(demo_section(
"a custom entry fills the list; the right border is off",
"opaque sidebars paint the platform's sidebar tone",
colors,
div()
.w(rems(15.))
.w(px(240.))
.h(rems(13.))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
.bg(colors.surface)
.overflow_hidden()
.child(
Sidebar::new("sidebar-demo-custom")
.transparent(true)
Sidebar::new("sidebar-demo-opaque")
.selected(self.selected)
.on_change(move |selected, _, cx| {
view_opaque.update(cx, |demo, cx| {
demo.selected = selected;
cx.notify();
});
})
.entries(|_, _| {
vec![
SidebarEntry::header("Favorites"),
SidebarEntry::row("Documents", "Documents"),
SidebarEntry::row("Pictures", "Pictures").detail("24"),
SidebarEntry::row("Archive", "Archive").disabled(true),
SidebarEntry::header("Locations"),
SidebarEntry::row("Trash", "Trash"),
]
}),
),
))
.child(demo_section(
"width, padding, and the right border are local options",
colors,
div()
.w(px(192.))
.h(rems(13.))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
.bg(colors.surface)
.overflow_hidden()
.child(
Sidebar::new("sidebar-demo-options")
.selected(self.selected)
.width(px(192.))
.padded(false)
.border_right(false)
.entries(move |_, _| {
vec![SidebarEntry::custom(
div()
.w_full()
.px_2()
.py_6()
.flex()
.items_center()
.justify_center()
.text_color(colors.muted_foreground)
.child("Nothing here yet"),
)]
.on_change(move |selected, _, cx| {
view_options.update(cx, |demo, cx| {
demo.selected = selected;
cx.notify();
});
})
.entries(|_, _| {
vec![
SidebarEntry::header("Favorites"),
SidebarEntry::row("Documents", "Documents"),
SidebarEntry::row("Pictures", "Pictures").detail("24"),
SidebarEntry::header("Locations"),
SidebarEntry::row("Trash", "Trash"),
]
}),
),
))