From 2c92f26e201332ab19568d1a2d2d4d78782f08e3 Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Mon, 16 Nov 2026 18:35:43 +0700 Subject: [PATCH] Tokenize remaining component layout metrics - Add combobox, alert edge, and code gutter tokens. - Replace rem-derived literals in alert, combobox, code, and diff. --- crates/core/src/alert.rs | 11 +++++++++-- crates/core/src/combobox.rs | 8 ++++---- crates/editor/src/code.rs | 5 +++-- crates/editor/src/diff.rs | 8 ++++---- crates/editor/src/utils.rs | 4 ++-- crates/theme/src/lib.rs | 8 ++++++++ 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/crates/core/src/alert.rs b/crates/core/src/alert.rs index 6ac1b37..c60d6af 100644 --- a/crates/core/src/alert.rs +++ b/crates/core/src/alert.rs @@ -9,7 +9,8 @@ use gpui::{ }; use gpui_native_icons::{Icon, IconRole}; use gpui_native_theme::{ - ALERT_STACK_WIDTH, ActiveTheme as _, ENTER_SLIDE_DISTANCE, Size, TextRole, Typeset as _, + ALERT_EDGE_WIDTH, ALERT_STACK_WIDTH, ActiveTheme as _, ENTER_SLIDE_DISTANCE, Size, TextRole, + Typeset as _, }; use gpui_native_utils::ResultLogErr as _; @@ -228,7 +229,13 @@ impl RenderOnce for Alert { .overflow_hidden() .bg(ramp.subtle) .refine_style(&self.style) - .child(div().flex_none().w_1p5().self_stretch().bg(ramp.base)) + .child( + div() + .flex_none() + .w(ALERT_EDGE_WIDTH) + .self_stretch() + .bg(ramp.base), + ) .child( div() .flex_1() diff --git a/crates/core/src/combobox.rs b/crates/core/src/combobox.rs index 418c62a..d8a4dd4 100644 --- a/crates/core/src/combobox.rs +++ b/crates/core/src/combobox.rs @@ -17,7 +17,7 @@ use gpui::{ }; use gpui_native_icons::{IconRole, icon}; use gpui_native_theme::ActiveTheme as _; -use gpui_native_theme::{POPUP_MAX_HEIGHT, Size}; +use gpui_native_theme::{COMBOBOX_MIN_WIDTH, COMBOBOX_WIDTH, POPUP_MAX_HEIGHT, Size}; use gpui_native_utils::ResultLogErr as _; use crate::common::{OVERLAY_LAYER, Sizable, StyledExt as _, h_flex, v_flex}; @@ -531,8 +531,8 @@ where .id(id.clone()) .key_context(COMBOBOX_CONTEXT) .relative() - .w(window.rem_size() * 12.0) - .min_w(window.rem_size() * 6.0) + .w(COMBOBOX_WIDTH) + .min_w(COMBOBOX_MIN_WIDTH) .refine_style(&self.style) .role(Role::ComboBox) .aria_expanded(open) @@ -682,7 +682,7 @@ where let popup_width = wrapper_bounds .borrow() .map(|bounds| bounds.size.width) - .unwrap_or_else(|| window.rem_size() * 12.0); + .unwrap_or(COMBOBOX_WIDTH); let panel = v_flex() .id((id.clone(), "panel")) diff --git a/crates/editor/src/code.rs b/crates/editor/src/code.rs index fd26cca..23ecfd7 100644 --- a/crates/editor/src/code.rs +++ b/crates/editor/src/code.rs @@ -12,7 +12,8 @@ use gpui::{ }; use gpui_native_core::scrollbar::{Scrollbar, ScrollbarHandle, ScrollbarVisibility}; use gpui_native_theme::{ - ActiveTheme as _, CODE_LINE_HEIGHT, ColorTokens, MONO_ADVANCE_RATIO, Ramps, WASH_ALPHA_SOFT, + ActiveTheme as _, CODE_GUTTER_WIDTH, CODE_LINE_HEIGHT, ColorTokens, MONO_ADVANCE_RATIO, Ramps, + WASH_ALPHA_SOFT, }; use crate::highlight::{HighlightedCode, Language, Role, highlight}; @@ -264,7 +265,7 @@ impl Render for CodeViewState { let state = cx.entity(); let line_count = self.code.lines.len(); let selection = self.selection(); - let gutter_width = root_font_size * 2.5; + let gutter_width = CODE_GUTTER_WIDTH; let bounds_cell: std::rc::Rc>>> = std::rc::Rc::new(std::cell::RefCell::new(None)); diff --git a/crates/editor/src/diff.rs b/crates/editor/src/diff.rs index 478f4e1..11d3a2d 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 _, BORDER_WIDTH, MONO_ADVANCE_RATIO}; +use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, CODE_GUTTER_WIDTH, MONO_ADVANCE_RATIO}; use similar::{Change, ChangeTag, TextDiff}; use std::ops::Range; @@ -524,10 +524,10 @@ fn render_row( .text_color(colors.muted_foreground) .when( options.indicators == DiffIndicators::Classic, - |row_element| row_element.child(div().w_10().flex_none()), + |row_element| row_element.child(div().w(CODE_GUTTER_WIDTH).flex_none()), ) .when(options.line_numbers, |row_element| { - row_element.child(div().w_10().flex_none()) + row_element.child(div().w(CODE_GUTTER_WIDTH).flex_none()) }) .when( options.indicators == DiffIndicators::Bars && !options.line_numbers, @@ -654,7 +654,7 @@ fn render_row( .map(|number| number.to_string()) .unwrap_or_default(), ) - .w_10() + .w(CODE_GUTTER_WIDTH) .whitespace_nowrap() .bg(match row.kind { DiffRowKind::Context => wash_gutter(&colors), diff --git a/crates/editor/src/utils.rs b/crates/editor/src/utils.rs index 7ddf56d..38c1a19 100644 --- a/crates/editor/src/utils.rs +++ b/crates/editor/src/utils.rs @@ -11,7 +11,7 @@ use gpui::StyledText; #[cfg(any(feature = "code", feature = "markdown"))] use gpui::{App, HighlightStyle, Hsla, IntoElement, ParentElement as _, Styled as _, div}; #[cfg(any(feature = "code", feature = "markdown"))] -use gpui_native_theme::{ActiveTheme as _, ColorTokens, Ramps}; +use gpui_native_theme::{ActiveTheme as _, CODE_GUTTER_WIDTH, ColorTokens, Ramps}; #[cfg(feature = "diff")] use gpui_native_theme::{WASH_ALPHA, WASH_ALPHA_GUTTER, WASH_ALPHA_STRONG}; @@ -74,7 +74,7 @@ where let theme = cx.theme(); div() - .size_10() + .size(CODE_GUTTER_WIDTH) .flex() .items_center() .justify_center() diff --git a/crates/theme/src/lib.rs b/crates/theme/src/lib.rs index 9f3f953..9186519 100644 --- a/crates/theme/src/lib.rs +++ b/crates/theme/src/lib.rs @@ -43,6 +43,14 @@ pub const DIALOG_MIN_WIDTH: Pixels = px(384.0); 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 accent edge of an inline alert. +pub const ALERT_EDGE_WIDTH: Pixels = px(6.0); +/// The default width of a combobox trigger. +pub const COMBOBOX_WIDTH: Pixels = px(192.0); +/// The narrowest a combobox trigger may shrink. +pub const COMBOBOX_MIN_WIDTH: Pixels = px(96.0); +/// The width of a code view's line-number gutter. +pub const CODE_GUTTER_WIDTH: Pixels = px(40.0); /// The width of the speech waveform strip. pub const SPEECH_WAVEFORM_WIDTH: Pixels = px(96.0); /// The line-height ratio of monospace code.