From 1dafa87befcf34d68aef19246a9a37851a244f8c Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Mon, 16 Nov 2026 18:35:00 +0700 Subject: [PATCH] Use shared theme tokens across components - Replace remaining raw component metrics with theme constants. - Share disabled opacity, focus ring alpha, and code line height. - Route editor borders, weights, and links through the theme. - Align tab, alert, toast, panel, and resize spacing. --- crates/core/src/alert.rs | 10 ++++---- crates/core/src/button.rs | 4 ++-- crates/core/src/checkbox.rs | 10 +++++--- crates/core/src/command_palette.rs | 5 ++-- crates/core/src/dialog.rs | 6 +++-- crates/core/src/dropdown_menu.rs | 4 ++-- crates/core/src/input.rs | 7 +++--- crates/core/src/link.rs | 6 ++--- crates/core/src/menu.rs | 6 +++-- crates/core/src/popover.rs | 4 ++-- crates/core/src/radio.rs | 10 +++++--- crates/core/src/slider.rs | 4 ++-- crates/core/src/speech.rs | 6 ++--- crates/core/src/switch.rs | 10 +++++--- crates/core/src/toast.rs | 7 +++--- crates/core/src/toggle.rs | 4 ++-- crates/core/src/tooltip.rs | 4 +++- crates/data/src/sidebar.rs | 8 ++++--- crates/data/src/tabs.rs | 16 ++++++------- crates/editor/src/code.rs | 4 ++-- crates/editor/src/diff.rs | 10 ++++---- crates/editor/src/markdown.rs | 34 ++++++++++++++-------------- crates/layout/src/panel.rs | 4 ++-- crates/layout/src/resize_handle.rs | 10 ++++---- crates/layout/src/window_controls.rs | 7 ++---- crates/theme/src/lib.rs | 18 +++++++++++++++ crates/utils/src/lib.rs | 7 ++++-- 27 files changed, 136 insertions(+), 89 deletions(-) diff --git a/crates/core/src/alert.rs b/crates/core/src/alert.rs index 3f93625..6ac1b37 100644 --- a/crates/core/src/alert.rs +++ b/crates/core/src/alert.rs @@ -8,7 +8,9 @@ use gpui::{ ease_out_quint, }; use gpui_native_icons::{Icon, IconRole}; -use gpui_native_theme::{ActiveTheme as _, ENTER_SLIDE_DISTANCE, Size, TextRole, Typeset as _}; +use gpui_native_theme::{ + ALERT_STACK_WIDTH, ActiveTheme as _, ENTER_SLIDE_DISTANCE, Size, TextRole, Typeset as _, +}; use gpui_native_utils::ResultLogErr as _; use crate::button::{Button, ButtonVariant}; @@ -234,7 +236,7 @@ impl RenderOnce for Alert { .items_start() .gap_3() .px_3() - .py_2p5() + .py_2() .when_some(self.icon.clone(), |alert, icon_glyph| { alert.child( div() @@ -242,7 +244,7 @@ impl RenderOnce for Alert { .flex() .items_center() .justify_center() - .size_6() + .size(theme.sizes.small.avatar_size) .rounded(theme.radius.full) .bg(ramp.base) .child(icon_glyph.size(dense_icon_size).color(ramp.foreground)), @@ -370,7 +372,7 @@ impl RenderOnce for AlertsView { .absolute() .top_4() .right_4() - .w_80() + .w(ALERT_STACK_WIDTH) .flex() .flex_col() .items_end() diff --git a/crates/core/src/button.rs b/crates/core/src/button.rs index 5de6200..5d90ad2 100644 --- a/crates/core/src/button.rs +++ b/crates/core/src/button.rs @@ -7,7 +7,7 @@ use gpui::{ StyleRefinement, Styled as _, Window, canvas, relative, transparent_black, }; use gpui_native_icons::Icon; -use gpui_native_theme::{ActiveTheme as _, Size}; +use gpui_native_theme::{ActiveTheme as _, DISABLED_OPACITY, Size}; use gpui_native_utils::{focus_ring, record_anchor_bounds}; use std::rc::Rc; @@ -322,7 +322,7 @@ impl RenderOnce for Button { .absolute() .inset_0(), ) - .when(self.disabled, |button| button.opacity(0.5)) + .when(self.disabled, |button| button.opacity(DISABLED_OPACITY)) .when_some(self.tooltip, |button, tooltip| { button.tooltip(move |window, cx| tooltip(window, cx)) }) diff --git a/crates/core/src/checkbox.rs b/crates/core/src/checkbox.rs index 15b7d1b..ac09989 100644 --- a/crates/core/src/checkbox.rs +++ b/crates/core/src/checkbox.rs @@ -8,7 +8,7 @@ use gpui::{ SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Toggled, Window, }; use gpui_native_icons::{IconRole, icon}; -use gpui_native_theme::{ActiveTheme as _, Size}; +use gpui_native_theme::{ActiveTheme as _, DISABLED_OPACITY, Size}; use gpui_native_utils::focus_ring; use crate::common::{Sizable, StyledExt as _, h_flex}; @@ -132,7 +132,7 @@ impl RenderOnce for Checkbox { .role(Role::CheckBox) .when_some(a11y_label, |checkbox, label| checkbox.aria_label(label)) .aria_toggled(Toggled::from(self.checked)) - .when(self.disabled, |checkbox| checkbox.opacity(0.5)) + .when(self.disabled, |checkbox| checkbox.opacity(DISABLED_OPACITY)) .when(!self.disabled, |checkbox| { checkbox .cursor_pointer() @@ -154,7 +154,11 @@ impl RenderOnce for Checkbox { indicator .bg(ramps.primary.base) .border_color(ramps.primary.base) - .hover(|style| style.bg(ramps.primary.hover)) + .hover(|style| { + style + .bg(ramps.primary.hover) + .border_color(ramps.primary.hover) + }) .child( icon(IconRole::Check) .size(metrics.dense_icon_size) diff --git a/crates/core/src/command_palette.rs b/crates/core/src/command_palette.rs index 8a3193f..105e6b8 100644 --- a/crates/core/src/command_palette.rs +++ b/crates/core/src/command_palette.rs @@ -331,7 +331,7 @@ impl Render for CommandPaletteState { return div().into_any_element(); } - let (colors, radius, metrics, panel_border, shadows) = { + let (colors, radius, metrics, panel_border, shadows, titlebar_height) = { let theme = cx.theme(); ( theme.colors, @@ -339,6 +339,7 @@ impl Render for CommandPaletteState { theme.sizes.resolve(Size::default()), theme.colors.border, theme.elevations.dialog.shadows(), + theme.titlebar_height, ) }; @@ -516,7 +517,7 @@ impl Render for CommandPaletteState { .flex() .justify_center() .items_start() - .pt_10() + .pt(titlebar_height) .child(scrim) .child(panel), ) diff --git a/crates/core/src/dialog.rs b/crates/core/src/dialog.rs index f0fcf47..af6903b 100644 --- a/crates/core/src/dialog.rs +++ b/crates/core/src/dialog.rs @@ -8,7 +8,7 @@ use gpui::{ Styled as _, Window, canvas, deferred, div, ease_out_quint, relative, }; use gpui_native_icons::IconRole; -use gpui_native_theme::{ActiveTheme as _, TextRole, Typeset as _}; +use gpui_native_theme::{ActiveTheme as _, DIALOG_MIN_WIDTH, TextRole, Typeset as _}; use crate::button::{Button, ButtonVariant}; use crate::common::{DIALOG_LAYER, Sizable, StyledExt as _, v_flex}; @@ -203,7 +203,9 @@ impl RenderOnce for Dialog { .role(role) .aria_label(label) .when_some(self.min_width, |panel, width| panel.min_w(width)) - .when(self.min_width.is_none(), |panel| panel.min_w_96()) + .when(self.min_width.is_none(), |panel| { + panel.min_w(DIALOG_MIN_WIDTH) + }) .max_w(relative(0.9)) .when_some(height, |panel, height| panel.h(height)) .p_4() diff --git a/crates/core/src/dropdown_menu.rs b/crates/core/src/dropdown_menu.rs index 840f0ed..0c66c46 100644 --- a/crates/core/src/dropdown_menu.rs +++ b/crates/core/src/dropdown_menu.rs @@ -11,7 +11,7 @@ use gpui::{ div, relative, }; use gpui_native_icons::{Icon, IconRole, icon}; -use gpui_native_theme::{ActiveTheme as _, Size}; +use gpui_native_theme::{ActiveTheme as _, DISABLED_OPACITY, Size}; use gpui_native_utils::{focus_handle, focus_ring}; use crate::button::ButtonVariant; @@ -376,7 +376,7 @@ impl RenderOnce for DropdownMenu { .border_1() .border_color(border) .when_some(background, |trigger, background| trigger.bg(background)) - .when(self.disabled, |trigger| trigger.opacity(0.5)) + .when(self.disabled, |trigger| trigger.opacity(DISABLED_OPACITY)) .when(!inert, |trigger| { trigger .track_focus(&focus) diff --git a/crates/core/src/input.rs b/crates/core/src/input.rs index 23ad337..db2e84c 100644 --- a/crates/core/src/input.rs +++ b/crates/core/src/input.rs @@ -16,7 +16,8 @@ use gpui::{ }; use gpui_native_icons::IconRole; use gpui_native_theme::{ - ActiveTheme as _, CARET_WIDTH, ColorTokens, Size, UNDERLINE_WIDTH, WHEEL_LINE_HEIGHT, + ActiveTheme as _, CARET_WIDTH, ColorTokens, DISABLED_OPACITY, Size, UNDERLINE_WIDTH, + WHEEL_LINE_HEIGHT, }; use gpui_native_utils::focus_ring; @@ -2147,7 +2148,7 @@ impl RenderOnce for Input { } else { metrics.dense_padding_x }) - .gap_1p5() + .gap_2() .rounded(radius.control) .bg(colors.input) .text_size(metrics.text_size) @@ -2155,7 +2156,7 @@ impl RenderOnce for Input { .border_1() .border_color(colors.border) .refine_style(&self.style) - .when(self.disabled, |input| input.opacity(0.5)) + .when(self.disabled, |input| input.opacity(DISABLED_OPACITY)) .when(!self.disabled, |input| { input.track_focus(&focus_handle).tab_stop(true) }) diff --git a/crates/core/src/link.rs b/crates/core/src/link.rs index 4ce6ba8..775ce16 100644 --- a/crates/core/src/link.rs +++ b/crates/core/src/link.rs @@ -4,7 +4,7 @@ use gpui::{ RenderOnce, Role, SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Window, }; -use gpui_native_theme::{ActiveTheme as _, Size}; +use gpui_native_theme::{ActiveTheme as _, DISABLED_OPACITY, Size}; use gpui_native_utils::focus_ring; use crate::common::{Sizable, StyledExt as _, h_flex}; @@ -113,12 +113,12 @@ impl RenderOnce for Link { h_flex() .id(self.id) .text_size(metrics.text_size) - .text_color(colors.accent) + .text_color(ramps.primary.base) .underline() .refine_style(&self.style) .role(Role::Link) .when_some(a11y_label, |link, label| link.aria_label(label)) - .when(self.disabled, |link| link.opacity(0.5)) + .when(self.disabled, |link| link.opacity(DISABLED_OPACITY)) .when(!self.disabled, |link| { link.cursor_pointer() .focusable() diff --git a/crates/core/src/menu.rs b/crates/core/src/menu.rs index 32a2e38..038aaa5 100644 --- a/crates/core/src/menu.rs +++ b/crates/core/src/menu.rs @@ -12,7 +12,7 @@ use gpui::{ Window, anchored, canvas, deferred, div, ease_out_quint, point, px, relative, }; use gpui_native_icons::{Icon, IconRole, icon as icon_glyph}; -use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, POPUP_MAX_HEIGHT}; +use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, MENU_MIN_WIDTH, POPUP_MAX_HEIGHT}; use gpui_native_utils::focus_handle; use crate::common::{OVERLAY_LAYER, StyledExt as _, v_flex}; @@ -685,7 +685,9 @@ fn menu_panel( .role(Role::Menu) .aria_label(params.label) .when_some(params.min_width, |panel, width| panel.min_w(width)) - .when(params.min_width.is_none(), |panel| panel.min_w_56()) + .when(params.min_width.is_none(), |panel| { + panel.min_w(MENU_MIN_WIDTH) + }) .p(params.chrome.spacing_unit) .bg(params.chrome.surface) .text_color(params.chrome.foreground) diff --git a/crates/core/src/popover.rs b/crates/core/src/popover.rs index 7d20335..afbe6e4 100644 --- a/crates/core/src/popover.rs +++ b/crates/core/src/popover.rs @@ -8,7 +8,7 @@ use gpui::{ ParentElement as _, Pixels, RenderOnce, Role, SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Window, anchored, canvas, deferred, div, ease_out_quint, point, }; -use gpui_native_theme::ActiveTheme as _; +use gpui_native_theme::{ActiveTheme as _, POPOVER_MIN_WIDTH}; use crate::common::{OVERLAY_LAYER, StyledExt as _, v_flex}; @@ -181,7 +181,7 @@ impl RenderOnce for Popover { .track_focus(&focus) .role(Role::Dialog) .aria_label(label) - .min_w_32() + .min_w(POPOVER_MIN_WIDTH) .bg(colors.surface) .text_color(colors.surface_foreground) .rounded(radius.overlay) diff --git a/crates/core/src/radio.rs b/crates/core/src/radio.rs index 34bfc98..8ca324a 100644 --- a/crates/core/src/radio.rs +++ b/crates/core/src/radio.rs @@ -4,7 +4,7 @@ use gpui::{ SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Toggled, Window, div, }; -use gpui_native_theme::{ActiveTheme as _, Size}; +use gpui_native_theme::{ActiveTheme as _, DISABLED_OPACITY, Size}; use gpui_native_utils::focus_ring; use crate::common::{Sizable, StyledExt as _, h_flex, v_flex}; @@ -193,7 +193,7 @@ where .role(Role::RadioButton) .when_some(a11y_label, |row, label| row.aria_label(label)) .aria_toggled(Toggled::from(is_selected)) - .when(disabled, |row| row.opacity(0.5)) + .when(disabled, |row| row.opacity(DISABLED_OPACITY)) .when(!disabled, move |row| { let value = radio.value.clone(); row.cursor_pointer() @@ -217,7 +217,11 @@ where indicator .bg(ramps.primary.base) .border_color(ramps.primary.base) - .hover(|style| style.bg(ramps.primary.hover)) + .hover(|style| { + style + .bg(ramps.primary.hover) + .border_color(ramps.primary.hover) + }) .child( div() .size(metrics.indicator_size / 2.0) diff --git a/crates/core/src/slider.rs b/crates/core/src/slider.rs index 5a8b940..e75d927 100644 --- a/crates/core/src/slider.rs +++ b/crates/core/src/slider.rs @@ -8,7 +8,7 @@ use gpui::{ SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Window, canvas, div, relative, }; -use gpui_native_theme::{ActiveTheme as _, Size}; +use gpui_native_theme::{ActiveTheme as _, DISABLED_OPACITY, Size}; use gpui_native_utils::focus_ring; use crate::common::{Sizable, StyledExt as _, h_flex}; @@ -186,7 +186,7 @@ impl RenderOnce for Slider { .aria_numeric_value(f64::from(value)) .aria_min_numeric_value(f64::from(self.min)) .aria_max_numeric_value(f64::from(self.max)) - .when(self.disabled, |slider| slider.opacity(0.5)) + .when(self.disabled, |slider| slider.opacity(DISABLED_OPACITY)) .when(!self.disabled, |slider| { slider .track_focus(&focus_handle) diff --git a/crates/core/src/speech.rs b/crates/core/src/speech.rs index 800bd0a..cffd21f 100644 --- a/crates/core/src/speech.rs +++ b/crates/core/src/speech.rs @@ -19,7 +19,7 @@ use gpui::{ StyleRefinement, Styled, Subscription, Task, WeakEntity, Window, div, relative, }; use gpui_native_icons::{IconRole, icon}; -use gpui_native_theme::{ActiveTheme as _, Size}; +use gpui_native_theme::{ActiveTheme as _, DISABLED_OPACITY, SPEECH_WAVEFORM_WIDTH, Size}; use gpui_native_utils::focus_ring; use crate::common::{Sizable, StyledExt as _, h_flex}; @@ -750,7 +750,7 @@ impl RenderOnce for SpeechButton { .text_color(foreground) .when(capturing, |button| button.bg(colors.muted)) .refine_style(&self.style) - .when(disabled, |button| button.opacity(0.5)) + .when(disabled, |button| button.opacity(DISABLED_OPACITY)) .aria_label(label.clone()) .tooltip(Tooltip::text(label)) .child(if stopping { @@ -877,7 +877,7 @@ impl RenderOnce for SpeechWaveform { .justify_end() .gap_0p5() .h(metrics.icon_size) - .w_24() + .w(SPEECH_WAVEFORM_WIDTH) .overflow_hidden() .children(levels.iter().map(|level| { div() diff --git a/crates/core/src/switch.rs b/crates/core/src/switch.rs index 4412f33..3685161 100644 --- a/crates/core/src/switch.rs +++ b/crates/core/src/switch.rs @@ -6,7 +6,7 @@ use gpui::{ RenderOnce, Role, SharedString, SpringAnimation, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Toggled, Window, div, px, }; -use gpui_native_theme::{ActiveTheme as _, CONTROL_SPRING, Size}; +use gpui_native_theme::{ActiveTheme as _, CONTROL_SPRING, DISABLED_OPACITY, Size}; use gpui_native_utils::focus_ring; use crate::common::{Sizable, StyledExt as _, h_flex}; @@ -128,7 +128,7 @@ impl RenderOnce for Switch { .role(Role::Switch) .when_some(a11y_label, |switch, label| switch.aria_label(label)) .aria_toggled(Toggled::from(self.checked)) - .when(self.disabled, |switch| switch.opacity(0.5)) + .when(self.disabled, |switch| switch.opacity(DISABLED_OPACITY)) .when(!self.disabled, |switch| { switch .cursor_pointer() @@ -152,7 +152,11 @@ impl RenderOnce for Switch { track .bg(ramps.primary.base) .border_color(ramps.primary.base) - .hover(|style| style.bg(ramps.primary.hover)) + .hover(|style| { + style + .bg(ramps.primary.hover) + .border_color(ramps.primary.hover) + }) }) .when(!self.checked, |track| { track.bg(colors.input).border_color(colors.border) diff --git a/crates/core/src/toast.rs b/crates/core/src/toast.rs index b64f892..66fd005 100644 --- a/crates/core/src/toast.rs +++ b/crates/core/src/toast.rs @@ -292,6 +292,7 @@ impl ToastEntry { .max_w(TOAST_MAX_WIDTH) .flex() .items_center() + .gap_2() .py_1p5() .px_3() .bg(surface) @@ -304,7 +305,6 @@ impl ToastEntry { pill.child( div() .flex_none() - .mr_2() .flex() .items_center() .child(icon.size(icon_size).color(foreground)), @@ -312,6 +312,7 @@ impl ToastEntry { }) .child( div() + .flex_1() .min_w(px(0.)) .truncate() .text_size(text_size) @@ -321,7 +322,7 @@ impl ToastEntry { .when_some(toast.action.clone(), |pill, action| { let toasts = toasts.clone(); pill.child( - div().flex_none().ml_2p5().child( + div().flex_none().child( Button::new(("toast-action", id)) .label(action.label.clone()) .variant(ButtonVariant::Primary) @@ -336,7 +337,7 @@ impl ToastEntry { ) }) .child( - div().flex_none().ml_4().child( + div().flex_none().child( Button::new(("toast-close", id)) .icon(IconRole::Close) .variant(ButtonVariant::Ghost) diff --git a/crates/core/src/toggle.rs b/crates/core/src/toggle.rs index 8aaba45..8970611 100644 --- a/crates/core/src/toggle.rs +++ b/crates/core/src/toggle.rs @@ -3,7 +3,7 @@ use gpui::{ App, ElementId, InteractiveElement as _, IntoElement, ParentElement as _, RenderOnce, Role, SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Toggled, Window, }; -use gpui_native_theme::{ActiveTheme as _, Size}; +use gpui_native_theme::{ActiveTheme as _, DISABLED_OPACITY, Size}; use gpui_native_utils::focus_ring; use crate::common::{Sizable, StyledExt as _, h_flex}; @@ -127,7 +127,7 @@ impl RenderOnce for Toggle { .active(|style| style.bg(ramps.secondary.hover)) }) .refine_style(&self.style) - .when(self.disabled, |toggle| toggle.opacity(0.5)) + .when(self.disabled, |toggle| toggle.opacity(DISABLED_OPACITY)) .when(!self.disabled, |toggle| { toggle .cursor_pointer() diff --git a/crates/core/src/tooltip.rs b/crates/core/src/tooltip.rs index ee9857d..4d47e7b 100644 --- a/crates/core/src/tooltip.rs +++ b/crates/core/src/tooltip.rs @@ -65,6 +65,7 @@ impl Render for Tooltip { // Copied out: the mutable reads below need `cx` free of this borrow. let theme = cx.theme(); let text_size = theme.sizes.medium.text_size; + let line_height = theme.typography.callout.line_height; let spacing_unit = theme.spacing.unit; let surface = theme.colors.surface; let surface_foreground = theme.colors.surface_foreground; @@ -87,6 +88,7 @@ impl Render for Tooltip { .rounded(radius_sm) .shadow(shadows.clone()) .text_size(text_size) + .line_height(line_height) .text_color(surface_foreground) .child(self.text.clone()) }; @@ -102,7 +104,7 @@ impl Render for Tooltip { cx, ) .map(|bounds| bounds.size.height) - .unwrap_or_else(|| text_size * 1.5 + window.rem_size() * 0.5 + BORDER_WIDTH * 2.0); + .unwrap_or_else(|| line_height + spacing_unit * 2.0 + BORDER_WIDTH * 2.0); let below = viewport_height - spacing_unit - parent.bottom(); let above = parent.top() - spacing_unit; diff --git a/crates/data/src/sidebar.rs b/crates/data/src/sidebar.rs index 06e6053..89db673 100644 --- a/crates/data/src/sidebar.rs +++ b/crates/data/src/sidebar.rs @@ -8,11 +8,13 @@ use gpui::prelude::FluentBuilder; use gpui::{ AnyElement, App, ElementId, FocusHandle, InteractiveElement as _, IntoElement, KeyDownEvent, ParentElement as _, Pixels, RenderOnce, Role, SharedString, StatefulInteractiveElement as _, - StyleRefinement, Styled as _, Window, div, px, + StyleRefinement, Styled as _, Window, div, }; use gpui_native_core::grain::grain as grain_overlay; use gpui_native_core::scroll_area::ScrollArea; -use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, TextRole, Typeset as _}; +use gpui_native_theme::{ + ActiveTheme as _, BORDER_WIDTH, SIDEBAR_DEFAULT_WIDTH, TextRole, Typeset as _, +}; use gpui_native_utils::{StyledExt as _, nav_key, paint_selectable_row, selectable_label_color}; /// The change reporter, fired with the next selected row by pointer and keys. @@ -160,7 +162,7 @@ impl Sidebar { grain: false, border_right: true, padded: true, - width: px(240.0), + width: SIDEBAR_DEFAULT_WIDTH, a11y_label: None, on_change: None, entries: None, diff --git a/crates/data/src/tabs.rs b/crates/data/src/tabs.rs index 0da8738..3fb13d1 100644 --- a/crates/data/src/tabs.rs +++ b/crates/data/src/tabs.rs @@ -16,7 +16,7 @@ use gpui_native_core::scroll_area::{ScrollArea, ScrollAxes}; use gpui_native_core::spinner::Spinner; use gpui_native_core::tooltip::Tooltip; use gpui_native_icons::IconRole; -use gpui_native_theme::{ActiveTheme as _, POPUP_MAX_HEIGHT, Size}; +use gpui_native_theme::{ActiveTheme as _, POPUP_MAX_HEIGHT, Size, TAB_INDICATOR_WIDTH}; use gpui_native_utils::{StyledExt as _, adjacent_selectable}; /// Reports the next selected tab by pointer and keys. @@ -609,7 +609,7 @@ impl Tabs { }) .flex() .items_center() - .gap_1p5() + .gap_2() .cursor_pointer() .role(Role::Tab) .aria_selected(selected) @@ -624,7 +624,7 @@ impl Tabs { .py_1() .rounded_tl(theme.radius.sm) .rounded_tr(theme.radius.sm) - .border_b_2() + .border_b(TAB_INDICATOR_WIDTH) .border_color(gpui::transparent_black()) .when(active, |chip| chip.border_color(theme.ramps.primary.base)), TabsVariant::Pill => chip @@ -1019,7 +1019,7 @@ impl Tab { }) .flex() .items_center() - .gap_1p5() + .gap_2() .role(Role::Tab) .aria_selected(selected) .text_color(label_color) @@ -1033,7 +1033,7 @@ impl Tab { .py_1() .rounded_tl(theme.radius.sm) .rounded_tr(theme.radius.sm) - .border_b_2() + .border_b(TAB_INDICATOR_WIDTH) .border_color(gpui::transparent_black()) .when(active, |strip_tab| { strip_tab.border_color(theme.ramps.primary.base) @@ -1072,9 +1072,9 @@ impl Tab { div() .absolute() .left_0() - .top(px(2.0)) - .bottom(px(2.0)) - .w(px(2.0)) + .top(TAB_INDICATOR_WIDTH) + .bottom(TAB_INDICATOR_WIDTH) + .w(TAB_INDICATOR_WIDTH) .rounded(theme.radius.sm) .bg(theme.ramps.primary.base), ) diff --git a/crates/editor/src/code.rs b/crates/editor/src/code.rs index 7fb90d5..fd26cca 100644 --- a/crates/editor/src/code.rs +++ b/crates/editor/src/code.rs @@ -12,7 +12,7 @@ use gpui::{ }; use gpui_native_core::scrollbar::{Scrollbar, ScrollbarHandle, ScrollbarVisibility}; use gpui_native_theme::{ - ActiveTheme as _, ColorTokens, MONO_ADVANCE_RATIO, Ramps, WASH_ALPHA_SOFT, + ActiveTheme as _, CODE_LINE_HEIGHT, ColorTokens, MONO_ADVANCE_RATIO, Ramps, WASH_ALPHA_SOFT, }; use crate::highlight::{HighlightedCode, Language, Role, highlight}; @@ -256,7 +256,7 @@ impl Render for CodeViewState { let colors = theme.colors; let mono_font = theme.mono_font; let text_size = theme.sizes.small.text_size; - let line_height = text_size * 1.5; + let line_height = text_size * CODE_LINE_HEIGHT; let char_width = text_size * MONO_ADVANCE_RATIO; let root_font_size = theme.root_font_size; diff --git a/crates/editor/src/diff.rs b/crates/editor/src/diff.rs index ae5f352..478f4e1 100644 --- a/crates/editor/src/diff.rs +++ b/crates/editor/src/diff.rs @@ -13,7 +13,7 @@ use gpui::{ point, uniform_list, }; use gpui_native_core::scrollbar::{Scrollbar, ScrollbarHandle, ScrollbarVisibility}; -use gpui_native_theme::{ActiveTheme as _, MONO_ADVANCE_RATIO}; +use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, MONO_ADVANCE_RATIO}; use similar::{Change, ChangeTag, TextDiff}; use std::ops::Range; @@ -535,7 +535,7 @@ fn render_row( row_element.child( div() .flex_none() - .border_l_4() + .border_l(BORDER_WIDTH * 4.0) .border_color(gpui::transparent_black()), ) }, @@ -661,7 +661,9 @@ fn render_row( _ => wash_strong(change_color), }) .when(options.indicators == DiffIndicators::Bars, |number| { - number.border_l_4().border_color(change_color) + number + .border_l(BORDER_WIDTH * 4.0) + .border_color(change_color) }), ) }) @@ -672,7 +674,7 @@ fn render_row( div() .h_full() .flex_none() - .border_l_4() + .border_l(BORDER_WIDTH * 4.0) .border_color(change_color), ) }, diff --git a/crates/editor/src/markdown.rs b/crates/editor/src/markdown.rs index ff84cd8..b8ba011 100644 --- a/crates/editor/src/markdown.rs +++ b/crates/editor/src/markdown.rs @@ -9,19 +9,20 @@ use gpui::prelude::FluentBuilder as _; use gpui::{ AnyElement, App, Bounds, ClipboardItem, Context, Div, Element, ElementId, Entity, FontStyle, - FontWeight, GlobalElementId, HighlightStyle, InspectorElementId, InteractiveElement as _, - InteractiveText, IntoElement, KeyBinding, LayoutId, ListAlignment, ListOffset, ListState, - MouseButton, MouseDownEvent, MouseMoveEvent, ObjectFit, ParentElement as _, Pixels, - Refineable as _, Render, SharedString, StatefulInteractiveElement as _, StrikethroughStyle, - StyleRefinement, Styled, StyledImage as _, StyledText, TextLayout, UnderlineStyle, Window, - actions, div, img, list, px, relative, + GlobalElementId, HighlightStyle, InspectorElementId, InteractiveElement as _, InteractiveText, + IntoElement, KeyBinding, LayoutId, ListAlignment, ListOffset, ListState, MouseButton, + MouseDownEvent, MouseMoveEvent, ObjectFit, ParentElement as _, Pixels, Refineable as _, Render, + SharedString, StatefulInteractiveElement as _, StrikethroughStyle, StyleRefinement, Styled, + StyledImage as _, StyledText, TextLayout, UnderlineStyle, Window, actions, div, img, list, px, + relative, }; use gpui_native_core::button::{Button, ButtonVariant}; use gpui_native_core::checkbox::Checkbox; use gpui_native_core::common::Sizable as _; use gpui_native_core::scrollbar::{Scrollbar, ScrollbarVisibility}; use gpui_native_theme::{ - ActiveTheme as _, BORDER_WIDTH, CODE_OVERSCROLL_MAX, Size, TextRole, Typeset as _, + ActiveTheme as _, BORDER_WIDTH, CODE_LINE_HEIGHT, CODE_OVERSCROLL_MAX, Size, TextRole, + Typeset as _, }; use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag, TagEnd}; @@ -46,8 +47,6 @@ const QUOTE_INSET: f32 = 1.0; const INDENT_STEP: f32 = 1.5; /// The body line height. const BODY_LINE_HEIGHT: f32 = 1.6; -/// The code line height inside fenced blocks. -const CODE_LINE_HEIGHT: f32 = 1.5; /// The tallest a standalone image renders, in root font sizes. const IMAGE_MAX_HEIGHT: f32 = 14.0; /// The side of an inline image atom relative to the body text size. @@ -1469,7 +1468,7 @@ fn block_frame(quote: bool, top: Pixels, bottom: Pixels, id: &ElementId, cx: &Ap .pb(bottom) .when(quote, |frame| { frame - .border_l_2() + .border_l(BORDER_WIDTH * 2.0) .border_color(theme.colors.border) .pl(theme.root_font_size * QUOTE_INSET) }) @@ -1546,8 +1545,9 @@ fn text_row( .pr_1() .child(match marker { ListMarker::Bullet => div() - .text_color(theme.colors.muted_foreground) - .child("•") + .size(theme.spacing.unit) + .rounded(theme.radius.full) + .bg(theme.colors.muted_foreground) .into_any_element(), ListMarker::Ordered(number) => div() .text_color(theme.colors.muted_foreground) @@ -1721,7 +1721,7 @@ fn code_row( .when_some(language.cloned(), |row, language| { row.child( div() - .text_xs() + .typeset(TextRole::Caption, cx) .text_color(theme.colors.muted_foreground) .child(language), ) @@ -1845,7 +1845,7 @@ fn table_row( .px_2() .py_1() .when(row.header, |cell_element| { - cell_element.font_weight(FontWeight::SEMIBOLD) + cell_element.font_weight(theme.typography.headline.weight) }) .child(text_child(&cell.spans, &cell_id, piece, cx)) }) @@ -1981,7 +1981,7 @@ where InlineStyle::Strong => highlights.push(( range, HighlightStyle { - font_weight: Some(FontWeight::SEMIBOLD), + font_weight: Some(theme.typography.headline.weight), ..Default::default() }, )), @@ -1989,7 +1989,7 @@ where range, HighlightStyle { font_style: Some(FontStyle::Italic), - font_weight: Some(FontWeight::SEMIBOLD), + font_weight: Some(theme.typography.headline.weight), ..Default::default() }, )), @@ -2017,7 +2017,7 @@ where highlights.push(( range.clone(), HighlightStyle { - color: Some(theme.colors.accent), + color: Some(theme.ramps.primary.base), underline: Some(UnderlineStyle { thickness: BORDER_WIDTH, color: None, diff --git a/crates/layout/src/panel.rs b/crates/layout/src/panel.rs index a886d1e..156f32d 100644 --- a/crates/layout/src/panel.rs +++ b/crates/layout/src/panel.rs @@ -7,7 +7,7 @@ use std::sync::Arc; use gpui::{ AnyElement, AnyView, App, Axis, Div, ElementId, Entity, IntoElement, ParentElement as _, - Render, RenderOnce, SharedString, StyleRefinement, Styled as _, Window, div, rems, + Render, RenderOnce, SharedString, StyleRefinement, Styled as _, Window, div, }; use gpui_native_theme::ActiveTheme as _; use gpui_native_utils::StyledExt as _; @@ -126,7 +126,7 @@ impl gpui::Styled for PanelRow { impl RenderOnce for PanelRow { fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement { let id = self.id.clone(); - let gutter = rems(0.5).to_pixels(window.rem_size()); + let gutter = cx.theme().spacing.unit * 2.0; let main = island( div() diff --git a/crates/layout/src/resize_handle.rs b/crates/layout/src/resize_handle.rs index f33bb63..514a2e3 100644 --- a/crates/layout/src/resize_handle.rs +++ b/crates/layout/src/resize_handle.rs @@ -9,9 +9,11 @@ use gpui::{ InteractiveElement as _, IntoElement, KeyDownEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement as _, Pixels, Point, RenderOnce, Role, SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Window, canvas, - deferred, div, fill, point, px, rems, + deferred, div, fill, point, px, +}; +use gpui_native_theme::{ + ActiveTheme as _, BORDER_WIDTH, DISABLED_OPACITY, HAIRLINE_WIDTH, RESIZE_KEYBOARD_STEP, }; -use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, HAIRLINE_WIDTH, RESIZE_KEYBOARD_STEP}; use gpui_native_utils::{StyledExt as _, focus_handle, focus_ring}; /// How far one keyboard arrow step moves the seam. @@ -108,7 +110,7 @@ impl RenderOnce for ResizeHandle { fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement { let theme = cx.theme(); let ring = theme.colors.ring; - let thickness = rems(0.5).to_pixels(window.rem_size()); + let thickness = theme.spacing.unit * 2.0; let label = self .accessibility_label @@ -150,7 +152,7 @@ impl RenderOnce for ResizeHandle { handle.w_full().h(thickness) }) .refine_style(&self.style) - .when(self.disabled, |handle| handle.opacity(0.5)) + .when(self.disabled, |handle| handle.opacity(DISABLED_OPACITY)) .when(!self.disabled, |handle| { handle .track_focus(&focus) diff --git a/crates/layout/src/window_controls.rs b/crates/layout/src/window_controls.rs index 0c348aa..15aad4b 100644 --- a/crates/layout/src/window_controls.rs +++ b/crates/layout/src/window_controls.rs @@ -23,9 +23,6 @@ use gpui_native_theme::ActiveTheme as _; use gpui::Decorations; #[cfg(any(target_os = "windows", target_os = "linux"))] use gpui::SharedString; -#[cfg(target_os = "windows")] -use gpui::px; - /// macOS traffic-lights zone: the pad a leading titlebar strip reserves. pub use gpui_native_theme::TRAFFIC_LIGHT_PAD; #[cfg(target_os = "windows")] @@ -232,7 +229,7 @@ fn caption_button( close: bool, ) -> AnyElement { let theme = cx.theme(); - let glyph_size = theme.sizes.small.caption_size; + let glyph_size = theme.sizes.small.dense_icon_size; let hover = if close { WINDOWS_CLOSE_HOVER @@ -250,7 +247,7 @@ fn caption_button( .flex() .items_center() .justify_center() - .w(px(CAPTION_WIDTH)) + .w(CAPTION_WIDTH) .h_full() .window_control_area(area) .text_color(if enabled { diff --git a/crates/theme/src/lib.rs b/crates/theme/src/lib.rs index d41ef89..9f3f953 100644 --- a/crates/theme/src/lib.rs +++ b/crates/theme/src/lib.rs @@ -29,6 +29,24 @@ use std::time::Duration; /// The hairline width of the control border every button and field paints. pub const BORDER_WIDTH: Pixels = px(1.0); +/// The underline and drop indicators a tab strip paints. +pub const TAB_INDICATOR_WIDTH: Pixels = px(2.0); +/// Opacity applied to disabled controls. +pub const DISABLED_OPACITY: f32 = 0.5; +/// The focus ring's ink alpha. +pub const FOCUS_RING_ALPHA: f32 = 0.5; +/// The narrowest a popover may grow. +pub const POPOVER_MIN_WIDTH: Pixels = px(128.0); +/// The default minimum width of a dialog. +pub const DIALOG_MIN_WIDTH: Pixels = px(384.0); +/// The default minimum width of a menu. +pub const MENU_MIN_WIDTH: Pixels = px(224.0); +/// The width of the pushed-alert stack. +pub const ALERT_STACK_WIDTH: Pixels = px(320.0); +/// The width of the speech waveform strip. +pub const SPEECH_WAVEFORM_WIDTH: Pixels = px(96.0); +/// The line-height ratio of monospace code. +pub const CODE_LINE_HEIGHT: f32 = 1.5; /// The tallest an anchored popup's list may grow. pub const POPUP_MAX_HEIGHT: Pixels = px(320.0); /// The widest a tooltip may grow. diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs index db4e7fb..986921d 100644 --- a/crates/utils/src/lib.rs +++ b/crates/utils/src/lib.rs @@ -4,7 +4,7 @@ use gpui::{ Refineable as _, StatefulInteractiveElement, StyleRefinement, Styled, Window, WindowId, div, px, }; -use gpui_native_theme::{ActiveTheme as _, FOCUS_RING_SPREAD}; +use gpui_native_theme::{ActiveTheme as _, FOCUS_RING_ALPHA, FOCUS_RING_SPREAD}; use std::collections::HashMap; /// A row whose children center on the cross axis. @@ -94,7 +94,10 @@ pub fn record_anchor_bounds( /// Returns a focus ring shadow with the given color at half ink. pub fn focus_ring(color: Hsla) -> Vec { - vec![BoxShadow::new(px(0.), px(0.), color.alpha(0.5)).spread_radius(FOCUS_RING_SPREAD)] + vec![ + BoxShadow::new(px(0.), px(0.), color.alpha(FOCUS_RING_ALPHA)) + .spread_radius(FOCUS_RING_SPREAD), + ] } /// The next selectable row in the direction, or `None` at the ends.