From 7c1827b41d6eb407c5d7818f33331138029306df Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Mon, 16 Nov 2026 19:48:56 +0700 Subject: [PATCH] Add icon-only and icon-label toggles - Add an icon builder to Toggle. - Render a square icon-only toggle when no label is set. - Render icon and label together otherwise. - Demonstrate both in the gallery. --- crates/core/src/toggle.rs | 27 +++++++++++++++++-- examples/gallery/src/main.rs | 51 +++++++++++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 8 deletions(-) diff --git a/crates/core/src/toggle.rs b/crates/core/src/toggle.rs index 8970611..7797c59 100644 --- a/crates/core/src/toggle.rs +++ b/crates/core/src/toggle.rs @@ -3,6 +3,7 @@ use gpui::{ App, ElementId, InteractiveElement as _, IntoElement, ParentElement as _, RenderOnce, Role, SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Toggled, Window, }; +use gpui_native_icons::Icon; use gpui_native_theme::{ActiveTheme as _, DISABLED_OPACITY, Size}; use gpui_native_utils::focus_ring; @@ -17,6 +18,7 @@ type ChangeHandler = Box; pub struct Toggle { id: ElementId, label: Option, + icon: Option, pressed: bool, size: Size, disabled: bool, @@ -34,6 +36,7 @@ impl Toggle { Self { id: id.into(), label: None, + icon: None, pressed: false, size: Size::default(), disabled: false, @@ -52,6 +55,15 @@ impl Toggle { self } + /// Shows an icon. Omitting the label renders an icon-only toggle. + pub fn icon(mut self, icon: I) -> Self + where + I: Into, + { + self.icon = Some(icon.into()); + self + } + /// Sets the current pressed state; the toggle never owns it. pub fn pressed(mut self, pressed: bool) -> Self { self.pressed = pressed; @@ -104,12 +116,16 @@ impl RenderOnce for Toggle { let on_change = self.on_change; let next = !self.pressed; let a11y_label = self.a11y_label.or_else(|| self.label.clone()); + let icon_only = self.icon.is_some() && self.label.is_none(); h_flex() .id(self.id) .justify_center() .h(metrics.control_height) - .px(metrics.dense_padding_x) + .when(icon_only, |toggle| { + toggle.w(metrics.control_height).px(gpui::Pixels::ZERO) + }) + .when(!icon_only, |toggle| toggle.px(metrics.dense_padding_x)) .rounded(theme.radius.control) .text_size(metrics.text_size) .text_color(colors.foreground) @@ -138,6 +154,13 @@ impl RenderOnce for Toggle { toggle.on_click(move |_, window, cx| on_change(next, window, cx)) }) }) - .when_some(self.label, |toggle, label| toggle.child(label)) + .child( + h_flex() + .gap_2() + .when_some(self.icon, |content, icon| { + content.child(icon.size(metrics.icon_size)) + }) + .when_some(self.label, |content, label| content.child(label)), + ) } } diff --git a/examples/gallery/src/main.rs b/examples/gallery/src/main.rs index 5eeb6f9..ced00e7 100644 --- a/examples/gallery/src/main.rs +++ b/examples/gallery/src/main.rs @@ -500,7 +500,11 @@ impl Gallery { plan: SharedString::from("starter"), })), "switch" => Arc::new(cx.new(|_| SwitchDemo { checked: true })), - "toggle" => Arc::new(cx.new(|_| ToggleDemo { pressed: false })), + "toggle" => Arc::new(cx.new(|_| ToggleDemo { + pressed: false, + icon_pressed: false, + icon_label_pressed: false, + })), "slider" => Arc::new(cx.new(|_| SliderDemo { volume: 40.0 })), "segmented" => Arc::new(cx.new(|_| SegmentedDemo { filter: ExploreFilter::default(), @@ -1585,6 +1589,8 @@ impl Render for SwitchDemo { struct ToggleDemo { pressed: bool, + icon_pressed: bool, + icon_label_pressed: bool, } impl Panel for ToggleDemo { @@ -1609,11 +1615,14 @@ impl Render for ToggleDemo { Toggle::new("toggle-demo-bold") .label("Bold") .pressed(self.pressed) - .on_change(move |pressed, _, cx| { - view.update(cx, |demo, cx| { - demo.pressed = pressed; - cx.notify(); - }); + .on_change({ + let view = view.clone(); + move |pressed, _, cx| { + view.update(cx, |demo, cx| { + demo.pressed = pressed; + cx.notify(); + }); + } }), ) .child( @@ -1621,6 +1630,36 @@ impl Render for ToggleDemo { .label("Disabled") .pressed(true) .disabled(true), + ) + .child( + Toggle::new("toggle-demo-icon") + .icon(IconRole::Star) + .accessibility_label("Favorite") + .pressed(self.icon_pressed) + .on_change({ + let view = view.clone(); + move |pressed, _, cx| { + view.update(cx, |demo, cx| { + demo.icon_pressed = pressed; + cx.notify(); + }); + } + }), + ) + .child( + Toggle::new("toggle-demo-icon-label") + .icon(IconRole::Star) + .label("Favorite") + .pressed(self.icon_label_pressed) + .on_change({ + let view = view.clone(); + move |pressed, _, cx| { + view.update(cx, |demo, cx| { + demo.icon_label_pressed = pressed; + cx.notify(); + }); + } + }), ), )) }