reya/gpui-native-kit
1
0
Fork 2
Code Issues Pull Requests 2 Actions 3 Packages Releases Activity

chore: audit components

Browse Source
This commit is contained in:
reya
2026-11-10 15:06:16 +07:00
parent af2177c6c8
commit 03369f501e
92 changed files with 2744 additions and 1947 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+28 -23
View File
@@ -467,7 +467,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bench_metrics"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"anyhow",
"criterion",
@@ -830,7 +830,7 @@ dependencies = [
[[package]]
name = "collections"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"gpui_util",
"indexmap",
@@ -1140,7 +1140,7 @@ dependencies = [
[[package]]
name = "derive_refineable"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"proc-macro2",
"quote",
@@ -1697,6 +1697,7 @@ dependencies = [
"gpui-native-icons",
"gpui-native-layout",
"gpui-native-theme",
"gpui-native-utils",
"gpui_platform",
"reqwest_client",
]
@@ -1817,7 +1818,7 @@ dependencies = [
[[package]]
name = "gpui"
version = "0.2.2"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"accesskit",
"anyhow",
@@ -1892,6 +1893,7 @@ dependencies = [
"gpui-native-icons",
"gpui-native-theme",
"gpui-native-utils",
"log",
"unicode-segmentation",
]
@@ -1915,6 +1917,7 @@ dependencies = [
"gpui-native-icons",
"gpui-native-theme",
"gpui-native-utils",
"log",
"pulldown-cmark",
"similar",
"tree-sitter",
@@ -1965,6 +1968,7 @@ dependencies = [
"async-channel",
"block2 0.6.2",
"gpui",
"log",
"notify",
"objc2 0.6.5",
"objc2-app-kit 0.3.2",
@@ -1982,12 +1986,13 @@ version = "0.1.0"
dependencies = [
"gpui",
"gpui-native-theme",
"log",
]
[[package]]
name = "gpui_apple"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"anyhow",
"async-task",
@@ -2026,7 +2031,7 @@ dependencies = [
[[package]]
name = "gpui_ios"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"anyhow",
"block2 0.6.2",
@@ -2047,7 +2052,7 @@ dependencies = [
[[package]]
name = "gpui_linux"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"accesskit",
"anyhow",
@@ -2074,7 +2079,7 @@ dependencies = [
[[package]]
name = "gpui_macos"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"accesskit",
"accesskit_macos",
@@ -2114,7 +2119,7 @@ dependencies = [
[[package]]
name = "gpui_macros"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -2125,7 +2130,7 @@ dependencies = [
[[package]]
name = "gpui_platform"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"anyhow",
"console_error_panic_hook",
@@ -2140,7 +2145,7 @@ dependencies = [
[[package]]
name = "gpui_shared_string"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"schemars",
"serde",
@@ -2150,7 +2155,7 @@ dependencies = [
[[package]]
name = "gpui_util"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"anyhow",
"log",
@@ -2160,7 +2165,7 @@ dependencies = [
[[package]]
name = "gpui_web"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"anyhow",
"async-channel",
@@ -2189,7 +2194,7 @@ dependencies = [
[[package]]
name = "gpui_wgpu"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"anyhow",
"bytemuck",
@@ -2214,7 +2219,7 @@ dependencies = [
[[package]]
name = "gpui_windows"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"accesskit",
"accesskit_windows",
@@ -2401,7 +2406,7 @@ dependencies = [
[[package]]
name = "http_client"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"anyhow",
"bytes",
@@ -2419,7 +2424,7 @@ dependencies = [
[[package]]
name = "http_client_tls"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"log",
"rustls",
@@ -4657,7 +4662,7 @@ dependencies = [
[[package]]
name = "refineable"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"derive_refineable",
]
@@ -4700,7 +4705,7 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
[[package]]
name = "reqwest_client"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"anyhow",
"bytes",
@@ -4958,7 +4963,7 @@ dependencies = [
[[package]]
name = "scheduler"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"async-task",
"backtrace",
@@ -5401,7 +5406,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "sum_tree"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"heapless",
"rayon",
@@ -7438,7 +7443,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
[[package]]
name = "ztracing"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
dependencies = [
"tracing",
"ztracing_macro",
@@ -7447,7 +7452,7 @@ dependencies = [
[[package]]
name = "ztracing_macro"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#504a7f2cf25b817cda3998cab93473adef15f93c"
source = "git+https://github.com/zed-industries/zed?rev=504a7f2cf25b817cda3998cab93473adef15f93c#504a7f2cf25b817cda3998cab93473adef15f93c"
[[package]]
name = "zune-core"
Cargo.toml
+4 -4
View File
@@ -24,14 +24,14 @@ gpui-native-icons = { path = "crates/icons" }
gpui-native-theme = { path = "crates/theme" }
[workspace.dependencies]
gpui = { git = "https://github.com/zed-industries/zed" }
gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["font-kit"] }
reqwest_client = { git = "https://github.com/zed-industries/zed" }
gpui = { git = "https://github.com/zed-industries/zed", rev = "504a7f2cf25b817cda3998cab93473adef15f93c" }
gpui_platform = { git = "https://github.com/zed-industries/zed", rev = "504a7f2cf25b817cda3998cab93473adef15f93c", features = ["font-kit"] }
reqwest_client = { git = "https://github.com/zed-industries/zed", rev = "504a7f2cf25b817cda3998cab93473adef15f93c" }
gpui-native-core = { path = "crates/core", default-features = false }
gpui-native-data = { path = "crates/data", default-features = false }
gpui-native-editor = { path = "crates/editor", default-features = false }
gpui-native-layout = { path = "crates/layout" }
gpui-native-layout = { path = "crates/layout", default-features = false }
gpui-native-icons = { path = "crates/icons" }
gpui-native-theme = { path = "crates/theme" }
gpui-native-utils = { path = "crates/utils" }
crates/core/Cargo.toml
+1
View File
@@ -9,6 +9,7 @@ gpui = { workspace = true }
gpui-native-icons = { workspace = true }
gpui-native-theme = { workspace = true }
gpui-native-utils = { workspace = true }
log = "0.4"
unicode-segmentation = "1.12"
[dev-dependencies]
crates/core/src/alert.rs
+21 -18
View File
@@ -3,13 +3,16 @@ use std::rc::Rc;
use gpui::prelude::FluentBuilder as _;
use gpui::{
Animation, AnimationExt as _, App, Context, ElementId, Entity, InteractiveElement as _,
IntoElement, ParentElement as _, RenderOnce, SharedString, StatefulInteractiveElement as _,
Styled as _, Window, deferred, div, ease_out_quint, px,
IntoElement, ParentElement as _, RenderOnce, Role, SharedString,
StatefulInteractiveElement as _, Styled as _, Window, deferred, div, ease_out_quint,
};
use gpui_native_icons::{Icon, IconRole, icon};
use gpui_native_theme::{ActiveTheme as _, Size};
use gpui_native_theme::{ActiveTheme as _, ENTER_SLIDE_DISTANCE, Size};
use gpui_native_utils::ResultLogErr as _;
use crate::button::{Button, ButtonVariant};
use crate::common::DismissHandler;
use crate::common::Sizable as _;
use crate::common::v_flex;
/// How alarming an [`Alert`] is; picks the icon and the accent color.
@@ -28,6 +31,7 @@ pub enum AlertSeverity {
/// A static callout banner.
#[derive(Clone, IntoElement)]
#[must_use]
pub struct Alert {
id: ElementId,
title: Option<SharedString>,
@@ -129,7 +133,6 @@ impl RenderOnce for Alert {
let foreground = theme.colors.foreground;
let muted_foreground = theme.colors.muted_foreground;
let muted = theme.colors.muted;
let surface = theme.colors.surface;
let border = if theme.borders.overlays {
@@ -145,6 +148,8 @@ impl RenderOnce for Alert {
let caption_size = metrics.caption_size;
div()
.id(self.id.clone())
.role(Role::Alert)
.w_full()
.flex()
.items_start()
@@ -197,18 +202,11 @@ impl RenderOnce for Alert {
)
.when_some(self.on_dismiss, |alert, on_dismiss| {
alert.child(
div()
.id((self.id, "alert-close"))
.flex_none()
.cursor_pointer()
.p_1()
.rounded(theme.radius.sm)
.hover(|style| style.bg(muted))
.child(
icon(IconRole::Close)
.size(theme.sizes.small.dense_icon_size)
.color(theme.colors.muted_foreground),
)
Button::new((self.id.clone(), "alert-close"))
.icon(IconRole::Close)
.variant(ButtonVariant::Ghost)
.small()
.accessibility_label("Dismiss")
.on_click(move |_, _window, cx| on_dismiss(cx)),
)
})
@@ -240,7 +238,9 @@ impl Alerts {
let stack = cx.entity().downgrade();
alert.on_dismiss = Some(Rc::new(move |cx: &mut App| {
stack.update(cx, |alerts, cx| alerts.dismiss(id, cx)).ok();
stack
.update(cx, |alerts, cx| alerts.dismiss(id, cx))
.log_err();
}));
self.entries.push(AlertEntry {
@@ -294,6 +294,7 @@ impl Alerts {
/// The floating stack of pushed alerts, topmost right.
#[derive(IntoElement)]
#[must_use]
pub struct AlertsView {
alerts: Entity<Alerts>,
id: ElementId,
@@ -341,7 +342,9 @@ impl RenderOnce for AlertsView {
.with_animation(
("alert-enter", id),
Animation::new(enter_duration),
move |layer, delta| layer.left(px(24. * (1. - ease_slide(delta)))),
move |layer, delta| {
layer.left(ENTER_SLIDE_DISTANCE * (1. - ease_slide(delta)))
},
)
})),
)
crates/core/src/avatar.rs
+4 -3
View File
@@ -24,6 +24,7 @@ const MIN_FILLED: usize = 5;
/// An avatar for a user or other entity.
#[derive(IntoElement)]
#[must_use]
pub struct Avatar {
id: SharedString,
name: Option<SharedString>,
@@ -210,9 +211,9 @@ fn pattern(seed: u64) -> [u8; GRID_SIZE * GRID_SIZE] {
break;
}
let ix = (start + offset) % total;
let row = MARGIN + ix / art_columns;
let col = MARGIN + ix % art_columns;
let flat_index = (start + offset) % total;
let row = MARGIN + flat_index / art_columns;
let col = MARGIN + flat_index % art_columns;
if pattern[row * GRID_SIZE + col] == 0 {
set_cell(&mut pattern, row, col, 1);
crates/core/src/badge.rs
+1
View File
@@ -71,6 +71,7 @@ impl BadgeVariant {
/// A small pill for a count or a state.
#[derive(IntoElement)]
#[must_use]
pub struct Badge {
id: ElementId,
label: SharedString,
crates/core/src/button.rs
+1
View File
@@ -35,6 +35,7 @@ pub enum ButtonVariant {
/// A push button: pointer, Enter, and Space all fire the single `on_click`.
#[derive(IntoElement)]
#[must_use]
pub struct Button {
id: ElementId,
label: Option<SharedString>,
crates/core/src/checkbox.rs
+1
View File
@@ -16,6 +16,7 @@ type ChangeHandler = Box<dyn Fn(bool, &mut Window, &mut App)>;
/// A controlled checkbox component.
#[derive(IntoElement)]
#[must_use]
pub struct Checkbox {
id: ElementId,
label: Option<SharedString>,
crates/core/src/clipboard.rs
+4 -2
View File
@@ -10,6 +10,7 @@ use gpui::{
};
use gpui_native_icons::IconRole;
use gpui_native_theme::Size;
use gpui_native_utils::ResultLogErr as _;
use crate::button::{Button, ButtonVariant};
use crate::common::Sizable;
@@ -25,6 +26,7 @@ type CopiedHandler = Box<dyn Fn(&mut App)>;
/// A quiet icon button that copies a value to the system clipboard.
#[derive(IntoElement)]
#[must_use]
pub struct ClipboardButton {
id: ElementId,
value: SharedString,
@@ -153,9 +155,9 @@ impl RenderOnce for ClipboardButton {
cx.notify();
}
})
.ok();
.log_err();
})
.ok();
.log_err();
});
copied.update(cx, |state, _| {
crates/core/src/combobox.rs
+33 -17
View File
@@ -16,7 +16,9 @@ use gpui::{
Window, actions, anchored, canvas, deferred, div, point, px,
};
use gpui_native_icons::{IconRole, icon};
use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, POPUP_MAX_HEIGHT, Size};
use gpui_native_theme::ActiveTheme as _;
use gpui_native_theme::{BORDER_WIDTH, POPUP_MAX_HEIGHT, Size};
use gpui_native_utils::ResultLogErr as _;
use crate::common::{Sizable, StyledExt as _, h_flex, v_flex};
use crate::input::{Input, InputState, InputStateEvent};
@@ -67,6 +69,7 @@ pub type ComboboxCreateHandler = Rc<dyn Fn(SharedString, &mut Window, &mut App)>
pub type ComboboxFilter<T> = Rc<dyn Fn(&str, &T, &SharedString) -> bool>;
/// Builder for a combobox. Pass it to [`ComboboxState::new`].
#[must_use]
pub struct Combobox<T>
where
T: Clone + PartialEq + 'static,
@@ -109,7 +112,10 @@ where
}
/// Sets the initially selected value; its label seeds the field.
pub fn selected(mut self, selected: impl Into<Option<T>>) -> Self {
pub fn selected<S>(mut self, selected: S) -> Self
where
S: Into<Option<T>>,
{
self.selected = selected.into();
self
}
@@ -337,7 +343,8 @@ where
if let Some(on_change) = self.on_change.clone() {
let value = value.clone();
let task = window.spawn(cx, async move |cx| {
cx.update(|window, cx| on_change(value, window, cx)).ok();
cx.update(|window, cx| on_change(value, window, cx))
.log_err();
});
self.tasks.push(task);
}
@@ -404,7 +411,8 @@ where
{
let text = SharedString::from(text);
let task = window.spawn(cx, async move |cx| {
cx.update(|window, cx| on_create(text, window, cx)).ok();
cx.update(|window, cx| on_create(text, window, cx))
.log_err();
});
self.tasks.push(task);
}
@@ -418,17 +426,20 @@ where
if self.visible.is_empty() {
return;
}
let current = self.highlight.filter(|row| *row < self.visible.len());
let count = self.visible.len();
let current = self.highlight.filter(|row| *row < count);
let next = match current {
Some(row) => {
let row = (row as i32 + delta).rem_euclid(self.visible.len() as i32);
row as usize
}
Some(row) => match row.checked_add_signed(isize::try_from(delta).unwrap_or(0)) {
Some(next) if next < count => next,
Some(_) => 0,
None => count - 1,
},
None => {
if delta > 0 {
0
} else {
self.visible.len() - 1
count - 1
}
}
};
@@ -581,19 +592,24 @@ where
.visible
.iter()
.enumerate()
.map(|(row, option_ix)| {
let (value, label) = &self.options[*option_ix];
.map(|(row, option_index)| {
let Some((value, label)) = self.options.get(*option_index) else {
return div().into_any_element();
};
let highlighted = self.highlight == Some(row);
let checked = self.selected.as_ref() == Some(value);
let state = state.clone();
let row_ix = row;
let row_index = row;
div()
.id(("option", row))
.id(("option", *option_index))
.debug_selector({
let id = id.clone();
move || format!("{id}-option-{row}")
})
.role(Role::ListBoxOption)
.aria_label(label.clone())
.flex()
.items_center()
.gap_2()
@@ -605,9 +621,9 @@ where
.on_mouse_move({
let state = state.clone();
move |_, _window, cx| {
if state.read(cx).highlight != Some(row_ix) {
if state.read(cx).highlight != Some(row_index) {
state.update(cx, |state, cx| {
state.highlight = Some(row_ix);
state.highlight = Some(row_index);
cx.notify();
});
}
@@ -617,7 +633,7 @@ where
let state = state.clone();
move |_, window, cx| {
state.update(cx, |state, cx| {
state.choose_row(row_ix, window, cx)
state.choose_row(row_index, window, cx)
});
}
})
crates/core/src/command_palette.rs
+25 -9
View File
@@ -39,8 +39,9 @@ pub fn bind_command_palette_keys(cx: &mut App) {
]);
}
/// One action the palette can run: a stable id and the label the matcher sees.
/// A command the palette can run: a stable id and the label the matcher sees.
#[derive(Clone)]
#[must_use]
pub struct Command {
/// The stable domain id handed to `on_execute`.
pub id: SharedString,
@@ -54,7 +55,11 @@ pub struct Command {
impl Command {
/// Creates a command without a hint or icon.
pub fn new(id: impl Into<SharedString>, label: impl Into<SharedString>) -> Self {
pub fn new<I, L>(id: I, label: L) -> Self
where
I: Into<SharedString>,
L: Into<SharedString>,
{
Self {
id: id.into(),
label: label.into(),
@@ -73,7 +78,10 @@ impl Command {
}
/// Sets the row's right-edge hint.
pub fn hint(mut self, hint: impl Into<SharedString>) -> Self {
pub fn hint<H>(mut self, hint: H) -> Self
where
H: Into<SharedString>,
{
self.hint = Some(hint.into());
self
}
@@ -85,6 +93,7 @@ pub type CommandMatcher = Rc<dyn Fn(&str, &[Command]) -> Vec<Command>>;
pub type CommandHandler = Rc<dyn Fn(&Command, &mut Window, &mut App)>;
/// Builder for a command palette. Pass it to [`CommandPaletteState::new`].
#[must_use]
pub struct CommandPalette {
id: ElementId,
name: SharedString,
@@ -261,10 +270,15 @@ impl CommandPaletteState {
if self.matches.is_empty() {
return;
}
let count = self.matches.len();
let next = match self.highlight {
Some(row) => (row as i32 + delta).rem_euclid(self.matches.len() as i32) as usize,
Some(row) => match row.checked_add_signed(isize::try_from(delta).unwrap_or(0)) {
Some(next) if next < count => next,
Some(_) => 0,
None => count - 1,
},
None if delta > 0 => 0,
None => self.matches.len() - 1,
None => count - 1,
};
self.highlight = Some(next);
cx.notify();
@@ -333,7 +347,7 @@ impl Render for CommandPaletteState {
.map(|(row, command)| {
let highlighted = self.highlight == Some(row);
let state = state.clone();
let row_ix = row;
let row_index = row;
h_flex()
.id((ElementId::from(command.id.clone()), "command"))
@@ -341,6 +355,8 @@ impl Render for CommandPaletteState {
let id = id.clone();
move || format!("{id}-command-{row}")
})
.role(Role::ListBoxOption)
.aria_label(command.label.clone())
.gap_2()
.px_2()
.py_1()
@@ -350,9 +366,9 @@ impl Render for CommandPaletteState {
.on_mouse_move({
let state = state.clone();
move |_, _window, cx| {
if state.read(cx).highlight != Some(row_ix) {
if state.read(cx).highlight != Some(row_index) {
state.update(cx, |state, cx| {
state.highlight = Some(row_ix);
state.highlight = Some(row_index);
cx.notify();
});
}
@@ -361,7 +377,7 @@ impl Render for CommandPaletteState {
.on_click({
let state = state.clone();
move |_, window, cx| {
state.update(cx, |state, cx| state.choose_row(row_ix, window, cx));
state.update(cx, |state, cx| state.choose_row(row_index, window, cx));
}
})
.when_some(command.icon.clone(), |row, icon| {
crates/core/src/context_menu.rs
+3
View File
@@ -12,7 +12,10 @@ type TargetFn = Box<dyn Fn(&mut Window, &mut App) -> gpui::AnyElement>;
type ItemsFn = Box<dyn Fn(&mut Window, &mut App) -> Vec<MenuItem>>;
/// A menu that opens at the pointer when its target is right-clicked.
///
/// Open state is owned internally by design, unlike the controlled [`Menu`].
#[derive(IntoElement)]
#[must_use]
pub struct ContextMenu {
id: ElementId,
target: Option<TargetFn>,
crates/core/src/dialog.rs
+1
View File
@@ -19,6 +19,7 @@ type ActionsFn = Box<dyn Fn(&mut Window, &mut App) -> Vec<AnyElement>>;
/// A centred panel over a dim scrim: the platform's modal.
#[derive(IntoElement)]
#[must_use]
pub struct Dialog {
id: ElementId,
open: bool,
crates/core/src/dropdown_menu.rs
+1
View File
@@ -26,6 +26,7 @@ type ItemsFn = Box<dyn Fn(&mut Window, &mut App) -> Vec<MenuItem>>;
/// A push button with an attached dropdown menu.
#[derive(IntoElement)]
#[must_use]
pub struct DropdownMenu {
id: ElementId,
label: Option<SharedString>,
crates/core/src/empty_state.rs
+1
View File
@@ -10,6 +10,7 @@ use crate::common::{StyledExt, v_flex};
/// The centered "nothing here yet" panel for lists, tables, and searches.
#[derive(IntoElement)]
#[must_use]
pub struct EmptyState {
icon: Option<Icon>,
headline: SharedString,
crates/core/src/field.rs
+1
View File
@@ -21,6 +21,7 @@ pub enum FieldVariant {
/// A labeled control: the label, description, and error around any element.
#[derive(IntoElement)]
#[must_use]
pub struct Field {
id: ElementId,
label: SharedString,
crates/core/src/input.rs
+11 -4
View File
@@ -570,7 +570,10 @@ impl InputState {
}
/// Creates the state entity with initial text, caret at the end.
pub fn new_with_text(text: impl Into<String>, cx: &mut App) -> Entity<Self> {
pub fn new_with_text<T>(text: T, cx: &mut App) -> Entity<Self>
where
T: Into<String>,
{
let text = sanitize(text.into(), false);
cx.new(|cx| {
let mut state = Self::new_inner(cx);
@@ -1006,7 +1009,7 @@ impl InputState {
start = end + '\n'.len_utf8();
}
}
Err(err) => eprintln!("shaping input text failed: {err}"),
Err(err) => log::warn!("shaping input text failed: {err}"),
}
ShapedText { lines, mask_map }
@@ -1186,7 +1189,7 @@ impl InputState {
window,
cx,
) {
eprintln!("painting input text failed: {err}");
log::warn!("painting input text failed: {err}");
}
line_top += layout.line_height * (entry.line.wrap_boundaries().len() + 1) as f32;
}
@@ -1838,6 +1841,7 @@ impl EntityInputHandler for InputState {
/// A text field bound to an application-owned [`InputState`].
#[derive(IntoElement)]
#[must_use]
pub struct Input {
id: ElementId,
state: Entity<InputState>,
@@ -2470,7 +2474,10 @@ fn real_index(mask_map: &Option<Vec<(usize, usize)>>, display: usize) -> usize {
/// Newlines have no meaning in a single-line field; multiline fields keep
/// them and drop carriage returns.
fn sanitize(text: impl Into<String>, multiline: bool) -> String {
fn sanitize<T>(text: T, multiline: bool) -> String
where
T: Into<String>,
{
let text = text.into();
if multiline {
text.replace('\r', "")
crates/core/src/link.rs
+1
View File
@@ -13,6 +13,7 @@ type ClickHandler = Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>;
/// Link component.
#[derive(IntoElement)]
#[must_use]
pub struct Link {
id: ElementId,
label: Option<SharedString>,
crates/core/src/menu.rs
+63 -44
View File
@@ -12,7 +12,7 @@ use gpui::{
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 _, POPUP_MAX_HEIGHT};
use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, POPUP_MAX_HEIGHT};
use gpui_native_utils::focus_handle;
use crate::common::v_flex;
@@ -23,6 +23,8 @@ pub type ItemHandler = Rc<dyn Fn(&mut Window, &mut App)>;
/// Reports the next open state of a menu: `true` to open, `false` to close.
pub(crate) type ChangeHandler = Rc<dyn Fn(bool, &mut Window, &mut App)>;
/// Flips a panel's flyout open state; `true` arms the first row for keyboard.
type FlyoutSetter = Rc<dyn Fn(Option<usize>, bool, &mut App)>;
/// Bounds captured during the last paint, shared with the dismissal listener.
pub(crate) type TriggerBoundsCell = Rc<RefCell<Option<Bounds<Pixels>>>>;
type TriggerFn = Box<dyn Fn(&mut Window, &mut App) -> AnyElement>;
@@ -30,7 +32,9 @@ type ItemsFn = Box<dyn Fn(&mut Window, &mut App) -> Vec<MenuItem>>;
/// One row of a [`Menu`]: an action, a checkable action, a submenu, or a separator.
#[derive(Clone)]
#[must_use]
pub struct MenuItem {
id: Option<ElementId>,
kind: MenuItemKind,
label: SharedString,
icon: Option<Icon>,
@@ -55,6 +59,7 @@ impl MenuItem {
L: Into<SharedString>,
{
Self {
id: None,
kind: MenuItemKind::Action,
label: label.into(),
icon: None,
@@ -69,6 +74,7 @@ impl MenuItem {
/// A divider between groups of actions.
pub fn separator() -> Self {
Self {
id: None,
kind: MenuItemKind::Separator,
label: SharedString::default(),
icon: None,
@@ -80,6 +86,15 @@ impl MenuItem {
}
}
/// Overrides the row's element id, for stable identity across reorderings.
pub fn id<I>(mut self, id: I) -> Self
where
I: Into<ElementId>,
{
self.id = Some(id.into());
self
}
/// Runs this action when the item is activated. The menu closes first.
pub fn handler<F>(mut self, handler: F) -> Self
where
@@ -176,6 +191,7 @@ pub(crate) struct MenuChrome {
/// A floating menu of actions anchored below its trigger.
#[derive(IntoElement)]
#[must_use]
pub struct Menu {
id: ElementId,
open: bool,
@@ -256,7 +272,10 @@ impl Menu {
}
/// Positions the panel at this window point when it opens.
pub fn open_at(mut self, position: impl Into<Option<Point<Pixels>>>) -> Self {
pub fn open_at<P>(mut self, position: P) -> Self
where
P: Into<Option<Point<Pixels>>>,
{
self.open_at = position.into();
self
}
@@ -461,6 +480,8 @@ struct FlyoutContext<'a> {
state: &'a MenuPanelState,
open: &'a Entity<Option<usize>>,
preselect: &'a Entity<bool>,
/// Opens or closes this level's flyout, re-arming it on every switch.
set_flyout: FlyoutSetter,
/// The open flyout's painted bounds; a parent ignores clicks inside them.
bounds: &'a TriggerBoundsCell,
/// Bounds of every open flyout below this panel, this level's included.
@@ -492,6 +513,8 @@ pub(crate) fn anchored_menu_panel(
) -> Option<AnyElement> {
let was_open = window.use_keyed_state((id.clone(), "menu-was-open"), cx, |_, _| false);
// Render-phase residue: trigger-toggle and owner-driven closes bypass every
// dismissal handler, so this closed frame is the only universal close hook.
if !spec.open {
was_open.update(cx, |was_open, _| *was_open = false);
// A closed menu drops any open flyout; fresh state on the next open.
@@ -551,6 +574,8 @@ fn menu_panel(
selection,
} = state;
// Render-phase residue: panels open from owner state alone, so this mount
// frame is the only place fresh-selection init can read its params.
let selected = if *was_open.read(cx) {
*selection.read(cx)
} else {
@@ -574,8 +599,6 @@ fn menu_panel(
let flyout_open = window.use_keyed_state((params.id.clone(), "submenu-open"), cx, |_, _| None);
let flyout_preselect =
window.use_keyed_state((params.id.clone(), "submenu-preselect"), cx, |_, _| false);
let flyout_last =
window.use_keyed_state((params.id.clone(), "submenu-last-open"), cx, |_, _| None);
let flyout_bounds: TriggerBoundsCell = Rc::new(RefCell::new(None));
let flyout_stack: Rc<RefCell<Vec<TriggerBoundsCell>>> = Rc::new(RefCell::new(Vec::new()));
flyout_stack.borrow_mut().push(flyout_bounds.clone());
@@ -584,25 +607,29 @@ fn menu_panel(
outer_stack.borrow_mut().push(flyout_bounds.clone());
}
// A switched or reopened flyout starts from a clean selection.
let open_flyout = *flyout_open.read(cx);
if *flyout_last.read(cx) != open_flyout {
flyout_state
.was_open
.update(cx, |was_open, _| *was_open = false);
flyout_state
.selection
.update(cx, |selection, _| *selection = None);
flyout_last.update(cx, |last, _| *last = open_flyout);
}
let dismiss_flyout: ChangeHandler = {
// Every open flip re-arms a clean flyout, so render never reconciles one.
let set_flyout: FlyoutSetter = {
let flyout_open = flyout_open.clone();
let flyout_preselect = flyout_preselect.clone();
let flyout_was_open = flyout_state.was_open.clone();
let flyout_selection = flyout_state.selection.clone();
Rc::new(move |index, opens_preselected, cx| {
if index.is_some() && *flyout_open.read(cx) == index {
return;
}
flyout_open.update(cx, |open, _| *open = index);
flyout_preselect.update(cx, |preselect, _| *preselect = opens_preselected);
flyout_was_open.update(cx, |was_open, _| *was_open = false);
flyout_selection.update(cx, |selection, _| *selection = None);
})
};
let dismiss_flyout: ChangeHandler = {
let set_flyout = set_flyout.clone();
let focus = focus.clone();
Rc::new(move |_, window, cx| {
flyout_open.update(cx, |open, _| *open = None);
flyout_preselect.update(cx, |preselect, _| *preselect = false);
set_flyout(None, false, cx);
window.focus(&focus, cx);
})
};
@@ -611,6 +638,7 @@ fn menu_panel(
state: &flyout_state,
open: &flyout_open,
preselect: &flyout_preselect,
set_flyout: set_flyout.clone(),
bounds: &flyout_bounds,
stack: &flyout_stack,
dismiss: dismiss_flyout,
@@ -693,8 +721,7 @@ fn menu_panel(
.on_key_down({
let items = params.items.clone();
let selection = selection.clone();
let flyout_open = flyout_open.clone();
let flyout_preselect = flyout_preselect.clone();
let set_flyout = set_flyout.clone();
let on_dismiss = params.on_dismiss.clone();
let on_activate = params.on_activate.clone();
let left_dismisses = params.is_flyout;
@@ -704,8 +731,7 @@ fn menu_panel(
MenuKeyEnv {
items: &items,
selection: &selection,
flyout_open: &flyout_open,
flyout_preselect: &flyout_preselect,
set_flyout: &set_flyout,
on_dismiss: &on_dismiss,
on_activate: &on_activate,
left_dismisses,
@@ -764,7 +790,7 @@ fn render_item(
) -> AnyElement {
match &item.kind {
MenuItemKind::Separator => div()
.h(px(1.))
.h(BORDER_WIDTH)
.debug_selector(move || format!("{}-separator-{index}", env.debug_prefix))
.mx(env.chrome.spacing_unit * 2.0)
.my(env.chrome.spacing_unit)
@@ -835,17 +861,13 @@ fn render_item(
row_shell(cx, item, index, selected, env)
.on_click({
let flyout_open = flyout.open.clone();
let flyout_preselect = flyout.preselect.clone();
let set_flyout = flyout.set_flyout.clone();
move |_, _window, cx| {
if disabled {
return;
}
// Hover already opens the flyout; a click never closes it.
if *flyout_open.read(cx) != Some(index) {
flyout_open.update(cx, |open, _| *open = Some(index));
flyout_preselect.update(cx, |preselect, _| *preselect = false);
}
set_flyout(Some(index), false, cx);
}
})
.child(
@@ -914,9 +936,14 @@ fn row_shell(
let selectable = item.selectable();
let opens_submenu = item.submenu_items().is_some();
let flyout_open = *env.flyout.open.read(cx) == Some(index);
let row_id = item
.id
.clone()
.unwrap_or_else(|| ("menu-item", index).into());
div()
.id(("menu-item", index))
.id(row_id)
.role(Role::MenuItem)
.debug_selector(move || format!("{}-item-{index}", env.debug_prefix))
.flex()
.items_center()
@@ -945,7 +972,7 @@ fn row_shell(
.on_mouse_move({
let selection = env.selection.clone();
let flyout_open = env.flyout.open.clone();
let flyout_preselect = env.flyout.preselect.clone();
let set_flyout = env.flyout.set_flyout.clone();
let dismiss = env.flyout.dismiss.clone();
move |_, window, cx| {
if !selectable {
@@ -957,10 +984,7 @@ fn row_shell(
}
if opens_submenu {
if *flyout_open.read(cx) != Some(index) {
flyout_open.update(cx, |open, _| *open = Some(index));
flyout_preselect.update(cx, |preselect, _| *preselect = false);
}
set_flyout(Some(index), false, cx);
} else if flyout_open.read(cx).is_some() {
dismiss(false, window, cx);
}
@@ -996,8 +1020,7 @@ fn row_color(
struct MenuKeyEnv<'a> {
items: &'a [MenuItem],
selection: &'a Entity<Option<usize>>,
flyout_open: &'a Entity<Option<usize>>,
flyout_preselect: &'a Entity<bool>,
set_flyout: &'a FlyoutSetter,
on_dismiss: &'a Option<ChangeHandler>,
on_activate: &'a Option<ChangeHandler>,
left_dismisses: bool,
@@ -1044,9 +1067,7 @@ fn handle_menu_key(event: &KeyDownEvent, env: MenuKeyEnv, window: &mut Window, c
if !opens {
return;
}
env.flyout_open.update(cx, |open, _| *open = current);
env.flyout_preselect
.update(cx, |preselect, _| *preselect = true);
(env.set_flyout)(current, true, cx);
}
"enter" | "space" => {
if let Some(current) = current
@@ -1054,9 +1075,7 @@ fn handle_menu_key(event: &KeyDownEvent, env: MenuKeyEnv, window: &mut Window, c
&& item.selectable()
{
if item.submenu_items().is_some() {
env.flyout_open.update(cx, |open, _| *open = Some(current));
env.flyout_preselect
.update(cx, |preselect, _| *preselect = true);
(env.set_flyout)(Some(current), true, cx);
} else {
if let Some(on_activate) = env.on_activate {
on_activate(false, window, cx);
crates/core/src/popover.rs
+3 -2
View File
@@ -6,7 +6,7 @@ use gpui::{
Animation, AnimationExt as _, AnyElement, App, Bounds, DispatchPhase, ElementId,
InteractiveElement as _, IntoElement, KeyDownEvent, MouseButton, MouseDownEvent,
ParentElement as _, Pixels, RenderOnce, Role, SharedString, StatefulInteractiveElement as _,
Styled as _, Window, anchored, canvas, deferred, div, ease_out_quint, point, px,
Styled as _, Window, anchored, canvas, deferred, div, ease_out_quint, point,
};
use gpui_native_theme::ActiveTheme as _;
@@ -21,6 +21,7 @@ type BoundsCell = Rc<RefCell<Option<Bounds<Pixels>>>>;
/// A floating panel anchored below its trigger.
#[derive(IntoElement)]
#[must_use]
pub struct Popover {
id: ElementId,
open: bool,
@@ -225,7 +226,7 @@ impl RenderOnce for Popover {
wrapper.child(deferred(
anchored()
.offset(point(px(0.), anchor_gap))
.offset(point(Pixels::ZERO, anchor_gap))
.child(panel.with_animation(
"popover-enter",
Animation::new(enter_duration).with_easing(ease_out_quint()),
crates/core/src/progress.rs
+3 -4
View File
@@ -1,19 +1,18 @@
//! The progress bar: determinate fill or an indeterminate sweep.
use std::time::Duration;
use gpui::prelude::FluentBuilder as _;
use gpui::{
Animation, AnimationExt as _, App, ElementId, InteractiveElement as _, IntoElement,
ParentElement as _, RenderOnce, Role, SharedString, StatefulInteractiveElement as _,
Styled as _, Window, div, relative,
};
use gpui_native_theme::{ActiveTheme as _, Size};
use gpui_native_theme::{ActiveTheme as _, PROGRESS_ANIMATION_PERIOD, Size};
use crate::common::Sizable;
/// A progress bar. With a `value` in `0..=1` it paints a determinate fill.
#[derive(IntoElement)]
#[must_use]
pub struct Progress {
id: ElementId,
value: f32,
@@ -97,7 +96,7 @@ impl RenderOnce for Progress {
.bg(ramps.primary.base)
.with_animation(
"indeterminate",
Animation::new(Duration::from_millis(1500))
Animation::new(PROGRESS_ANIMATION_PERIOD)
.repeat()
.with_max_fps(30.),
|pill, delta| pill.ml(relative(delta * 0.7)),
crates/core/src/radio.rs
+5
View File
@@ -12,6 +12,10 @@ use crate::common::{Sizable, h_flex, v_flex};
type ChangeHandler<V> = std::rc::Rc<dyn Fn(V, &mut Window, &mut App)>;
/// Radio button.
///
/// Each radio is its own tab stop; the full ARIA radiogroup pattern (single
/// stop plus arrow-key roving focus) needs a group owner that does not exist yet.
#[must_use]
pub struct Radio<V> {
id: ElementId,
value: V,
@@ -65,6 +69,7 @@ where
/// Group of radio buttons.
#[derive(IntoElement)]
#[must_use]
pub struct RadioGroup<V>
where
V: Clone + PartialEq + 'static,
crates/core/src/scroll_area.rs
+1
View File
@@ -23,6 +23,7 @@ pub enum ScrollAxes {
/// A scrollable container with an overlay scrollbar.
#[derive(IntoElement)]
#[must_use]
pub struct ScrollArea {
id: ElementId,
handle: Option<ScrollHandle>,
crates/core/src/scrollbar.rs
+62 -58
View File
@@ -10,7 +10,8 @@ use gpui::{
ScrollHandle, SharedString, Styled as _, Task, UniformListScrollHandle, Window, canvas, fill,
point,
};
use gpui_native_theme::ActiveTheme as _;
use gpui_native_theme::{ActiveTheme as _, SCROLLBAR_AUTOHIDE_DELAY, SCROLLBAR_FADE_DURATION};
use gpui_native_utils::ResultLogErr as _;
/// When an overlay scrollbar shows.
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
@@ -22,12 +23,8 @@ pub enum ScrollbarVisibility {
Autohide,
}
/// How long an autohide thumb stays fully visible before its fade begins.
const AUTOHIDE_DELAY: Duration = Duration::from_millis(700);
/// How long the autohide fade runs.
const AUTOHIDE_FADE: Duration = Duration::from_millis(250);
/// How often the fade repaints while it runs.
const AUTOHIDE_FADE_STEP: Duration = Duration::from_millis(50);
/// How often the autohide fade repaints while it runs.
const FADE_STEP: Duration = Duration::from_millis(50);
/// The shared autohide timeline for an overlay scrollbar.
#[derive(Clone)]
@@ -59,21 +56,23 @@ impl Autohide {
let task = window.spawn(cx, async move |cx| {
if reduce_motion {
cx.background_executor()
.timer(AUTOHIDE_DELAY + AUTOHIDE_FADE)
.timer(SCROLLBAR_AUTOHIDE_DELAY + SCROLLBAR_FADE_DURATION)
.await;
cx.update(|_, cx| cx.notify(view)).ok();
cx.update(|_, cx| cx.notify(view)).log_err();
return;
}
let steps = (AUTOHIDE_FADE.as_millis() / AUTOHIDE_FADE_STEP.as_millis()).max(1);
cx.background_executor().timer(AUTOHIDE_DELAY).await;
let steps = (SCROLLBAR_FADE_DURATION.as_millis() / FADE_STEP.as_millis()).max(1);
cx.background_executor()
.timer(SCROLLBAR_AUTOHIDE_DELAY)
.await;
for _ in 0..steps {
cx.update(|_, cx| cx.notify(view)).ok();
cx.background_executor().timer(AUTOHIDE_FADE_STEP).await;
cx.update(|_, cx| cx.notify(view)).log_err();
cx.background_executor().timer(FADE_STEP).await;
}
cx.update(|_, cx| cx.notify(view)).ok();
cx.update(|_, cx| cx.notify(view)).log_err();
});
self.state.update(cx, |state, _| {
@@ -93,50 +92,19 @@ impl Autohide {
};
let idle = activity.elapsed();
if idle <= AUTOHIDE_DELAY {
if idle <= SCROLLBAR_AUTOHIDE_DELAY {
return 1.0;
}
let fade = idle.saturating_sub(AUTOHIDE_DELAY);
if fade >= AUTOHIDE_FADE {
let fade = idle.saturating_sub(SCROLLBAR_AUTOHIDE_DELAY);
if fade >= SCROLLBAR_FADE_DURATION {
return 0.0;
}
1.0 - fade.as_secs_f32() / AUTOHIDE_FADE.as_secs_f32()
1.0 - fade.as_secs_f32() / SCROLLBAR_FADE_DURATION.as_secs_f32()
}
}
fn scrollbar_state_key(name: &'static str, id: &ElementId) -> ElementId {
ElementId::NamedChild(Arc::new(id.clone()), SharedString::from(name))
}
/// Pure thumb geometry for an overlay scrollbar.
fn thumb_geometry(
viewport: Pixels,
content: Pixels,
offset: Pixels,
track: Pixels,
min_thumb: Pixels,
) -> (Pixels, Pixels) {
if content <= viewport || content <= Pixels::ZERO {
return (track, Pixels::ZERO);
}
let length = (viewport / content * track).max(min_thumb).min(track);
let overflow = content - viewport;
let progress = (-offset / overflow).clamp(0., 1.);
let travel = track - length;
(length, travel * progress)
}
/// An overlay scrollbar thumb's style for one paint: `None` hides it.
fn thumb_style(color: gpui::Hsla, alpha: f32) -> Option<gpui::Hsla> {
(alpha > 0.0).then_some(gpui::Hsla {
a: color.a * alpha,
..color
})
}
/// The scroll state a scrollbar drives, implemented for gpui's scroll handles.
pub trait ScrollbarHandle: 'static {
/// How far the content can scroll, positive along each axis.
@@ -245,8 +213,9 @@ impl Axis {
}
}
/// An overlay scrollbar, the caller renders it over the scrolled surface.
/// An overlay scrollbar, rendered over the scrolled surface.
#[derive(IntoElement)]
#[must_use]
pub struct Scrollbar {
axis: Axis,
handle: Rc<dyn ScrollbarHandle>,
@@ -288,6 +257,37 @@ impl Scrollbar {
self.visibility = visibility;
self
}
fn state_key(name: &'static str, id: &ElementId) -> ElementId {
ElementId::NamedChild(Arc::new(id.clone()), SharedString::from(name))
}
/// Pure thumb geometry for an overlay scrollbar.
fn thumb_geometry(
viewport: Pixels,
content: Pixels,
offset: Pixels,
track: Pixels,
min_thumb: Pixels,
) -> (Pixels, Pixels) {
if content <= viewport || content <= Pixels::ZERO {
return (track, Pixels::ZERO);
}
let length = (viewport / content * track).max(min_thumb).min(track);
let overflow = content - viewport;
let progress = (-offset / overflow).clamp(0., 1.);
let travel = track - length;
(length, travel * progress)
}
/// An overlay scrollbar thumb's style for one paint: `None` hides it.
fn thumb_style(color: gpui::Hsla, alpha: f32) -> Option<gpui::Hsla> {
(alpha > 0.0).then_some(gpui::Hsla {
a: color.a * alpha,
..color
})
}
}
impl RenderOnce for Scrollbar {
@@ -297,7 +297,7 @@ impl RenderOnce for Scrollbar {
let axis = self.axis;
let visibility = self.visibility;
let id = self.id;
move |_, _, window, cx| paint_scrollbar(&handle, axis, visibility, &id, window, cx)
move |_, _, window, cx| Self::paint(&handle, axis, visibility, &id, window, cx)
})
.absolute()
.inset_0()
@@ -307,14 +307,15 @@ impl RenderOnce for Scrollbar {
/// The drag state shared between the scrollbar's mouse handlers.
type Drag = Option<(Pixels, Pixels)>;
fn paint_scrollbar(
impl Scrollbar {
fn paint(
handle: &Rc<dyn ScrollbarHandle>,
axis: Axis,
visibility: ScrollbarVisibility,
id: &ElementId,
window: &mut Window,
cx: &mut App,
) {
) {
let view = window.current_view();
let theme = cx.theme();
@@ -336,11 +337,12 @@ fn paint_scrollbar(
ScrollbarVisibility::Always => false,
ScrollbarVisibility::Autohide => true,
};
let autohide_state =
autohide.then(|| Autohide::new(scrollbar_state_key("autohide", id), window, cx));
autohide.then(|| Autohide::new(Self::state_key("autohide", id), window, cx));
let track_length = viewport_along - inset * 2.0;
let (thumb_length, thumb_travel) = thumb_geometry(
let (thumb_length, thumb_travel) = Self::thumb_geometry(
viewport_along,
viewport_along + max_offset,
axis.along(handle.offset()),
@@ -384,7 +386,7 @@ fn paint_scrollbar(
}
};
let drag = window.use_keyed_state(scrollbar_state_key("thumb-drag", id), cx, |_, _| Drag::None);
let drag = window.use_keyed_state(Self::state_key("thumb-drag", id), cx, |_, _| Drag::None);
let dragging = drag.read(cx).is_some();
let alpha = match &autohide_state {
@@ -392,7 +394,7 @@ fn paint_scrollbar(
None => 1.0,
};
if let Some(color) = thumb_style(color, alpha) {
if let Some(color) = Self::thumb_style(color, alpha) {
window.paint_quad(fill(thumb_bounds, color).corner_radii(width / 2.0));
}
@@ -427,7 +429,8 @@ fn paint_scrollbar(
let start_offset = if in_thumb {
axis.along(handle.offset())
} else if track_length > thumb_length {
let thumb_start = ((axis.along(event.position) - axis.along(track_bounds.origin))
let thumb_start = ((axis.along(event.position)
- axis.along(track_bounds.origin))
- thumb_length / 2.0)
.clamp(Pixels::ZERO, track_length - thumb_length);
let offset = -(thumb_start / (track_length - thumb_length)) * max_offset;
@@ -513,4 +516,5 @@ fn paint_scrollbar(
}
}
});
}
}
crates/core/src/segmented.rs
+7 -7
View File
@@ -4,11 +4,10 @@ use gpui::prelude::FluentBuilder as _;
use gpui::{
AnimationExt as _, App, Bounds, ElementId, Entity, InteractiveElement as _, IntoElement,
KeyDownEvent, ParentElement as _, Point, RenderOnce, Role, SharedString, SpringAnimation,
SpringConfig, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Toggled, Window,
canvas, div,
StatefulInteractiveElement as _, StyleRefinement, Styled as _, Toggled, Window, canvas, div,
};
use gpui_native_icons::Icon;
use gpui_native_theme::{ActiveTheme as _, Size};
use gpui_native_theme::{ActiveTheme as _, CONTROL_SPRING, Size};
use gpui_native_utils::{focus_handle, focus_ring};
use crate::common::{Sizable, StyledExt, h_flex};
@@ -18,6 +17,7 @@ type ChangeHandler<T> = Rc<dyn Fn(T, &mut Window, &mut App)>;
/// Segment option for a segmented control.
#[derive(Clone)]
#[must_use]
pub struct SegmentedOption<T> {
value: T,
label: SharedString,
@@ -62,6 +62,7 @@ where
/// A pill strip of mutually exclusive choices.
#[derive(IntoElement)]
#[must_use]
pub struct Segmented<T>
where
T: Clone + PartialEq + 'static,
@@ -187,7 +188,6 @@ where
window.use_keyed_state("segmented-track-origin", cx, |_, _| None);
let focus = focus_handle(&self.id, window, cx);
let anim_config = SpringConfig::new(500., 35., 1.);
let track_point = *track_origin.read(cx);
let plate_target = geometry
@@ -214,7 +214,7 @@ where
};
h_flex()
.id(("segment", index))
.id((ElementId::from("segment"), segment.label.clone()))
.gap_1p5()
.justify_center()
.cursor_pointer()
@@ -309,12 +309,12 @@ where
.shadow(plate_shadow.clone())
.with_spring(
"segmented-plate-x",
SpringAnimation::new(anim_config).to(x),
SpringAnimation::new(CONTROL_SPRING).to(x),
|plate, x| plate.left(x),
)
.with_spring(
"segmented-plate-w",
SpringAnimation::new(anim_config).to(width),
SpringAnimation::new(CONTROL_SPRING).to(width),
|spring_plate, width| {
spring_plate.map_element(move |plate| plate.w(width))
},
crates/core/src/select.rs
+71 -7
View File
@@ -2,12 +2,13 @@ use std::rc::Rc;
use gpui::prelude::FluentBuilder as _;
use gpui::{
App, ElementId, InteractiveElement as _, IntoElement, ParentElement as _, RenderOnce, Role,
SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _, Window,
App, ElementId, InteractiveElement as _, IntoElement, KeyDownEvent, ParentElement as _,
RenderOnce, Role, SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled as _,
Window, canvas,
};
use gpui_native_icons::{Icon, IconRole, icon};
use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, Size};
use gpui_native_utils::focus_ring;
use gpui_native_utils::{focus_handle, focus_ring};
use crate::common::{Sizable, StyledExt, h_flex};
use crate::menu::{Menu, MenuItem};
@@ -17,6 +18,7 @@ pub type SelectHandler<T> = Rc<dyn Fn(Option<T>, &mut Window, &mut App)>;
/// Select option for a [`Select`] control.
#[derive(Clone)]
#[must_use]
pub struct SelectOption<T> {
value: T,
label: SharedString,
@@ -61,6 +63,7 @@ where
/// A control that shows the chosen value and opens a menu of the choices.
#[derive(IntoElement)]
#[must_use]
pub struct Select<T>
where
T: Clone + PartialEq + 'static,
@@ -107,7 +110,10 @@ where
}
/// Sets the current value. `None` shows the placeholder.
pub fn selected(mut self, selected: impl Into<Option<T>>) -> Self {
pub fn selected<S>(mut self, selected: S) -> Self
where
S: Into<Option<T>>,
{
self.selected = selected.into();
self
}
@@ -187,6 +193,16 @@ where
.clone()
});
let focus = focus_handle(&self.id, window, cx);
// Set when the popup closes without an activation; the trigger claims
// focus at paint, leaving keyboard activations to drop focus in place.
let refocus_pending = window.with_element_namespace(self.id.clone(), |window| {
window
.use_keyed_state("select-refocus", cx, |_, _| false)
.clone()
});
let is_open = *open.read(cx);
let open_for_items = open.clone();
@@ -220,12 +236,31 @@ where
let trigger_label = label.clone();
let trigger_style = self.style;
let trigger = move |_window: &mut Window, _cx: &mut App| {
let trigger = {
let open = open.clone();
let focus = focus.clone();
let refocus_for_trigger = refocus_pending.clone();
move |_window: &mut Window, _cx: &mut App| {
h_flex()
.id((trigger_id.clone(), "select-trigger"))
.debug_selector(|| "select-trigger".to_string())
.role(Role::ComboBox)
.aria_label(trigger_label.clone())
.aria_expanded(is_open)
.track_focus(&focus)
.tab_stop(true)
.focus_visible(move |style| style.shadow(focus_ring(ring)))
.on_key_down({
let open = open.clone();
move |event: &KeyDownEvent, _window, cx| {
if !matches!(event.keystroke.key.as_str(), "enter" | "space") {
return;
}
open.update(cx, |open, _| *open = !*open);
cx.stop_propagation();
}
})
.cursor_pointer()
.justify_between()
.gap_2()
@@ -252,22 +287,43 @@ where
.size(icon_size)
.color(muted_foreground),
)
.child(
canvas(|_, _, _| {}, {
let focus = focus.clone();
let refocus_pending = refocus_for_trigger.clone();
move |_, _, window, cx| {
if *refocus_pending.read(cx) {
refocus_pending.update(cx, |pending, _| *pending = false);
window.focus(&focus, cx);
}
}
})
.absolute()
.inset_0(),
)
.refine_style(&trigger_style)
.into_any_element()
}
};
let select_id = self.id.clone();
let refocus_for_items = refocus_pending.clone();
let items = move |_window: &mut Window, _cx: &mut App| {
self.options
.iter()
.map(|option| {
.enumerate()
.map(|(index, option)| {
let is_selected = self.selected.as_ref() == Some(&option.value);
let handler = {
let open = open_for_items.clone();
let refocus_pending = refocus_for_items.clone();
let value = option.value.clone();
let on_change = self.on_change.clone();
move |window: &mut Window, cx: &mut App| {
open.update(cx, |open, _| *open = false);
// Activations own the close, so no focus returns to the trigger.
refocus_pending.update(cx, |pending, _| *pending = false);
if let Some(on_change) = &on_change {
on_change(Some(value.clone()), window, cx);
}
@@ -275,6 +331,7 @@ where
};
MenuItem::new(option.label.clone())
.id((select_id.clone(), format!("option-{index}")))
.when_some(option.icon.clone(), |row, icon| row.icon(icon))
.checked(is_selected)
.handler(handler)
@@ -284,8 +341,15 @@ where
let menu = Menu::new(self.id)
.open(is_open)
.on_change(move |next, _window, cx| {
.on_change({
let open = open.clone();
let refocus_pending = refocus_pending.clone();
move |next, _window, cx| {
if !next {
refocus_pending.update(cx, |pending, _| *pending = true);
}
open.update(cx, |open, _| *open = next);
}
})
.trigger(trigger)
.items(items);
crates/core/src/separator.rs
+1
View File
@@ -20,6 +20,7 @@ type DebugSelector = Rc<dyn Fn() -> String>;
/// A hairline rule that divides sibling content.
#[derive(IntoElement)]
#[must_use]
pub struct Separator {
orientation: SeparatorOrientation,
debug_selector: Option<DebugSelector>,
crates/core/src/slider.rs
+20 -5
View File
@@ -18,18 +18,24 @@ type ChangeHandler = Rc<dyn Fn(f32, &mut Window, &mut App)>;
/// The pointer→value setter shared by the click and drag listeners.
type ValueSetter = Rc<dyn Fn(Pixels, &mut Window, &mut App)>;
/// Clamps `value` into `[min, max]` and snaps it to `step` when stepped.
fn constrain(min: f32, max: f32, step: f32, value: f32) -> f32 {
/// The arrow-key stride as a share of the range when the slider is continuous.
const FALLBACK_STEP_FRACTION: f32 = 0.05;
impl Slider {
/// Clamps `value` into `[min, max]` and snaps it to `step` when stepped.
fn constrain(min: f32, max: f32, step: f32, value: f32) -> f32 {
let clamped = value.clamp(min, max);
if step > 0.0 {
(min + ((clamped - min) / step).round() * step).clamp(min, max)
} else {
clamped
}
}
}
/// A controlled slider over `[min, max]`.
#[derive(IntoElement)]
#[must_use]
pub struct Slider {
id: ElementId,
min: f32,
@@ -146,7 +152,7 @@ impl RenderOnce for Slider {
{
let fraction = ((x - bounds.origin.x) / bounds.size.width).clamp(0.0, 1.0);
on_change(
constrain(min, max, step, min + fraction * (max - min)),
Self::constrain(min, max, step, min + fraction * (max - min)),
window,
cx,
);
@@ -184,20 +190,29 @@ impl RenderOnce for Slider {
if !focus_handle.contains_focused(window, cx) {
return;
}
let single_step = if self.step > 0.0 {
self.step
} else {
(self.max - self.min) / 20.0
(self.max - self.min) * FALLBACK_STEP_FRACTION
};
let next = match event.keystroke.key.as_str() {
"left" | "down" => Some(value - single_step),
"right" | "up" => Some(value + single_step),
"home" => Some(self.min),
"end" => Some(self.max),
_ => None,
};
if let Some(next) = next
&& let Some(on_change) = self.on_change.as_ref()
{
on_change(constrain(self.min, self.max, self.step, next), window, cx);
on_change(
Self::constrain(self.min, self.max, self.step, next),
window,
cx,
);
cx.stop_propagation();
}
})
crates/core/src/spinner.rs
+4 -6
View File
@@ -3,7 +3,6 @@
use std::cell::Cell;
use std::f32::consts::{PI, TAU};
use std::rc::Rc;
use std::time::Duration;
use gpui::prelude::FluentBuilder as _;
use gpui::{
@@ -13,12 +12,10 @@ use gpui::{
Window, canvas, div, percentage, point, px,
};
use gpui_native_icons::{Icon, IconRole, icon};
use gpui_native_theme::{ActiveTheme as _, Size};
use gpui_native_theme::{ActiveTheme as _, SPINNER_PERIOD, Size};
use crate::common::Sizable;
/// One revolution takes this long, the system loaders' cadence.
const SPIN_PERIOD: Duration = Duration::from_millis(800);
/// The share of the circle the spinning arc paints.
const SPIN_SWEEP: f32 = 0.75;
/// The ring stroke as a share of the side.
@@ -36,6 +33,7 @@ pub enum SpinnerVariant {
/// A loading ring.
#[derive(IntoElement)]
#[must_use]
pub struct Spinner {
id: ElementId,
value: Option<f32>,
@@ -178,7 +176,7 @@ fn spinning_ring(side: Pixels, stroke: Pixels, accent: Hsla) -> AnimationElement
.size(side)
.with_animation(
"spin",
Animation::new(SPIN_PERIOD).repeat().with_max_fps(60.),
Animation::new(SPINNER_PERIOD).repeat().with_max_fps(60.),
move |ring, delta| {
angle.set(delta * TAU);
ring
@@ -192,7 +190,7 @@ fn spinning_icon(side: Pixels, accent: Hsla) -> AnimationElement<Icon> {
.color(accent)
.with_animation(
"spin",
Animation::new(SPIN_PERIOD).repeat().with_max_fps(60.),
Animation::new(SPINNER_PERIOD).repeat().with_max_fps(60.),
|glyph, delta| glyph.with_transformation(Transformation::rotate(percentage(delta))),
)
}
crates/core/src/status_dot.rs
+5 -2
View File
@@ -2,7 +2,7 @@
use gpui::prelude::FluentBuilder as _;
use gpui::{
App, ElementId, Hsla, InteractiveElement as _, IntoElement, RenderOnce, SharedString,
App, ElementId, Hsla, InteractiveElement as _, IntoElement, RenderOnce, Role, SharedString,
StatefulInteractiveElement as _, StyleRefinement, Styled, Window, div,
};
use gpui_native_theme::{ActiveTheme as _, Size, Theme};
@@ -34,6 +34,7 @@ impl StatusDotVariant {
/// A small circular bead marking a row's state.
#[derive(IntoElement)]
#[must_use]
pub struct StatusDot {
id: ElementId,
variant: StatusDotVariant,
@@ -99,7 +100,9 @@ impl RenderOnce for StatusDot {
.size(side)
.rounded(theme.radius.full)
.bg(color)
.when_some(self.label, |dot, label| dot.aria_label(label))
.when_some(self.label, |dot, label| {
dot.role(Role::Status).aria_label(label)
})
.refine_style(&self.style)
}
}
crates/core/src/switch.rs
+6 -5
View File
@@ -3,10 +3,10 @@
use gpui::prelude::FluentBuilder as _;
use gpui::{
AnimationExt as _, App, ElementId, InteractiveElement as _, IntoElement, ParentElement as _,
RenderOnce, Role, SharedString, SpringAnimation, SpringConfig, StatefulInteractiveElement as _,
Styled as _, Toggled, Window, div, px,
RenderOnce, Role, SharedString, SpringAnimation, StatefulInteractiveElement as _, Styled as _,
Toggled, Window, div, px,
};
use gpui_native_theme::{ActiveTheme as _, Size};
use gpui_native_theme::{ActiveTheme as _, CONTROL_SPRING, Size};
use gpui_native_utils::focus_ring;
use crate::common::{Sizable, h_flex};
@@ -16,6 +16,7 @@ type ChangeHandler = Box<dyn Fn(bool, &mut Window, &mut App)>;
/// Switch component.
#[derive(IntoElement)]
#[must_use]
pub struct Switch {
id: ElementId,
label: Option<SharedString>,
@@ -108,8 +109,8 @@ impl RenderOnce for Switch {
let a11y_label = self.a11y_label.or_else(|| self.label.clone());
let id = self.id.clone();
let anim_config = SpringConfig::new(500., 35., 1.);
let anim = SpringAnimation::new(anim_config).to(if self.checked { travel } else { px(0.) });
let anim =
SpringAnimation::new(CONTROL_SPRING).to(if self.checked { travel } else { px(0.) });
h_flex()
.id(self.id)
crates/core/src/toast.rs
+34 -32
View File
@@ -6,11 +6,12 @@ use std::time::Duration;
use gpui::prelude::FluentBuilder as _;
use gpui::{
Animation, AnimationExt as _, App, Context, ElementId, Entity, InteractiveElement as _,
IntoElement, ParentElement as _, RenderOnce, SharedString, StatefulInteractiveElement as _,
Styled as _, Task, Window, deferred, div, ease_out_quint, px,
IntoElement, ParentElement as _, RenderOnce, Role, SharedString,
StatefulInteractiveElement as _, Styled as _, Task, Window, deferred, div, ease_out_quint, px,
};
use gpui_native_icons::{Icon, IconRole, icon};
use gpui_native_theme::ActiveTheme as _;
use gpui_native_icons::{Icon, IconRole};
use gpui_native_theme::{ActiveTheme as _, TOAST_MAX_WIDTH};
use gpui_native_utils::ResultLogErr as _;
use crate::button::{Button, ButtonVariant};
use crate::common::{DismissHandler, Sizable as _};
@@ -41,6 +42,7 @@ impl ToastAction {
/// A toast notification.
#[derive(Clone)]
#[must_use]
pub struct Toast {
message: SharedString,
icon: Option<Icon>,
@@ -133,7 +135,8 @@ impl Toasts {
if let Some(duration) = duration.filter(|duration| !duration.is_zero()) {
let task = cx.spawn(async move |this, cx| {
cx.background_executor().timer(duration).await;
this.update(cx, |toasts, cx| toasts.dismiss(id, cx)).ok();
this.update(cx, |toasts, cx| toasts.dismiss(id, cx))
.log_err();
});
self.tasks.push(task);
}
@@ -147,8 +150,7 @@ impl Toasts {
self.finish_exit(cx);
return;
}
if self.current.as_ref().is_some_and(|entry| entry.id == id) {
let entry = self.current.take().expect("current checked above");
if let Some(entry) = self.current.take_if(|entry| entry.id == id) {
self.start_exit(entry, cx);
}
}
@@ -177,7 +179,7 @@ impl Toasts {
if let Some(previous) = self.exiting.take()
&& let Some(on_dismiss) = &previous.toast.on_dismiss
{
(on_dismiss.clone())(cx);
on_dismiss(cx);
}
self.exiting = Some(entry);
@@ -186,7 +188,8 @@ impl Toasts {
let fade = cx.theme().motion.overlay;
let task = cx.spawn(async move |this, cx| {
cx.background_executor().timer(fade).await;
this.update(cx, |toasts, cx| toasts.finish_exit(cx)).ok();
this.update(cx, |toasts, cx| toasts.finish_exit(cx))
.log_err();
});
self.tasks.push(task);
}
@@ -195,13 +198,15 @@ impl Toasts {
if let Some(entry) = self.exiting.take() {
cx.notify();
if let Some(on_dismiss) = &entry.toast.on_dismiss {
(on_dismiss.clone())(cx);
on_dismiss(cx);
}
}
}
}
/// The floating stack of toasts, bottom center.
#[derive(IntoElement)]
#[must_use]
pub struct ToastsView {
toasts: Entity<Toasts>,
id: ElementId,
@@ -239,7 +244,7 @@ impl RenderOnce for ToastsView {
.items_center()
.when_some(exiting, |column, entry| {
let id = entry.id;
column.child(pill(&entry, &self.toasts, cx).with_animation(
column.child(entry.pill(&self.toasts, cx).with_animation(
("toast-exit", id),
Animation::new(fade),
|pill, delta| pill.opacity(1. - delta),
@@ -247,7 +252,7 @@ impl RenderOnce for ToastsView {
})
.when_some(current, |column, entry| {
let id = entry.id;
column.child(pill(&entry, &self.toasts, cx).with_animation(
column.child(entry.pill(&self.toasts, cx).with_animation(
("toast-enter", id),
Animation::new(fade).with_easing(ease_out_quint()),
|pill, delta| pill.opacity(delta),
@@ -257,7 +262,9 @@ impl RenderOnce for ToastsView {
}
}
fn pill(entry: &ToastEntry, toasts: &Entity<Toasts>, cx: &App) -> gpui::Stateful<gpui::Div> {
impl ToastEntry {
/// The rendered pill for this toast.
fn pill(&self, toasts: &Entity<Toasts>, cx: &App) -> gpui::Stateful<gpui::Div> {
let theme = cx.theme();
let surface = theme.colors.surface;
let border = if theme.borders.overlays {
@@ -266,19 +273,19 @@ fn pill(entry: &ToastEntry, toasts: &Entity<Toasts>, cx: &App) -> gpui::Stateful
surface
};
let foreground = theme.colors.foreground;
let muted = theme.colors.muted;
let radius = theme.radius.full;
let shadows = theme.elevations.popover.shadows();
let icon_size = theme.sizes.small.icon_size;
let dense_icon_size = theme.sizes.small.dense_icon_size;
let text_size = theme.sizes.small.text_size;
let toast = &entry.toast;
let toast = &self.toast;
let toasts = toasts.clone();
let id = entry.id;
let id = self.id;
div()
.id(("toast", id))
.max_w(px(480.))
.role(Role::Alert)
.aria_label(toast.message.clone())
.max_w(TOAST_MAX_WIDTH)
.flex()
.items_center()
.py_1p5()
@@ -315,7 +322,7 @@ fn pill(entry: &ToastEntry, toasts: &Entity<Toasts>, cx: &App) -> gpui::Stateful
.variant(ButtonVariant::Primary)
.small()
.on_click(move |_, _window, cx| {
(action.handler.clone())(cx);
(action.handler)(cx);
toasts.update(cx, |toasts, cx| {
toasts.dismiss(id, cx);
});
@@ -324,23 +331,18 @@ fn pill(entry: &ToastEntry, toasts: &Entity<Toasts>, cx: &App) -> gpui::Stateful
)
})
.child(
div()
.id(("toast-close", id))
.flex_none()
.ml_4()
.cursor_pointer()
.p_1()
.rounded(theme.radius.sm)
.hover(|style| style.bg(muted))
.child(
icon(IconRole::Close)
.size(dense_icon_size)
.color(theme.colors.muted_foreground),
)
div().flex_none().ml_4().child(
Button::new(("toast-close", id))
.icon(IconRole::Close)
.variant(ButtonVariant::Ghost)
.small()
.accessibility_label("Dismiss")
.on_click(move |_, _window, cx| {
toasts.update(cx, |toasts, cx| {
toasts.dismiss(id, cx);
});
}),
),
)
}
}
crates/core/src/toggle.rs
+1
View File
@@ -13,6 +13,7 @@ type ChangeHandler = Box<dyn Fn(bool, &mut Window, &mut App)>;
/// A toggle component.
#[derive(IntoElement)]
#[must_use]
pub struct Toggle {
id: ElementId,
label: Option<SharedString>,
crates/core/src/tooltip.rs
+10 -2
View File
@@ -1,7 +1,8 @@
use gpui::AppContext as _;
use gpui::{
AnyView, App, Bounds, Context, ElementId, Entity, InteractiveElement as _, IntoElement,
ParentElement as _, Pixels, Render, SharedString, Styled as _, Window, canvas, div, point,
ParentElement as _, Pixels, Render, Role, SharedString, StatefulInteractiveElement as _,
Styled as _, Window, canvas, div, point,
};
use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, TOOLTIP_MAX_WIDTH, TOOLTIP_OFFSET};
use gpui_native_utils::{anchor_bounds, record_anchor_bounds};
@@ -27,7 +28,12 @@ impl Tooltip {
}
/// Sets the anchor element ID for the tooltip.
pub fn anchored<L, I>(text: L, anchor_id: I) -> impl Fn(&mut Window, &mut App) -> AnyView
///
/// The `.tooltip(...)` closure pinning the panel next to `anchor_id`.
pub fn anchored<L, I>(
text: L,
anchor_id: I,
) -> impl Fn(&mut Window, &mut App) -> AnyView + 'static
where
L: Into<SharedString>,
I: Into<ElementId>,
@@ -73,6 +79,8 @@ impl Render for Tooltip {
let build_panel = || {
div()
.id("tooltip-panel")
.role(Role::Tooltip)
.debug_selector(|| "tooltip-panel".to_string())
.px_2()
.py_1()
crates/core/tests/combobox_bench.rs
+16 -5
View File
@@ -1,6 +1,5 @@
use std::cell::RefCell;
use std::rc::Rc;
use std::time::Instant;
use gpui::{
AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render, SharedString,
@@ -70,19 +69,31 @@ fn real_keystrokes_are_not_pathologically_slow() {
window.draw(cx).clear(cx);
});
let started = Instant::now();
// The focused caret must ride executor timers, never frame requests.
let frames = visual.update(|window, cx| window.simulate_next_frame(cx));
assert_eq!(
frames, 0,
"an idle focused combobox must not request animation frames"
);
for letter in "abcdefghijklmnopqrstuvwxyz".chars() {
visual.simulate_keystrokes(&letter.to_string());
visual.update(|window, cx| {
window.draw(cx).clear(cx);
});
}
let elapsed = started.elapsed();
let total_renders = *renders.borrow();
println!(
"26 real keystrokes: {elapsed:?}, host renders: {total_renders} ({} per keystroke)",
"26 real keystrokes: {total_renders} host renders ({:.2} per keystroke)",
total_renders as f32 / 26.
);
assert!(elapsed.as_millis() < 2000, "typing took {elapsed:?}");
assert!(
total_renders >= 26,
"every keystroke must redraw the page; got {total_renders} renders"
);
assert!(
total_renders <= 26 * 3,
"typing caused {total_renders} host renders; healthy filtering stays under 3 per keystroke"
);
}
crates/core/tests/command_palette_bench.rs
+16 -5
View File
@@ -1,6 +1,5 @@
use std::cell::RefCell;
use std::rc::Rc;
use std::time::Instant;
use gpui::{
AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render, SharedString,
@@ -78,19 +77,31 @@ fn typing_with_the_palette_open_is_not_pathologically_slow() {
window.draw(cx).clear(cx);
});
let started = Instant::now();
// The open palette must sit idle on executor timers, never frame requests.
let frames = visual.update(|window, cx| window.simulate_next_frame(cx));
assert_eq!(
frames, 0,
"an idle open palette must not request animation frames"
);
for letter in "abcdefghijklmnopqrstuvwxyz".chars() {
visual.simulate_keystrokes(&letter.to_string());
visual.update(|window, cx| {
window.draw(cx).clear(cx);
});
}
let elapsed = started.elapsed();
let total_renders = *renders.borrow();
println!(
"26 real keystrokes with the palette open: {elapsed:?}, host renders: {total_renders} ({} per keystroke)",
"26 real keystrokes with the palette open: {total_renders} host renders ({:.2} per keystroke)",
total_renders as f32 / 26.
);
assert!(elapsed.as_millis() < 2000, "typing took {elapsed:?}");
assert!(
total_renders >= 26,
"every keystroke must redraw the page; got {total_renders} renders"
);
assert!(
total_renders <= 26 * 3,
"typing caused {total_renders} host renders; healthy filtering stays under 3 per keystroke"
);
}
crates/core/tests/popover.rs
+1 -3
View File
@@ -3,7 +3,7 @@ use std::{cell::RefCell, rc::Rc};
use gpui::{
Context, InteractiveElement as _, IntoElement, Modifiers, MouseButton, ParentElement as _,
Render, StatefulInteractiveElement as _, Styled as _, TestAppContext, VisualTestContext,
Window, WindowHandle, div, point, px, rgba,
Window, WindowHandle, div, point, px,
};
use gpui_native_core::popover::Popover;
use gpui_native_theme::Theme;
@@ -26,7 +26,6 @@ impl Render for Harness {
div()
.id("popover-target")
.size(px(40.))
.bg(rgba(0x000000ff))
.on_click(move |_, _, cx| {
*target_clicks.borrow_mut() += 1;
cx.stop_propagation();
@@ -48,7 +47,6 @@ impl Render for Harness {
.debug_selector(|| "popover-trigger".to_string())
.w(px(100.))
.h(px(32.))
.bg(rgba(0x000000ff))
.into_any_element()
})
.content(|_, _| {
crates/core/tests/separator.rs
+3 -3
View File
@@ -3,7 +3,7 @@ use gpui::{
VisualTestContext, Window, div, px,
};
use gpui_native_core::separator::{Separator, SeparatorOrientation};
use gpui_native_theme::Theme;
use gpui_native_theme::{BORDER_WIDTH, Theme};
struct Harness {
orientation: SeparatorOrientation,
@@ -47,7 +47,7 @@ fn the_horizontal_rule_spans_its_container_at_hairline_height() {
.debug_bounds("test-separator")
.expect("horizontal separator rendered");
assert_eq!(bounds.size.width, px(200.));
assert_eq!(bounds.size.height, px(1.));
assert_eq!(bounds.size.height, BORDER_WIDTH);
}
#[test]
@@ -56,6 +56,6 @@ fn the_vertical_rule_spans_its_container_at_hairline_width() {
let bounds = visual
.debug_bounds("test-separator")
.expect("vertical separator rendered");
assert_eq!(bounds.size.width, px(1.));
assert_eq!(bounds.size.width, BORDER_WIDTH);
assert_eq!(bounds.size.height, px(50.));
}
crates/core/tests/toast.rs
-4
View File
@@ -155,8 +155,4 @@ fn dismissal_does_not_run_the_action() {
*dismissed.borrow(),
"on_dismiss still reports the dismissal"
);
assert!(
*dismissed.borrow(),
"on_dismiss still reports the dismissal"
);
}
crates/core/tests/tooltip.rs
-4
View File
@@ -129,10 +129,6 @@ fn hovering_the_target_deploys_the_tooltip_after_the_delay() {
calls.borrow().is_empty(),
"builder runs only after the delay"
);
assert!(
calls.borrow().is_empty(),
"builder runs only after the delay"
);
cx.executor().advance_clock(SHOW_DELAY);
visual.run_until_parked();
crates/data/src/list.rs
+21 -15
View File
@@ -15,7 +15,9 @@ type ChangeHandler = Rc<dyn Fn(Option<usize>, &mut Window, &mut App)>;
type ItemsFn = Box<dyn Fn(&mut Window, &mut App) -> Vec<ListItem>>;
/// One row of a [`List`].
#[must_use]
pub struct ListItem {
key: ElementId,
label: SharedString,
icon: Option<Icon>,
detail: Option<SharedString>,
@@ -23,12 +25,14 @@ pub struct ListItem {
}
impl ListItem {
/// Creates a row with this label.
pub fn new<L>(label: L) -> Self
/// Creates a row shown as `label`, identified by `key`.
pub fn new<K, L>(key: K, label: L) -> Self
where
K: Into<ElementId>,
L: Into<SharedString>,
{
Self {
key: key.into(),
label: label.into(),
icon: None,
detail: None,
@@ -36,7 +40,7 @@ impl ListItem {
}
}
/// Shows an icon leading the label, a role or any custom [`IconNamed`].
/// Shows an icon leading the label, a role or any custom [`gpui_native_icons::IconNamed`].
pub fn icon<I>(mut self, icon: I) -> Self
where
I: Into<Icon>,
@@ -63,6 +67,7 @@ impl ListItem {
/// A single-selection list.
#[derive(IntoElement)]
#[must_use]
pub struct List {
id: ElementId,
selected: Option<usize>,
@@ -101,7 +106,7 @@ impl List {
self
}
/// Sets the rows, built fresh each render.
/// Sets the rows, the closure runs during render and must not mutate entities or notify.
pub fn items<F>(mut self, items: F) -> Self
where
F: Fn(&mut Window, &mut App) -> Vec<ListItem> + 'static,
@@ -146,11 +151,10 @@ impl RenderOnce for List {
.iter()
.enumerate()
.map(|(index, item)| {
render_row(
item.render_row(
cx,
index,
items.len(),
item,
self.selected == Some(index),
&self.on_change,
&focus,
@@ -187,21 +191,22 @@ impl RenderOnce for List {
}
}
fn render_row(
impl ListItem {
fn render_row(
&self,
cx: &App,
index: usize,
count: usize,
item: &ListItem,
selected: bool,
on_change: &Option<ChangeHandler>,
focus: &FocusHandle,
) -> AnyElement {
) -> AnyElement {
let theme = cx.theme();
let label_color = selectable_label_color(cx, selected, item.disabled);
let disabled = item.disabled;
let label_color = selectable_label_color(cx, selected, self.disabled);
let disabled = self.disabled;
div()
.id(("list-item", index))
.id((self.key.clone(), "list-item"))
.flex()
.items_center()
.gap_2()
@@ -225,16 +230,16 @@ fn render_row(
}
})
})
.when_some(item.icon.clone(), |row, icon| {
.when_some(self.icon.clone(), |row, icon| {
row.child(icon.size(theme.sizes.medium.icon_size).color(label_color))
})
.child(
div()
.flex_1()
.text_color(label_color)
.child(item.label.clone()),
.child(self.label.clone()),
)
.when_some(item.detail.clone(), |row, detail| {
.when_some(self.detail.clone(), |row, detail| {
row.child(
div()
.flex_none()
@@ -248,4 +253,5 @@ fn render_row(
)
})
.into_any_element()
}
}
crates/data/src/sidebar.rs
+28 -13
View File
@@ -18,11 +18,13 @@ type ChangeHandler = Rc<dyn Fn(Option<usize>, &mut Window, &mut App)>;
type EntriesFn = Box<dyn Fn(&mut Window, &mut App) -> Vec<SidebarEntry>>;
/// One entry of a [`Sidebar`], a section header or a selectable row.
#[must_use]
pub enum SidebarEntry {
/// A non-selectable section label.
Header { label: SharedString },
/// A selectable row.
Row {
key: ElementId,
label: SharedString,
detail: Option<SharedString>,
prefix: Option<AnyElement>,
@@ -42,12 +44,14 @@ impl SidebarEntry {
}
}
/// Creates a selectable row.
pub fn row<L>(label: L) -> Self
/// Creates a selectable row shown as `label`, identified by `key`.
pub fn row<K, L>(key: K, label: L) -> Self
where
K: Into<ElementId>,
L: Into<SharedString>,
{
Self::Row {
key: key.into(),
label: label.into(),
detail: None,
prefix: None,
@@ -107,6 +111,7 @@ impl SidebarEntry {
/// A sidebar.
#[derive(IntoElement)]
#[must_use]
pub struct Sidebar {
id: ElementId,
selected: Option<usize>,
@@ -158,7 +163,7 @@ impl Sidebar {
self
}
/// Sets the entries, built fresh each render.
/// Sets the entries, the closure runs during render and must not mutate entities or notify.
pub fn entries<F>(mut self, entries: F) -> Self
where
F: Fn(&mut Window, &mut App) -> Vec<SidebarEntry> + 'static,
@@ -222,17 +227,19 @@ impl RenderOnce for Sidebar {
.enumerate()
.map(|(index, entry)| {
let is_row = matches!(entry, SidebarEntry::Row { .. });
if is_row {
row_position += 1;
}
let (position_in_set, size_of_set) = if is_row {
(row_position, row_count)
} else {
(0, 0)
};
render_entry(
entry.render_entry(
cx,
entry,
index,
position_in_set,
size_of_set,
@@ -282,10 +289,11 @@ impl RenderOnce for Sidebar {
}
}
#[allow(clippy::too_many_arguments)]
fn render_entry(
impl SidebarEntry {
#[allow(clippy::too_many_arguments)]
fn render_entry(
self,
cx: &App,
entry: SidebarEntry,
index: usize,
position_in_set: usize,
size_of_set: usize,
@@ -293,20 +301,26 @@ fn render_entry(
material: bool,
on_change: &Option<ChangeHandler>,
focus: &FocusHandle,
) -> AnyElement {
) -> AnyElement {
let theme = cx.theme();
match entry {
SidebarEntry::Header { label } => div()
match self {
SidebarEntry::Header { label } => {
// The id is required for the role to surface in the a11y tree.
div()
.id(("sidebar-header".into(), label.clone()))
.px_2()
.pt_2()
.pb_1()
.text_sm()
.font_weight(gpui::FontWeight::MEDIUM)
.text_color(theme.colors.muted_foreground)
.role(Role::Heading)
.child(label)
.into_any_element(),
.into_any_element()
}
SidebarEntry::Row {
key,
label,
detail,
prefix,
@@ -316,7 +330,7 @@ fn render_entry(
let label_color = selectable_label_color(cx, selected, row_disabled);
div()
.id(("sidebar-row", index))
.id((key.clone(), "sidebar-row"))
.flex()
.items_center()
.gap_2()
@@ -369,4 +383,5 @@ fn render_entry(
.into_any_element()
}
}
}
}
crates/data/src/tabs.rs
+35 -33
View File
@@ -31,6 +31,7 @@ pub enum TabsVariant {
}
/// One tab of a [`Tabs`] strip.
#[must_use]
pub struct Tab {
/// The stable identity for element state; must survive reordering.
key: ElementId,
@@ -102,6 +103,7 @@ impl FluentBuilder for Tab {}
/// A tab strip.
#[derive(IntoElement)]
#[must_use]
pub struct Tabs {
id: ElementId,
selected: usize,
@@ -129,7 +131,7 @@ impl Tabs {
}
}
/// Sets the current selection.
/// Sets the current selection, as an index into the `tabs` vec — not a tab key.
pub fn selected(mut self, selected: usize) -> Self {
self.selected = selected;
self
@@ -141,7 +143,7 @@ impl Tabs {
self
}
/// Reports the next selected tab, from clicks and keys alike.
/// Reports the next selected tab, as an index into the `tabs` vec — not a tab key; indices shift on reorder.
pub fn on_change<F>(mut self, handler: F) -> Self
where
F: Fn(usize, &mut Window, &mut App) + 'static,
@@ -150,7 +152,7 @@ impl Tabs {
self
}
/// Reports a closed tab by index.
/// Reports a closed tab, as an index into the `tabs` vec — not a tab key; indices shift on reorder.
pub fn on_close<F>(mut self, handler: F) -> Self
where
F: Fn(usize, &mut Window, &mut App) + 'static,
@@ -159,7 +161,7 @@ impl Tabs {
self
}
/// Sets the tabs, built fresh each render.
/// Sets the tabs; the closure runs during render and must not mutate entities or notify.
pub fn tabs<F>(mut self, tabs: F) -> Self
where
F: Fn(&mut Window, &mut App) -> Vec<Tab> + 'static,
@@ -204,10 +206,9 @@ impl RenderOnce for Tabs {
.into_iter()
.enumerate()
.map(|(index, tab)| {
render_tab(
tab.render_tab(
&self.id,
cx,
tab,
index,
self.selected,
self.variant,
@@ -257,19 +258,19 @@ impl RenderOnce for Tabs {
}
}
#[allow(clippy::too_many_arguments)]
fn render_tab(
impl Tab {
#[allow(clippy::too_many_arguments)]
fn render_tab(
mut self,
tabs_id: &ElementId,
cx: &App,
tab: Tab,
index: usize,
selected_index: usize,
variant: TabsVariant,
on_change: &Option<ChangeHandler>,
on_close: &Option<CloseHandler>,
focus: &gpui::FocusHandle,
) -> AnyElement {
let mut tab = tab;
) -> AnyElement {
let selected = index == selected_index;
let theme = cx.theme();
@@ -278,7 +279,7 @@ fn render_tab(
let label_color = match variant {
TabsVariant::Underline => {
if tab.disabled {
if self.disabled {
theme.colors.muted_foreground
} else if selected {
theme.ramps.primary.base
@@ -287,7 +288,7 @@ fn render_tab(
}
}
TabsVariant::Pill => {
if tab.disabled {
if self.disabled {
theme.colors.muted_foreground
} else {
theme.colors.foreground
@@ -295,11 +296,14 @@ fn render_tab(
}
};
let close = (self.closeable && on_close.is_some() && !self.disabled)
.then(|| self.render_tab_close(tabs_id, index, on_close));
let strip_tab = div()
.id((tab.key.clone(), "tab"))
.id((self.key.clone(), "tab"))
.debug_selector({
let tabs_id = tabs_id.clone();
let label = tab.label.clone();
let label = self.label.clone();
move || format!("{tabs_id}-tab-{}", label)
})
.flex()
@@ -308,7 +312,7 @@ fn render_tab(
.role(Role::Tab)
.aria_selected(selected)
.text_color(label_color)
.when(!tab.disabled && !selected, |strip_tab| {
.when(!self.disabled && !selected, |strip_tab| {
strip_tab.hover(|strip_tab| strip_tab.bg(theme.colors.muted))
})
.map(|strip_tab| match variant {
@@ -333,23 +337,20 @@ fn render_tab(
.hover(|strip_tab| strip_tab.bg(theme.colors.muted_hover))
}),
})
.when_some(tab.lead.take(), |strip_tab, lead| strip_tab.child(lead))
.child(tab.label.clone())
.when_some(self.lead.take(), |strip_tab, lead| strip_tab.child(lead))
.child(self.label.clone())
.when(variant == TabsVariant::Pill, |strip_tab| {
strip_tab.child(div().flex_none().w(metrics.padding_x * 1.5))
})
.when(tab.busy && !tab.disabled, |strip_tab| {
.when(self.busy && !self.disabled, |strip_tab| {
strip_tab.child(
Spinner::new((tab.key.clone(), "tab-busy"))
Spinner::new((self.key.clone(), "tab-busy"))
.small()
.accessibility_label("Loading"),
)
})
.when(
tab.closeable && on_close.is_some() && !tab.disabled,
|strip_tab| strip_tab.child(render_tab_close(tabs_id, &tab, index, on_close)),
)
.when(!tab.disabled, |strip_tab| {
.when_some(close, |strip_tab, close| strip_tab.child(close))
.when(!self.disabled, |strip_tab| {
strip_tab.cursor_pointer().on_click({
let on_change = on_change.clone();
let focus = focus.clone();
@@ -364,30 +365,30 @@ fn render_tab(
})
});
match tab.wrap {
match self.wrap {
Some(wrap) => wrap(strip_tab),
None => strip_tab.into_any_element(),
}
}
}
fn render_tab_close(
fn render_tab_close(
&self,
tabs_id: &ElementId,
tab: &Tab,
index: usize,
on_close: &Option<CloseHandler>,
) -> AnyElement {
Button::new((tab.key.clone(), "tab-close"))
) -> AnyElement {
Button::new((self.key.clone(), "tab-close"))
.icon(IconRole::Close)
.variant(ButtonVariant::Ghost)
.small()
.tab_stop(false)
.debug_selector({
let tabs_id = tabs_id.clone();
let label = tab.label.clone();
let label = self.label.clone();
move || format!("{tabs_id}-close-{}", label)
})
.tooltip(Tooltip::text("Close"))
.accessibility_label(SharedString::from(format!("Close {}", tab.label)))
.accessibility_label(SharedString::from(format!("Close {}", self.label)))
.on_click({
let on_close = on_close.clone();
move |_, window, cx| {
@@ -398,4 +399,5 @@ fn render_tab_close(
}
})
.into_any_element()
}
}
crates/data/src/tree.rs
+97 -70
View File
@@ -18,7 +18,9 @@ type ItemsFn = Box<dyn Fn(&mut Window, &mut App) -> Vec<TreeItem>>;
/// Tree item.
#[derive(Clone)]
#[must_use]
pub struct TreeItem {
key: ElementId,
label: SharedString,
icon: Option<Icon>,
depth: usize,
@@ -28,12 +30,14 @@ pub struct TreeItem {
}
impl TreeItem {
/// Creates a leaf row with this label at the root depth.
pub fn new<L>(label: L) -> Self
/// Creates a leaf row shown as `label` at the root depth, identified by `key`.
pub fn new<K, L>(key: K, label: L) -> Self
where
K: Into<ElementId>,
L: Into<SharedString>,
{
Self {
key: key.into(),
label: label.into(),
icon: None,
depth: 0,
@@ -79,6 +83,7 @@ impl TreeItem {
/// A tree.
#[derive(IntoElement)]
#[must_use]
pub struct Tree {
id: ElementId,
selected: Option<usize>,
@@ -128,7 +133,7 @@ impl Tree {
self
}
/// Sets the visible rows, built fresh each render.
/// Sets the visible rows; the closure runs during render and must not mutate entities or notify.
pub fn items<F>(mut self, items: F) -> Self
where
F: Fn(&mut Window, &mut App) -> Vec<TreeItem> + 'static,
@@ -145,6 +150,45 @@ impl Tree {
self.a11y_label = Some(label.into());
self
}
/// Maps each visible row to its 1-based position-in-set and set size among its siblings.
fn sibling_sets(items: &[TreeItem]) -> Vec<(usize, usize)> {
let mut sets = vec![(0usize, 0usize); items.len()];
// Open sibling runs along the ancestry path, deeper runs above shallower ones.
let mut runs: Vec<(usize, Vec<usize>)> = Vec::new();
for (index, item) in items.iter().enumerate() {
while runs
.last()
.is_some_and(|(run_depth, _)| *run_depth > item.depth)
{
if let Some((_, pending)) = runs.pop() {
Self::stamp_sibling_run(&mut sets, pending);
}
}
match runs.last_mut() {
// A row at the running depth extends the open sibling run.
Some((run_depth, pending)) if *run_depth == item.depth => pending.push(index),
_ => runs.push((item.depth, vec![index])),
}
}
for (_, pending) in runs {
Self::stamp_sibling_run(&mut sets, pending);
}
sets
}
fn stamp_sibling_run(sets: &mut [(usize, usize)], pending: Vec<usize>) {
let size_of_set = pending.len();
for (position, index) in pending.into_iter().enumerate() {
if let Some(set) = sets.get_mut(index) {
*set = (position + 1, size_of_set);
}
}
}
}
impl RenderOnce for Tree {
@@ -169,46 +213,15 @@ impl RenderOnce for Tree {
.clone()
.unwrap_or_else(|| SharedString::from(self.id.to_string()));
let sibling_sets: Vec<(usize, usize)> = {
let mut sets = vec![(0usize, 0usize); items.len()];
let mut start = 0usize;
while start < items.len() {
let depth = items[start].depth;
let mut end = start + 1;
while end < items.len() && items[end].depth > depth {
end += 1;
}
let mut position = 0usize;
for index in start..end {
if items[index].depth == depth {
position += 1;
sets[index] = (position, 0);
}
}
for index in start..end {
if items[index].depth == depth {
sets[index].1 = position;
}
}
start = end;
}
sets
};
let sibling_sets = Self::sibling_sets(&items);
let rows: Vec<AnyElement> = items
.iter()
.enumerate()
.map(|(index, _item)| {
.map(|(index, item)| {
let (position_in_set, size_of_set) = sibling_sets[index];
render_row(
item.render_row(
cx,
&items[index],
index,
position_in_set,
size_of_set,
@@ -266,10 +279,11 @@ impl RenderOnce for Tree {
}
}
#[allow(clippy::too_many_arguments)]
fn render_row(
impl TreeItem {
#[allow(clippy::too_many_arguments)]
fn render_row(
&self,
cx: &App,
item: &TreeItem,
index: usize,
position_in_set: usize,
size_of_set: usize,
@@ -277,15 +291,17 @@ fn render_row(
on_change: &Option<ChangeHandler>,
on_disclosure: &Option<DisclosureHandler>,
focus: &FocusHandle,
) -> AnyElement {
) -> AnyElement {
let theme = cx.theme();
let label_color = selectable_label_color(cx, selected, item.disabled);
let disabled = item.disabled;
let label_color = selectable_label_color(cx, selected, self.disabled);
let disabled = self.disabled;
// usize can exceed f32's exact integer range; bound it via u32 before casting.
let depth = u32::try_from(self.depth).unwrap_or(u32::MAX) as f32;
// One indent step per depth level, on the theme's horizontal padding.
let indent = theme.sizes.medium.padding_x * (item.depth as f32 + 1.0);
let indent = theme.sizes.medium.padding_x * (depth + 1.0);
div()
.id(("tree-item", index))
.id((self.key.clone(), "tree-item"))
.flex()
.items_center()
.gap_2()
@@ -295,10 +311,10 @@ fn render_row(
.rounded(theme.radius.sm)
.role(Role::TreeItem)
.aria_selected(selected)
.aria_level(item.depth + 1)
.aria_level(self.depth + 1)
.aria_position_in_set(position_in_set)
.aria_size_of_set(size_of_set)
.when(item.expandable, |row| row.aria_expanded(item.expanded))
.when(self.expandable, |row| row.aria_expanded(self.expanded))
.map(|row| paint_selectable_row(cx, row, selected, disabled))
.when(!disabled, |row| {
row.cursor_pointer().on_click({
@@ -312,42 +328,31 @@ fn render_row(
}
})
})
.child(render_disclosure(
cx,
item,
index,
disabled,
selected,
on_disclosure,
))
.when_some(item.icon.clone(), |row, icon| {
.child(self.render_disclosure(cx, index, selected, on_disclosure))
.when_some(self.icon.clone(), |row, icon| {
row.child(icon.size(theme.sizes.medium.icon_size).color(label_color))
})
.child(
div()
.flex_1()
.text_color(label_color)
.child(item.label.clone()),
.child(self.label.clone()),
)
.into_any_element()
}
}
/// The disclosure slot.
fn render_disclosure(
fn render_disclosure(
&self,
cx: &App,
item: &TreeItem,
index: usize,
disabled: bool,
selected: bool,
on_disclosure: &Option<DisclosureHandler>,
) -> AnyElement {
) -> AnyElement {
let theme = cx.theme();
let glyph_color = if disabled {
let glyph_color = if self.disabled || !selected {
theme.colors.muted_foreground
} else if selected {
theme.colors.primary_foreground
} else {
theme.colors.muted_foreground
theme.colors.primary_foreground
};
let cell = div()
@@ -357,7 +362,7 @@ fn render_disclosure(
.items_center()
.justify_center()
.child(
icon(if item.expanded {
icon(if self.expanded {
IconRole::ChevronDown
} else {
IconRole::ChevronRight
@@ -366,8 +371,8 @@ fn render_disclosure(
.color(glyph_color),
);
if item.expandable && !disabled {
cell.id(("tree-disclosure", index))
if self.expandable && !self.disabled {
cell.id((self.key.clone(), "tree-disclosure"))
.cursor_pointer()
.on_click({
let on_disclosure = on_disclosure.clone();
@@ -383,4 +388,26 @@ fn render_disclosure(
} else {
cell.into_any_element()
}
}
}
#[cfg(test)]
mod tests {
use super::*;
fn item(depth: usize) -> TreeItem {
TreeItem::new("item", "Item").depth(depth)
}
#[test]
fn flat_rows_number_one_of_three() {
let sets = Tree::sibling_sets(&[item(0), item(0), item(0)]);
assert_eq!(sets, vec![(1, 3), (2, 3), (3, 3)]);
}
#[test]
fn nested_rows_number_per_level() {
let sets = Tree::sibling_sets(&[item(0), item(1), item(2), item(1), item(0)]);
assert_eq!(sets, vec![(1, 2), (1, 2), (1, 1), (2, 2), (2, 2)]);
}
}
crates/data/tests/list.rs
+4 -4
View File
@@ -28,10 +28,10 @@ impl Render for Harness {
})
.items(|_, _| {
vec![
ListItem::new("One"),
ListItem::new("Two"),
ListItem::new("Unavailable").disabled(true),
ListItem::new("Three"),
ListItem::new("one", "One"),
ListItem::new("two", "Two"),
ListItem::new("unavailable", "Unavailable").disabled(true),
ListItem::new("three", "Three"),
]
}),
)
crates/data/tests/sidebar.rs
+3 -3
View File
@@ -31,10 +31,10 @@ impl Render for Harness {
.entries(|_, _| {
vec![
SidebarEntry::header("Favorites"), // 0: never selectable
SidebarEntry::row("Documents"), // 1
SidebarEntry::row("Locked").disabled(true), // 2
SidebarEntry::row("documents", "Documents"), // 1
SidebarEntry::row("locked", "Locked").disabled(true), // 2
SidebarEntry::header("Locations"), // 3: never selectable
SidebarEntry::row("Trash"), // 4
SidebarEntry::row("trash", "Trash"), // 4
]
}),
)
crates/data/tests/tabs.rs
+66
View File
@@ -8,6 +8,7 @@ use gpui_native_data::tabs::{Tab, Tabs};
use gpui_native_theme::Theme;
type Changes = Rc<RefCell<Vec<usize>>>;
type Closes = Rc<RefCell<Vec<usize>>>;
struct Harness {
selected: usize,
@@ -64,6 +65,55 @@ fn click(visual: &mut VisualTestContext, position: gpui::Point<gpui::Pixels>) {
visual.simulate_mouse_up(position, MouseButton::Left, Modifiers::default());
}
struct CloseHarness {
changes: Changes,
closes: Closes,
}
impl Render for CloseHarness {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let changes = self.changes.clone();
let closes = self.closes.clone();
let view = cx.entity();
let close_view = view.clone();
div().size_full().child(
Tabs::new("close-tabs")
.on_change(move |next, _, cx| {
changes.borrow_mut().push(next);
view.update(cx, |_, cx| cx.notify());
})
.on_close(move |index, _, cx| {
closes.borrow_mut().push(index);
close_view.update(cx, |_, cx| cx.notify());
})
.tabs(|_, _| {
vec![
Tab::new("one", "One").closeable(true),
Tab::new("two", "Two"),
]
}),
)
}
}
fn close_tabs_window() -> (TestAppContext, VisualTestContext, Changes, Closes) {
let mut cx = TestAppContext::single();
cx.update(Theme::init);
let changes = Rc::new(RefCell::new(Vec::new()));
let closes = Rc::new(RefCell::new(Vec::new()));
let harness_changes = changes.clone();
let harness_closes = closes.clone();
let window = cx.add_window(move |_, _| CloseHarness {
changes: harness_changes,
closes: harness_closes,
});
let mut visual = VisualTestContext::from_window(window.into(), &cx);
visual.update(|window, cx| {
window.draw(cx).clear(cx);
});
(cx, visual, changes, closes)
}
#[test]
fn clicking_a_tab_selects_it_and_hands_the_strip_the_keyboard() {
let (_cx, mut visual, changes) = tabs_window();
@@ -100,3 +150,19 @@ fn arrow_keys_skip_disabled_tabs_and_never_wrap() {
visual.simulate_keystrokes("end"); // End
assert_eq!(*changes.borrow(), vec![1, 3, 1, 0, 3]);
}
#[test]
fn clicking_the_close_control_reports_a_close_without_selecting() {
let (_cx, mut visual, changes, closes) = close_tabs_window();
// Only the closeable tab ships a close control.
let selector: &'static str = Box::leak(String::from("close-tabs-close-One").into_boxed_str());
let close_bounds = visual
.debug_bounds(selector)
.expect("closeable tab renders a close control");
assert!(visual.debug_bounds("close-tabs-close-Two").is_none());
click(&mut visual, close_bounds.center());
assert_eq!(*closes.borrow(), vec![0]);
assert!(changes.borrow().is_empty(), "a close is not a selection");
}
crates/data/tests/tree.rs
+9 -5
View File
@@ -38,14 +38,18 @@ impl Render for Harness {
})
.items(|_, _| {
vec![
TreeItem::new("Root")
TreeItem::new("root", "Root")
.depth(0)
.expandable(true)
.expanded(true),
TreeItem::new("Child").depth(1),
TreeItem::new("Collapsed").depth(0).expandable(true),
TreeItem::new("Untouchable").depth(1).disabled(true),
TreeItem::new("Last").depth(0),
TreeItem::new("child", "Child").depth(1),
TreeItem::new("collapsed", "Collapsed")
.depth(0)
.expandable(true),
TreeItem::new("untouchable", "Untouchable")
.depth(1)
.disabled(true),
TreeItem::new("last", "Last").depth(0),
]
}),
)
crates/editor/Cargo.toml
+7 -2
View File
@@ -7,9 +7,10 @@ description = "Read-only code surfaces for gpui applications, one cargo feature
[dependencies]
gpui = { workspace = true }
gpui-native-core = { workspace = true, optional = true }
gpui-native-icons = { workspace = true }
gpui-native-icons = { workspace = true, optional = true }
gpui-native-theme = { workspace = true }
gpui-native-utils = { workspace = true }
log = "0.4"
tree-sitter = "0.25"
similar = "2"
pulldown-cmark = { version = "0.13", default-features = false, optional = true }
@@ -38,7 +39,11 @@ code_view = [
"gpui-native-core/scrollbar",
]
diff_view = ["code_view"]
markdown_view = ["code_view", "dep:pulldown-cmark"]
markdown_view = [
"code_view",
"dep:pulldown-cmark",
"dep:gpui-native-icons",
]
rust = ["dep:tree-sitter-rust"]
typescript = ["dep:tree-sitter-typescript"]
javascript = ["dep:tree-sitter-javascript"]
crates/editor/src/code_view.rs
+15 -10
View File
@@ -11,10 +11,12 @@ use gpui::{
actions, canvas, div, uniform_list,
};
use gpui_native_core::scrollbar::{Scrollbar, ScrollbarHandle, ScrollbarVisibility};
use gpui_native_theme::{ActiveTheme as _, ColorTokens, MONO_ADVANCE_RATIO, Ramps};
use gpui_native_theme::{
ActiveTheme as _, ColorTokens, MONO_ADVANCE_RATIO, Ramps, WASH_ALPHA_SOFT,
};
use crate::highlight::{HighlightedCode, Language, Role, highlight};
use crate::utils::{gutter_cell, run_style};
use crate::utils::gutter_cell;
actions!(code_view, [Copy]);
@@ -83,7 +85,7 @@ impl CodeViewState {
active_line: None,
selection: None,
selecting: false,
focus_handle: cx.focus_handle(),
focus_handle: cx.focus_handle().tab_stop(true),
a11y_label: None,
}
}
@@ -223,14 +225,17 @@ impl CodeViewState {
char_width: Pixels,
text_x: Pixels,
) -> SelectionPoint {
// Saturating so an empty document cannot invert the clamp.
let last_row = self.code.lines.len().saturating_sub(1);
let row = (((position.y - bounds.origin.y - scroll_y) / line_height).floor() as isize)
.clamp(0, self.code.lines.len() as isize - 1) as usize;
.clamp(0, last_row as isize) as usize;
let chars = self.code.lines[row]
.spans
let chars = self.code.lines.get(row).map_or(0, |line| {
line.spans
.iter()
.map(|span| span.text.chars().count())
.sum::<usize>();
.sum::<usize>()
});
let col = (((position.x - text_x) / char_width).round() as isize).clamp(0, chars as isize)
as usize;
@@ -503,7 +508,7 @@ fn render_row(
if char_ix > 0 {
highlights.push((
run_start..run_end,
run_style(run_role, run_selected, colors, ramps),
run_role.run_style(run_selected, colors, ramps),
));
}
run_start = byte_ix;
@@ -516,7 +521,7 @@ fn render_row(
if run_end > run_start || !text.is_empty() {
highlights.push((
run_start..run_end,
run_style(run_role, run_selected, colors, ramps),
run_role.run_style(run_selected, colors, ramps),
));
}
@@ -539,7 +544,7 @@ fn render_row(
.overflow_hidden()
.when(active, |row| {
row.bg(Hsla {
a: colors.muted.a * 0.45,
a: colors.muted.a * WASH_ALPHA_SOFT,
..colors.muted
})
})
crates/editor/src/diff_view.rs
+181 -82
View File
@@ -3,7 +3,7 @@
//! bars instead of markers, tinted number gutters, word-level intra-line
//! highlights and hunk separators. Rows reuse the code view's highlighting;
//! consumers that already hold a git diff can build [`DiffRow`]s themselves
//! instead of calling [`diff_rows`].
//! instead of calling [`DiffViewState::diff_rows`].
use gpui::prelude::FluentBuilder as _;
use gpui::{
@@ -14,12 +14,12 @@ use gpui::{
};
use gpui_native_core::scrollbar::{Scrollbar, ScrollbarHandle, ScrollbarVisibility};
use gpui_native_theme::{ActiveTheme as _, MONO_ADVANCE_RATIO};
use similar::{ChangeTag, TextDiff};
use similar::{Change, ChangeTag, TextDiff};
use std::ops::Range;
use crate::highlight::{Language, Line, Role, highlight};
use crate::utils::{gutter_cell, line_row, role_color, wash, wash_gutter, wash_strong};
use crate::highlight::{HighlightedCode, Language, Line, Role, highlight};
use crate::utils::{gutter_cell, wash, wash_gutter, wash_strong};
/// What a diff row did to the file.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -96,18 +96,155 @@ impl Default for DiffViewOptions {
}
impl DiffRow {
/// Assembles a diff line row from a `similar` change.
pub(crate) fn from_change(
change: &Change<&str>,
code: &HighlightedCode,
changed_ranges: Vec<Range<usize>>,
) -> DiffRow {
let content = match change.tag() {
ChangeTag::Equal => change
.new_index()
.and_then(|ix| code.lines.get(ix))
.cloned()
.unwrap_or_default(),
ChangeTag::Delete => change
.old_index()
.and_then(|ix| code.lines.get(ix))
.cloned()
.unwrap_or_default(),
ChangeTag::Insert => change
.new_index()
.and_then(|ix| code.lines.get(ix))
.cloned()
.unwrap_or_default(),
};
let (old_number, new_number) = match change.tag() {
ChangeTag::Equal => (
change.old_index().map(|ix| ix + 1),
change.new_index().map(|ix| ix + 1),
),
ChangeTag::Delete => (change.old_index().map(|ix| ix + 1), None),
ChangeTag::Insert => (None, change.new_index().map(|ix| ix + 1)),
};
DiffRow {
kind: match change.tag() {
ChangeTag::Equal => DiffRowKind::Context,
ChangeTag::Delete => DiffRowKind::Removed,
ChangeTag::Insert => DiffRowKind::Added,
},
content,
old_number,
new_number,
changed_ranges,
header: Default::default(),
hidden_lines: 0,
}
}
/// The row's text length, in characters.
fn char_count(&self) -> usize {
self.content
.spans
.iter()
.map(|span| span.text.chars().count())
.sum()
self.content.text().chars().count()
}
/// Stable element id: the kind and line numbers packed into one integer.
fn element_id(&self, hunk_ordinal: usize) -> ElementId {
let kind = match self.kind {
DiffRowKind::Context => 0u64,
DiffRowKind::Added => 1,
DiffRowKind::Removed => 2,
DiffRowKind::Hunk => {
return ElementId::named_usize("diff-hunk", hunk_ordinal);
}
};
// Line numbers saturate at 2^31 so the two fields never overlap.
let old = self.old_number.unwrap_or(0).min((1 << 31) - 1) as u64;
let new = self.new_number.unwrap_or(0).min((1 << 31) - 1) as u64;
ElementId::named_usize("diff-row", ((kind << 62) | (old << 31) | new) as usize)
}
}
/// Computes unified rows between two texts, highlighting every line with `language`.
pub fn diff_rows(old: &str, new: &str, language: Language) -> Vec<DiffRow> {
/// Retained state for a diff view.
pub struct DiffViewState {
id: ElementId,
rows: Vec<DiffRow>,
/// Cached per-row id and text length, parallel to `rows`.
row_layouts: Vec<RowLayout>,
/// The row whose width drives horizontal scroll extent, `rows`-derived.
widest_row: Option<usize>,
options: DiffViewOptions,
/// Drives both scroll axes of the virtualized row list.
handle: UniformListScrollHandle,
a11y_label: Option<SharedString>,
}
/// Cached per-row render data, computed once when the rows are set.
struct RowLayout {
id: ElementId,
char_count: usize,
}
impl DiffViewState {
/// Builds the state, diffing `old` against `new`.
pub fn new<I, O, N>(id: I, old: O, new: N, language: Language) -> Self
where
I: Into<ElementId>,
O: AsRef<str>,
N: AsRef<str>,
{
let mut state = Self {
id: id.into(),
rows: Vec::new(),
row_layouts: Vec::new(),
widest_row: None,
options: DiffViewOptions::default(),
handle: UniformListScrollHandle::new(),
a11y_label: None,
};
state.set_rows(old, new, language);
state
}
/// Replaces the rows, recomputing the per-row layout cache with them.
fn set_rows<O, N>(&mut self, old: O, new: N, language: Language)
where
O: AsRef<str>,
N: AsRef<str>,
{
self.rows = Self::diff_rows(old.as_ref(), new.as_ref(), language);
let mut hunk_ordinal = 0usize;
self.row_layouts = self
.rows
.iter()
.map(|row| {
let ordinal = if row.kind == DiffRowKind::Hunk {
hunk_ordinal += 1;
hunk_ordinal
} else {
0
};
RowLayout {
id: row.element_id(ordinal),
char_count: row.char_count(),
}
})
.collect();
self.widest_row = self
.rows
.iter()
.zip(&self.row_layouts)
.enumerate()
.filter(|(_, (row, _))| row.kind != DiffRowKind::Hunk)
.max_by_key(|(_, (_, layout))| layout.char_count)
.map(|(widest, _)| widest);
}
/// Computes unified rows between two texts, highlighting every line with `language`.
pub fn diff_rows(old: &str, new: &str, language: Language) -> Vec<DiffRow> {
let old_code = highlight(old, language);
let new_code = highlight(new, language);
let diff = TextDiff::from_lines(old, new);
@@ -116,8 +253,9 @@ pub fn diff_rows(old: &str, new: &str, language: Language) -> Vec<DiffRow> {
let mut collapsed_before = 0usize;
for group in diff.grouped_ops(3) {
let first = group.first().expect("hunk groups are never empty");
let last = group.last().expect("hunk groups are never empty");
let (Some(first), Some(last)) = (group.first(), group.last()) else {
continue;
};
let old_range = first.old_range().start..last.old_range().end;
let new_range = first.new_range().start..last.new_range().end;
@@ -135,7 +273,7 @@ pub fn diff_rows(old: &str, new: &str, language: Language) -> Vec<DiffRow> {
new_range.start + 1
};
let collapsed = first.old_range().start - collapsed_before;
let collapsed = first.old_range().start.saturating_sub(collapsed_before);
if collapsed > 0 {
rows.push(DiffRow {
kind: DiffRowKind::Hunk,
@@ -158,21 +296,21 @@ pub fn diff_rows(old: &str, new: &str, language: Language) -> Vec<DiffRow> {
for op in &group {
let changes: Vec<_> = diff.iter_changes(op).collect();
let mut ix = 0;
let mut index = 0;
while ix < changes.len() {
if changes[ix].tag() == ChangeTag::Equal {
rows.push(line_row(&changes[ix], &new_code, Vec::new()));
ix += 1;
while index < changes.len() {
if changes[index].tag() == ChangeTag::Equal {
rows.push(DiffRow::from_change(&changes[index], &new_code, Vec::new()));
index += 1;
continue;
}
let deletions = changes[ix..]
let deletions = changes[index..]
.iter()
.take_while(|change| change.tag() == ChangeTag::Delete)
.count();
let insertions = changes[ix + deletions..]
let insertions = changes[index + deletions..]
.iter()
.take_while(|change| change.tag() == ChangeTag::Insert)
.count();
@@ -181,8 +319,8 @@ pub fn diff_rows(old: &str, new: &str, language: Language) -> Vec<DiffRow> {
let mut insertion_ranges = vec![Vec::new(); insertions];
for pair in 0..deletions.min(insertions) {
let old_text = changes[ix + pair].value().trim_end_matches('\n');
let new_text = changes[ix + deletions + pair]
let old_text = changes[index + pair].value().trim_end_matches('\n');
let new_text = changes[index + deletions + pair]
.value()
.trim_end_matches('\n');
let words = TextDiff::from_words(old_text, new_text);
@@ -210,75 +348,27 @@ pub fn diff_rows(old: &str, new: &str, language: Language) -> Vec<DiffRow> {
}
for pair in 0..deletions {
rows.push(line_row(
&changes[ix + pair],
rows.push(DiffRow::from_change(
&changes[index + pair],
&old_code,
deletion_ranges[pair].clone(),
));
}
for pair in 0..insertions {
rows.push(line_row(
&changes[ix + deletions + pair],
rows.push(DiffRow::from_change(
&changes[index + deletions + pair],
&new_code,
insertion_ranges[pair].clone(),
));
}
ix += deletions + insertions;
index += deletions + insertions;
}
}
}
rows
}
/// Retained state for a diff view.
pub struct DiffViewState {
id: ElementId,
rows: Vec<DiffRow>,
/// The row whose width drives horizontal scroll extent, `rows`-derived.
widest_row: Option<usize>,
options: DiffViewOptions,
/// Drives both scroll axes of the virtualized row list.
handle: UniformListScrollHandle,
a11y_label: Option<SharedString>,
}
impl DiffViewState {
/// Builds the state, diffing `old` against `new`.
pub fn new<I, O, N>(id: I, old: O, new: N, language: Language) -> Self
where
I: Into<ElementId>,
O: AsRef<str>,
N: AsRef<str>,
{
let mut state = Self {
id: id.into(),
rows: Vec::new(),
widest_row: None,
options: DiffViewOptions::default(),
handle: UniformListScrollHandle::new(),
a11y_label: None,
};
state.set_rows(old, new, language);
state
}
/// Replaces the rows, recomputing `widest_row` with them.
fn set_rows<O, N>(&mut self, old: O, new: N, language: Language)
where
O: AsRef<str>,
N: AsRef<str>,
{
self.rows = diff_rows(old.as_ref(), new.as_ref(), language);
self.widest_row = self
.rows
.iter()
.enumerate()
.filter(|(_, row)| row.kind != DiffRowKind::Hunk)
.max_by_key(|(_, row)| row.char_count())
.map(|(ix, _)| ix);
}
/// Sets how changed rows are marked.
@@ -355,7 +445,15 @@ impl Render for DiffViewState {
move |range, _window, cx| {
let diff = state.read(cx);
range
.map(|row_ix| render_row(&diff.rows[row_ix], row_ix, options, cx))
.map(|row_index| {
render_row(
&diff.rows[row_index],
&diff.row_layouts[row_index],
row_index,
options,
cx,
)
})
.collect()
}
})
@@ -389,7 +487,8 @@ impl Render for DiffViewState {
fn render_row(
row: &DiffRow,
row_ix: usize,
layout: &RowLayout,
row_index: usize,
options: DiffViewOptions,
cx: &App,
) -> gpui::AnyElement {
@@ -402,8 +501,8 @@ fn render_row(
let char_width = text_size * MONO_ADVANCE_RATIO;
let frame = div()
.debug_selector(move || format!("diff-row-{row_ix}"))
.id(("diff-row", row_ix))
.debug_selector(move || format!("diff-row-{row_index}"))
.id(layout.id.clone())
.w_full()
.h(line_height)
.font_family(mono_font)
@@ -496,7 +595,7 @@ fn render_row(
&& *role != Role::Text
{
segment = segment.highlight(HighlightStyle {
color: Some(role_color(*role, colors, ramps)),
color: Some(role.color(colors, ramps)),
..Default::default()
});
}
@@ -582,7 +681,7 @@ fn render_row(
div()
.flex_none()
.ml_2()
.w(char_width * row.char_count() as f32)
.w(char_width * layout.char_count as f32)
.whitespace_nowrap()
.child(gpui::StyledText::new(text).with_default_highlights(&style, highlights)),
)
crates/editor/src/highlight.rs
+76 -25
View File
@@ -3,6 +3,7 @@
//! code without re-parsing it.
use gpui::SharedString;
use gpui_native_utils::ResultLogErr;
use std::cell::RefCell;
use std::collections::HashMap;
use tree_sitter::StreamingIterator as _;
@@ -29,7 +30,7 @@ pub enum Language {
}
/// The semantic role a span plays.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub enum Role {
Text,
Keyword,
@@ -47,20 +48,31 @@ pub enum Role {
}
/// A run of text sharing one role.
#[derive(Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub struct Span {
pub text: SharedString,
pub role: Role,
}
/// One rendered line of code.
#[derive(Clone, Debug, Default, PartialEq, Eq)]
#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
pub struct Line {
pub spans: Vec<Span>,
}
impl Line {
/// The line's flat text, in character order.
pub fn text(&self) -> String {
let mut text = String::new();
for span in &self.spans {
text.push_str(&span.text);
}
text
}
}
/// Source text split into role-styled lines.
#[derive(Clone, Debug, Default, PartialEq, Eq)]
#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
pub struct HighlightedCode {
pub lines: Vec<Line>,
}
@@ -77,10 +89,8 @@ pub fn highlight(source: &str, language: Language) -> HighlightedCode {
.entry(language)
.or_insert_with(|| {
let mut parser = tree_sitter::Parser::new();
if parser.set_language(&grammar).is_err() {
return None;
}
let query = tree_sitter::Query::new(&grammar, query_source).ok()?;
parser.set_language(&grammar).log_err()?;
let query = tree_sitter::Query::new(&grammar, query_source).log_err()?;
let roles = query
.capture_names()
.iter()
@@ -99,6 +109,7 @@ pub fn highlight(source: &str, language: Language) -> HighlightedCode {
};
let Some(tree) = highlighter.parser.parse(source, None) else {
log::warn!("tree-sitter failed to parse {language:?}; rendering plain text");
return plain(source);
};
@@ -137,31 +148,71 @@ pub(crate) fn plain(source: &str) -> HighlightedCode {
/// The grammar and its highlight query for a language, when compiled in.
fn grammar_for(language: Language) -> Option<(tree_sitter::Language, &'static str)> {
match language {
Language::Rust => cfg!(feature = "rust").then(|| {
(
Language::Rust => rust_grammar(),
Language::TypeScript => typescript_grammar(),
Language::JavaScript => javascript_grammar(),
Language::Python => python_grammar(),
}
}
/// The Rust grammar, compiled in only when the `rust` feature is on.
#[cfg(feature = "rust")]
fn rust_grammar() -> Option<(tree_sitter::Language, &'static str)> {
Some((
tree_sitter_rust::LANGUAGE.into(),
tree_sitter_rust::HIGHLIGHTS_QUERY,
)
}),
Language::TypeScript => cfg!(feature = "typescript").then(|| {
(
))
}
/// Without the feature, Rust sources render as plain text.
#[cfg(not(feature = "rust"))]
fn rust_grammar() -> Option<(tree_sitter::Language, &'static str)> {
None
}
/// The TypeScript grammar, compiled in only when the `typescript` feature is on.
#[cfg(feature = "typescript")]
fn typescript_grammar() -> Option<(tree_sitter::Language, &'static str)> {
Some((
tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into(),
tree_sitter_typescript::HIGHLIGHTS_QUERY,
)
}),
Language::JavaScript => cfg!(feature = "javascript").then(|| {
(
))
}
/// Without the feature, TypeScript sources render as plain text.
#[cfg(not(feature = "typescript"))]
fn typescript_grammar() -> Option<(tree_sitter::Language, &'static str)> {
None
}
/// The JavaScript grammar, compiled in only when the `javascript` feature is on.
#[cfg(feature = "javascript")]
fn javascript_grammar() -> Option<(tree_sitter::Language, &'static str)> {
Some((
tree_sitter_javascript::LANGUAGE.into(),
tree_sitter_javascript::HIGHLIGHT_QUERY,
)
}),
Language::Python => cfg!(feature = "python").then(|| {
(
))
}
/// Without the feature, JavaScript sources render as plain text.
#[cfg(not(feature = "javascript"))]
fn javascript_grammar() -> Option<(tree_sitter::Language, &'static str)> {
None
}
/// The Python grammar, compiled in only when the `python` feature is on.
#[cfg(feature = "python")]
fn python_grammar() -> Option<(tree_sitter::Language, &'static str)> {
Some((
tree_sitter_python::LANGUAGE.into(),
tree_sitter_python::HIGHLIGHTS_QUERY,
)
}),
}
))
}
/// Without the feature, Python sources render as plain text.
#[cfg(not(feature = "python"))]
fn python_grammar() -> Option<(tree_sitter::Language, &'static str)> {
None
}
/// Maps a query capture name to a role; unmapped captures render as text.
crates/editor/src/markdown.rs
+82 -34
View File
@@ -13,13 +13,15 @@ use gpui::{
};
use gpui_native_core::scrollbar::{Scrollbar, ScrollbarVisibility};
use gpui_native_icons::{IconRole, icon};
use gpui_native_theme::ActiveTheme as _;
use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, CODE_OVERSCROLL_MAX};
use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag, TagEnd};
use std::collections::HashMap;
use std::hash::{DefaultHasher, Hash, Hasher};
use std::ops::Range;
use crate::highlight::{HighlightedCode, highlight, plain};
use crate::utils::{code_line, grammar_language};
use crate::highlight::{HighlightedCode, Language, highlight, plain};
use crate::utils::code_line;
/// Heading scale steps relative to the root font size, H1 first.
const HEADING_SCALES: [f32; 6] = [1.9, 1.5, 1.25, 1.1, 1.0, 0.95];
@@ -39,7 +41,7 @@ const BODY_LINE_HEIGHT: f32 = 1.6;
const CODE_LINE_HEIGHT: f32 = 1.5;
/// A heading level, 1 to 6.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub enum MarkdownHeading {
H1,
H2,
@@ -64,7 +66,7 @@ impl MarkdownHeading {
}
/// The marker drawn before a list item.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub enum ListMarker {
/// An unordered bullet.
Bullet,
@@ -75,14 +77,14 @@ pub enum ListMarker {
}
/// One run of inline text sharing a style.
#[derive(Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub struct InlineSpan {
pub text: SharedString,
pub style: InlineStyle,
}
/// The inline style a text run carries.
#[derive(Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum InlineStyle {
Text,
Emphasis,
@@ -98,26 +100,26 @@ pub enum InlineStyle {
}
/// One cell of a table row.
#[derive(Clone, Debug, Default, PartialEq, Eq)]
#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
pub struct MarkdownTableCell {
pub spans: Vec<InlineSpan>,
}
/// A table row; the header row precedes the body rows.
#[derive(Clone, Debug, Default, PartialEq, Eq)]
#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
pub struct MarkdownTableRow {
pub cells: Vec<MarkdownTableCell>,
pub header: bool,
}
/// A table, header row first.
#[derive(Clone, Debug, Default, PartialEq, Eq)]
#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
pub struct MarkdownTable {
pub rows: Vec<MarkdownTableRow>,
}
/// One rendered block of a markdown document.
#[derive(Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum MarkdownBlock {
Heading {
level: MarkdownHeading,
@@ -160,11 +162,21 @@ pub enum MarkdownBlock {
},
}
impl MarkdownBlock {
/// Hashes the block so element ids track content, not list position.
fn content_hash(&self) -> u64 {
let mut hasher = DefaultHasher::new();
self.hash(&mut hasher);
hasher.finish()
}
}
/// Retained state for a markdown view.
pub struct MarkdownViewState {
id: ElementId,
source: SharedString,
blocks: Vec<MarkdownBlock>,
block_ids: Vec<ElementId>,
/// Whether fenced code blocks highlight with the code view's palette.
highlight_code: bool,
/// Drives the vertical scroll of the virtualized block list.
@@ -179,16 +191,19 @@ impl MarkdownViewState {
I: Into<ElementId>,
S: Into<SharedString>,
{
let id = id.into();
let source = source.into();
let blocks = parse(&source, true);
let block_ids = Self::stable_block_ids(&id, &blocks);
let count = blocks.len();
Self {
id: id.into(),
id,
source,
blocks,
block_ids,
highlight_code: true,
handle: ListState::new(count, ListAlignment::Top, px(400.)),
handle: ListState::new(count, ListAlignment::Top, CODE_OVERSCROLL_MAX),
a11y_label: None,
}
}
@@ -215,11 +230,31 @@ impl MarkdownViewState {
}
fn reparse(&mut self) {
self.blocks = parse(&self.source, self.highlight_code);
let blocks = parse(&self.source, self.highlight_code);
let block_ids = Self::stable_block_ids(&self.id, &blocks);
self.blocks = blocks;
self.block_ids = block_ids;
self.handle.reset(self.blocks.len());
self.handle.scroll_to_reveal_item(0);
}
/// Ids built from the block's content hash plus an ordinal among blocks of equal content.
fn stable_block_ids(id: &ElementId, blocks: &[MarkdownBlock]) -> Vec<ElementId> {
let mut ids = Vec::with_capacity(blocks.len());
let mut occurrences = HashMap::with_capacity(blocks.len());
for block in blocks {
let hash = block.content_hash();
let occurrence = *occurrences
.entry(hash)
.and_modify(|count| *count += 1)
.or_insert(0);
ids.push(ElementId::from(SharedString::from(format!(
"{id}-block-{hash:x}-{occurrence}"
))));
}
ids
}
/// The markdown source the view renders.
pub fn source(&self) -> &str {
&self.source
@@ -230,6 +265,11 @@ impl MarkdownViewState {
&self.blocks
}
/// The stable element id of the block at `block_index`.
pub fn block_id(&self, block_index: usize) -> Option<ElementId> {
self.block_ids.get(block_index).cloned()
}
/// Whether fenced code highlights with the code view's palette.
pub fn highlight_code(&self) -> bool {
self.highlight_code
@@ -259,10 +299,14 @@ impl Render for MarkdownViewState {
let id = self.id.clone();
let state = cx.entity();
let blocks = list(self.handle.clone(), move |block_ix, _window, cx| {
let blocks = list(self.handle.clone(), move |block_index, _window, cx| {
let view = state.read(cx);
match view.blocks.get(block_ix) {
Some(block) => render_block(block, block_ix, &view.id, cx),
match view
.blocks
.get(block_index)
.zip(view.block_ids.get(block_index))
{
Some((block, block_id)) => render_block(block, block_index, block_id, cx),
None => div().into_any_element(),
}
})
@@ -566,7 +610,7 @@ fn parse(source: &str, highlight_code: bool) -> Vec<MarkdownBlock> {
let text = built.trim_end_matches('\n');
let language = code_language.take();
let lines = match highlight_code
.then(|| language.as_deref().and_then(grammar_language))
.then(|| language.as_deref().and_then(Language::from_fence_info))
.flatten()
{
Some(grammar) => highlight(text, grammar),
@@ -694,10 +738,14 @@ fn flush_item_inline(
}
/// Renders one parsed block as a list row.
fn render_block(block: &MarkdownBlock, block_ix: usize, id: &ElementId, cx: &App) -> AnyElement {
fn render_block(
block: &MarkdownBlock,
block_index: usize,
block_id: &ElementId,
cx: &App,
) -> AnyElement {
let theme = cx.theme();
let gap = theme.root_font_size * BLOCK_GAP;
let block_id = ElementId::from(SharedString::from(format!("{id}-block-{block_ix}")));
match block {
MarkdownBlock::Heading {
@@ -710,15 +758,15 @@ fn render_block(block: &MarkdownBlock, block_ix: usize, id: &ElementId, cx: &App
spans,
*indent,
*quote,
if block_ix == 0 { px(0.) } else { gap * 0.5 },
&block_id,
if block_index == 0 { px(0.) } else { gap * 0.5 },
block_id,
cx,
),
MarkdownBlock::Paragraph {
spans,
indent,
quote,
} => text_row(spans, *indent, *quote, gap, None, &block_id, cx),
} => text_row(spans, *indent, *quote, gap, None, block_id, cx),
MarkdownBlock::ListItem {
marker,
spans,
@@ -730,7 +778,7 @@ fn render_block(block: &MarkdownBlock, block_ix: usize, id: &ElementId, cx: &App
*quote,
theme.root_font_size * ITEM_GAP,
Some(*marker),
&block_id,
block_id,
cx,
),
MarkdownBlock::Code {
@@ -738,13 +786,13 @@ fn render_block(block: &MarkdownBlock, block_ix: usize, id: &ElementId, cx: &App
indent,
quote,
..
} => code_row(lines, *indent, *quote, &block_id, cx),
MarkdownBlock::ThematicBreak { indent, quote } => rule_row(*indent, *quote, &block_id, cx),
} => code_row(lines, *indent, *quote, block_id, cx),
MarkdownBlock::ThematicBreak { indent, quote } => rule_row(*indent, *quote, block_id, cx),
MarkdownBlock::Table {
table,
indent,
quote,
} => table_row(table, *indent, *quote, &block_id, cx),
} => table_row(table, *indent, *quote, block_id, cx),
}
}
@@ -937,7 +985,7 @@ fn rule_row(indent: usize, quote: bool, id: &ElementId, cx: &App) -> AnyElement
id,
cx,
)
.child(div().h(px(1.)).w_full().bg(theme.colors.border))
.child(div().h(BORDER_WIDTH).w_full().bg(theme.colors.border))
.into_any_element()
}
@@ -966,11 +1014,11 @@ fn table_row(
.border_color(colors.border)
.rounded(theme.radius.control)
.overflow_hidden()
.children(table.rows.iter().enumerate().map(|(row_ix, row)| {
.children(table.rows.iter().enumerate().map(|(row_index, row)| {
div()
.w_full()
.flex()
.when(row_ix + 1 < row_count, |row_element| {
.when(row_index + 1 < row_count, |row_element| {
row_element.border_b_1().border_color(colors.border)
})
.when(row.header, |row_element| row_element.bg(colors.muted))
@@ -978,9 +1026,9 @@ fn table_row(
row.cells
.iter()
.enumerate()
.map(|(column_ix, cell)| {
.map(|(column_index, cell)| {
let cell_id = ElementId::from(SharedString::from(format!(
"{id}-cell-{row_ix}-{column_ix}"
"{id}-cell-{row_index}-{column_index}"
)));
div()
.flex_1()
@@ -1055,7 +1103,7 @@ fn text_child(spans: &[InlineSpan], id: &ElementId, cx: &App) -> AnyElement {
range,
HighlightStyle {
strikethrough: Some(StrikethroughStyle {
thickness: px(1.),
thickness: BORDER_WIDTH,
color: Some(theme.colors.muted_foreground),
}),
..Default::default()
@@ -1077,7 +1125,7 @@ fn text_child(spans: &[InlineSpan], id: &ElementId, cx: &App) -> AnyElement {
HighlightStyle {
color: Some(theme.colors.accent),
underline: Some(UnderlineStyle {
thickness: px(1.),
thickness: BORDER_WIDTH,
color: None,
wavy: false,
}),
crates/editor/src/utils.rs
+48 -89
View File
@@ -1,27 +1,28 @@
//! Shared helpers for the editor's views: gutter cells, role colors, code
//! line text, language mapping, change washes and diff row building.
//! Shared helpers for the editor's views: gutter cells, role colors and run
//! styles, code line text, language mapping and change washes.
#[cfg(any(feature = "diff_view", feature = "markdown_view"))]
#[cfg(feature = "markdown_view")]
use std::ops::Range;
#[cfg(feature = "markdown_view")]
use crate::highlight::{Language, Line};
#[cfg(feature = "markdown_view")]
use gpui::StyledText;
#[cfg(feature = "code_view")]
use gpui::{App, HighlightStyle, Hsla, IntoElement, ParentElement as _, Styled as _, div};
#[cfg(feature = "code_view")]
use gpui_native_theme::{ActiveTheme as _, ColorTokens, Ramps};
#[cfg(feature = "diff_view")]
use similar::{Change, ChangeTag};
use gpui_native_theme::{WASH_ALPHA, WASH_ALPHA_GUTTER, WASH_ALPHA_STRONG};
#[cfg(feature = "diff_view")]
use crate::diff_view::{DiffRow, DiffRowKind};
#[cfg(feature = "diff_view")]
use crate::highlight::HighlightedCode;
#[cfg(feature = "code_view")]
use crate::highlight::Role;
#[cfg(feature = "markdown_view")]
use crate::highlight::{Language, Line};
/// Maps a highlight role to the theme's semantic palette.
pub(crate) fn role_color(role: Role, colors: ColorTokens, ramps: Ramps) -> Hsla {
match role {
#[cfg(feature = "code_view")]
impl Role {
/// Maps the role to the theme's semantic palette.
pub(crate) fn color(self, colors: ColorTokens, ramps: Ramps) -> Hsla {
match self {
Role::Text => colors.foreground,
Role::Keyword => ramps.primary.base,
Role::String | Role::Escape => ramps.success.base,
@@ -32,23 +33,39 @@ pub(crate) fn role_color(role: Role, colors: ColorTokens, ramps: Ramps) -> Hsla
Role::Operator => colors.foreground,
Role::Tag => ramps.destructive.base,
}
}
}
/// Builds the highlight style for one run of a code view row.
pub(crate) fn run_style(
role: Role,
/// Builds the highlight style for one run of a code view row.
pub(crate) fn run_style(
self,
selected: bool,
colors: ColorTokens,
ramps: Ramps,
) -> HighlightStyle {
) -> HighlightStyle {
HighlightStyle {
color: Some(role_color(role, colors, ramps)),
color: Some(self.color(colors, ramps)),
background_color: selected.then_some(colors.selection),
..Default::default()
}
}
}
#[cfg(feature = "markdown_view")]
impl Language {
/// Maps a fence info string to a bundled grammar.
pub(crate) fn from_fence_info(info: &str) -> Option<Language> {
match info.to_ascii_lowercase().as_str() {
"rust" | "rs" => Some(Language::Rust),
"typescript" | "ts" => Some(Language::TypeScript),
"javascript" | "js" => Some(Language::JavaScript),
"python" | "py" => Some(Language::Python),
_ => None,
}
}
}
/// A gutter cell sized to the whole row.
#[cfg(feature = "code_view")]
pub(crate) fn gutter_cell<E>(cx: &App, color: Hsla, content: E) -> gpui::Div
where
E: IntoElement,
@@ -68,75 +85,29 @@ where
.child(content)
}
/// Builds a diff line row from a `similar` change.
#[cfg(feature = "diff_view")]
pub(crate) fn line_row(
change: &Change<&str>,
code: &HighlightedCode,
changed_ranges: Vec<Range<usize>>,
) -> DiffRow {
let content = match change.tag() {
ChangeTag::Equal => change
.new_index()
.and_then(|ix| code.lines.get(ix))
.cloned()
.unwrap_or_default(),
ChangeTag::Delete => change
.old_index()
.and_then(|ix| code.lines.get(ix))
.cloned()
.unwrap_or_default(),
ChangeTag::Insert => change
.new_index()
.and_then(|ix| code.lines.get(ix))
.cloned()
.unwrap_or_default(),
};
let (old_number, new_number) = match change.tag() {
ChangeTag::Equal => (
change.old_index().map(|ix| ix + 1),
change.new_index().map(|ix| ix + 1),
),
ChangeTag::Delete => (change.old_index().map(|ix| ix + 1), None),
ChangeTag::Insert => (None, change.new_index().map(|ix| ix + 1)),
};
DiffRow {
kind: match change.tag() {
ChangeTag::Equal => DiffRowKind::Context,
ChangeTag::Delete => DiffRowKind::Removed,
ChangeTag::Insert => DiffRowKind::Added,
},
content,
old_number,
new_number,
changed_ranges,
header: Default::default(),
hidden_lines: 0,
}
}
/// A change wash: the ramp color at the alpha rows tint with.
#[cfg(feature = "diff_view")]
pub(crate) fn wash(color: Hsla) -> Hsla {
Hsla {
a: color.a * 0.14,
a: color.a * WASH_ALPHA,
..color
}
}
/// The stronger wash under number gutters and intra-line word changes.
#[cfg(feature = "diff_view")]
pub(crate) fn wash_strong(color: Hsla) -> Hsla {
Hsla {
a: color.a * 0.34,
a: color.a * WASH_ALPHA_STRONG,
..color
}
}
/// The subtle wash that sets the number gutter off from the code.
#[cfg(feature = "diff_view")]
pub(crate) fn wash_gutter(colors: &ColorTokens) -> Hsla {
Hsla {
a: colors.muted.a * 0.18,
a: colors.muted.a * WASH_ALPHA_GUTTER,
..colors.muted
}
}
@@ -144,34 +115,22 @@ pub(crate) fn wash_gutter(colors: &ColorTokens) -> Hsla {
/// One highlighted code line as styled text, roles resolved from the theme.
#[cfg(feature = "markdown_view")]
pub(crate) fn code_line(line: &Line, colors: ColorTokens, ramps: Ramps) -> StyledText {
let mut text = String::new();
let mut highlights: Vec<(Range<usize>, HighlightStyle)> = Vec::new();
let mut offset = 0usize;
for span in &line.spans {
let start = text.len();
text.push_str(&span.text);
let end = offset + span.text.len();
if span.role != Role::Text {
highlights.push((
start..text.len(),
offset..end,
HighlightStyle {
color: Some(role_color(span.role, colors, ramps)),
color: Some(span.role.color(colors, ramps)),
..Default::default()
},
));
}
offset = end;
}
StyledText::new(text).with_highlights(highlights)
}
/// Maps a fence info string to a bundled grammar.
#[cfg(feature = "markdown_view")]
pub(crate) fn grammar_language(info: &str) -> Option<Language> {
match info.to_ascii_lowercase().as_str() {
"rust" | "rs" => Some(Language::Rust),
"typescript" | "ts" => Some(Language::TypeScript),
"javascript" | "js" => Some(Language::JavaScript),
"python" | "py" => Some(Language::Python),
_ => None,
}
StyledText::new(line.text()).with_highlights(highlights)
}
crates/editor/tests/code_view_bench.rs
+3 -2
View File
@@ -1,4 +1,5 @@
use std::cell::RefCell;
use std::hint::black_box;
use std::rc::Rc;
use std::time::{Duration, Instant};
@@ -101,11 +102,11 @@ fn scrolling_a_large_file_is_not_pathologically_slow() {
scroll_elapsed / 30
);
assert!(
highlight_elapsed < Duration::from_secs(3),
black_box(highlight_elapsed) < Duration::from_secs(10),
"highlighting took {highlight_elapsed:?}"
);
assert!(
scroll_elapsed < Duration::from_secs(2),
black_box(scroll_elapsed) < Duration::from_secs(10),
"scrolling 30 frames took {scroll_elapsed:?}"
);
}
crates/editor/tests/diff_view.rs
+5 -5
View File
@@ -5,7 +5,7 @@ use gpui::{
AppContext as _, Context, Entity, IntoElement, MouseButton, ParentElement as _, Render,
Styled as _, TestAppContext, VisualTestContext, Window, div, point, px,
};
use gpui_native_editor::diff_view::{DiffRow, DiffRowKind, DiffViewState, diff_rows};
use gpui_native_editor::diff_view::{DiffRow, DiffRowKind, DiffViewState};
use gpui_native_editor::highlight::{Language, Role};
const OLD: &str = "fn a() {}\nfn b() {}\nfn c() {}\n";
@@ -13,7 +13,7 @@ const NEW: &str = "fn a() {}\nfn x() {}\nfn y() {}\nfn c() {}\n";
#[test]
fn rows_mark_removals_additions_and_context_with_line_numbers() {
let rows = diff_rows(OLD, NEW, Language::Rust);
let rows = DiffViewState::diff_rows(OLD, NEW, Language::Rust);
let kinds: Vec<DiffRowKind> = rows.iter().map(|row| row.kind).collect();
assert_eq!(
@@ -72,7 +72,7 @@ fn hunk_separators_carry_the_collapsed_line_count_and_header() {
new.push_str(&format!("line {line}\n"));
}
}
let rows = diff_rows(&old, &new, Language::Rust);
let rows = DiffViewState::diff_rows(&old, &new, Language::Rust);
let separators: Vec<&DiffRow> = rows
.iter()
@@ -91,7 +91,7 @@ fn hunk_separators_carry_the_collapsed_line_count_and_header() {
#[test]
fn word_changes_tint_only_the_changed_words() {
let rows = diff_rows(OLD, NEW, Language::Rust);
let rows = DiffViewState::diff_rows(OLD, NEW, Language::Rust);
let removed = &rows[1];
let removed_text: String = removed
@@ -118,7 +118,7 @@ fn word_changes_tint_only_the_changed_words() {
#[test]
fn an_added_line_carries_its_highlight_spans() {
let rows = diff_rows("", "fn zed() {}\n", Language::Rust);
let rows = DiffViewState::diff_rows("", "fn zed() {}\n", Language::Rust);
let added = rows
.iter()
.find(|row| row.kind == DiffRowKind::Added)
crates/editor/tests/diff_view_bench.rs
+3 -2
View File
@@ -1,4 +1,5 @@
use std::cell::RefCell;
use std::hint::black_box;
use std::rc::Rc;
use std::time::{Duration, Instant};
@@ -99,11 +100,11 @@ fn scrolling_a_large_diff_is_not_pathologically_slow() {
scroll_elapsed / 30
);
assert!(
diff_elapsed < Duration::from_secs(3),
black_box(diff_elapsed) < Duration::from_secs(10),
"diffing took {diff_elapsed:?}"
);
assert!(
scroll_elapsed < Duration::from_secs(2),
black_box(scroll_elapsed) < Duration::from_secs(10),
"scrolling 30 frames took {scroll_elapsed:?}"
);
}
crates/editor/tests/markdown.rs
+33 -12
View File
@@ -2,7 +2,7 @@ use std::cell::RefCell;
use std::rc::Rc;
use gpui::{
AppContext as _, Context, Entity, IntoElement, MouseButton, MouseDownEvent, MouseUpEvent,
App, AppContext as _, Context, Entity, IntoElement, MouseButton, MouseDownEvent, MouseUpEvent,
ParentElement as _, Render, Styled as _, TestAppContext, VisualTestContext, Window, div, point,
px,
};
@@ -363,6 +363,19 @@ fn view_window(source: &str) -> (TestAppContext, VisualTestContext, Entity<Markd
(cx, visual, state)
}
/// The stable id string of the block at `block_index`. Leaks so the id can
/// feed `debug_bounds`, which requires `&'static str`.
fn block_id(state: &Entity<MarkdownViewState>, cx: &App, block_index: usize) -> &'static str {
Box::<str>::leak(
state
.read(cx)
.block_id(block_index)
.expect("the block has an id")
.to_string()
.into_boxed_str(),
)
}
#[test]
fn blocks_render_virtualized_and_scroll_to_a_block() {
let mut source = String::new();
@@ -371,12 +384,16 @@ fn blocks_render_virtualized_and_scroll_to_a_block() {
}
let (_cx, mut visual, state) = view_window(&source);
let first_id = _cx.update(|cx| block_id(&state, cx, 0));
let target_id = _cx.update(|cx| block_id(&state, cx, 150));
let last_id = _cx.update(|cx| block_id(&state, cx, 199));
assert!(
visual.debug_bounds("test-md-block-0").is_some(),
visual.debug_bounds(first_id).is_some(),
"the first block renders"
);
assert!(
visual.debug_bounds("test-md-block-150").is_none(),
visual.debug_bounds(target_id).is_none(),
"blocks past the viewport never render"
);
@@ -388,25 +405,26 @@ fn blocks_render_virtualized_and_scroll_to_a_block() {
});
assert!(
visual.debug_bounds("test-md-block-150").is_some(),
visual.debug_bounds(target_id).is_some(),
"scrolling brings the target block in"
);
assert!(
visual.debug_bounds("test-md-block-0").is_none(),
visual.debug_bounds(first_id).is_none(),
"the first block scrolled out"
);
assert!(
visual.debug_bounds("test-md-block-199").is_none(),
visual.debug_bounds(last_id).is_none(),
"blocks past the target stay unrendered"
);
}
#[test]
fn clicking_a_link_opens_its_destination() {
let (_cx, mut visual, _state) = view_window("[click me](https://example.com/welcome)");
let (_cx, mut visual, state) = view_window("[click me](https://example.com/welcome)");
let first_id = _cx.update(|cx| block_id(&state, cx, 0));
let block = visual
.debug_bounds("test-md-block-0")
.debug_bounds(first_id)
.expect("the paragraph renders");
visual.simulate_event(MouseDownEvent {
@@ -461,21 +479,24 @@ fn a_large_document_swaps_and_renders_without_freezing() {
window.draw(cx).clear(cx);
});
let elapsed = started.elapsed();
let elapsed = std::hint::black_box(started.elapsed());
assert!(
elapsed < std::time::Duration::from_secs(15),
elapsed < std::time::Duration::from_secs(30),
"swapping to a large document took {elapsed:?}; the frame must not
measure every block"
);
let count = _cx.update(|cx| state.read(cx).blocks().len());
assert_eq!(count, 5000, "five blocks per section");
let first_id = _cx.update(|cx| block_id(&state, cx, 0));
let last_id = _cx.update(|cx| block_id(&state, cx, 4999));
assert!(
visual.debug_bounds("test-md-block-0").is_some(),
visual.debug_bounds(first_id).is_some(),
"the first block renders after the swap"
);
assert!(
visual.debug_bounds("test-md-block-4999").is_none(),
visual.debug_bounds(last_id).is_none(),
"blocks past the viewport never render"
);
}
crates/icons/src/freedesktop.rs
+40 -6
View File
@@ -4,7 +4,9 @@
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use std::sync::{Mutex, OnceLock};
use std::sync::{Mutex, OnceLock, PoisonError};
use gpui::SharedString;
use crate::IconRole;
@@ -144,14 +146,33 @@ fn icon_score(path: &Path, requested: u32) -> SizeScore {
.unwrap_or(SizeScore::Any)
}
/// The discovered icon file for a role at a size, cached for the process.
type IconCache = Mutex<HashMap<(&'static str, u32), Option<PathBuf>>>;
/// A resolved icon file and the asset key its bytes are served under.
struct CachedIcon {
path: PathBuf,
asset_key: SharedString,
}
/// The discovered icons, cached for the process.
type IconCache = Mutex<HashMap<(&'static str, u32), Option<CachedIcon>>>;
pub(crate) fn cached_file(role: IconRole, requested: u32) -> Option<PathBuf> {
cached_icon(role, requested, |icon| icon.path.clone())
}
/// The asset key a resolved freedesktop file is served under.
pub(crate) fn cached_asset_key(role: IconRole, requested: u32) -> Option<SharedString> {
cached_icon(role, requested, |icon| icon.asset_key.clone())
}
fn cached_icon<T, P>(role: IconRole, requested: u32, project: P) -> Option<T>
where
P: FnOnce(&CachedIcon) -> T,
{
static CACHE: OnceLock<IconCache> = OnceLock::new();
let cache = CACHE.get_or_init(|| Mutex::new(HashMap::new()));
let mut cache = cache.lock().expect("icon cache poisoned");
// A poisoned lock means a lookup panicked; its stale data beats a panic.
let mut cache = cache.lock().unwrap_or_else(PoisonError::into_inner);
cache
.entry((role.slug(), requested))
@@ -162,8 +183,16 @@ pub(crate) fn cached_file(role: IconRole, requested: u32) -> Option<PathBuf> {
requested,
&base_dirs(),
)
.map(|path| CachedIcon {
asset_key: SharedString::from(format!(
"icons/freedesktop/{}-{requested}.svg",
role.slug()
)),
path,
})
.clone()
})
.as_ref()
.map(project)
}
#[cfg(target_os = "linux")]
@@ -253,7 +282,12 @@ mod tests {
fn scratch(name: &str) -> PathBuf {
let root =
std::env::temp_dir().join(format!("gpui-native-icons-{name}-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&root);
// NotFound is the expected first run; anything else is a setup failure.
if let Err(error) = std::fs::remove_dir_all(&root)
&& error.kind() != std::io::ErrorKind::NotFound
{
panic!("failed to clear scratch dir {root:?}: {error}");
}
std::fs::create_dir_all(&root).expect("scratch dir");
root
}
crates/icons/src/lib.rs
+25 -9
View File
@@ -92,7 +92,8 @@ impl IconRole {
}
}
fn slug(self) -> &'static str {
/// The stable identifier used for element and debug ids.
pub fn slug(self) -> &'static str {
match self {
Self::Check => "check",
Self::Close => "close",
@@ -223,11 +224,14 @@ pub struct Icon {
transformation: Option<Transformation>,
}
/// Creates an icon for the role at the default size of 16px.
/// The default icon size; this crate sits beside the theme crate without depending on it.
const DEFAULT_ICON_SIZE: Pixels = px(16.0);
/// Creates an icon for the role at the default size.
pub fn icon(role: IconRole) -> Icon {
Icon {
glyph: Glyph::Role(role),
size: px(16.0),
size: DEFAULT_ICON_SIZE,
color: None,
transformation: None,
}
@@ -241,7 +245,7 @@ impl Icon {
{
Self {
glyph: Glyph::Named(named.path()),
size: px(16.0),
size: DEFAULT_ICON_SIZE,
color: None,
transformation: None,
}
@@ -267,8 +271,7 @@ impl Icon {
#[cfg(target_os = "linux")]
fn freedesktop_asset_path(size: Pixels, role: &IconRole) -> Option<SharedString> {
let size = size.as_f32().max(1.0).round() as u32;
freedesktop::cached_file(*role, size)
.map(|_| SharedString::from(format!("icons/freedesktop/{}-{size}.svg", role.slug())))
freedesktop::cached_asset_key(*role, size)
}
/// Roles resolve per platform.
@@ -295,9 +298,9 @@ impl Icon {
.into_any_element()
}
/// Windows: the Segoe Fluent codepoint drawn as text in the system font.
/// Windows: the Segoe Fluent glyph drawn as text in the system font.
#[cfg(target_os = "windows")]
fn render_glyph(size: Pixels, color: Option<Hsla>, glyph: char) -> AnyElement {
fn render_glyph(size: Pixels, color: Option<Hsla>, glyph: &'static str) -> AnyElement {
div()
.flex_none()
.size(size)
@@ -309,7 +312,7 @@ impl Icon {
.font_family(segoe::FONT_FAMILY)
.text_size(size)
.when_some(color, |el, color| el.text_color(color))
.child(glyph.to_string()),
.child(SharedString::new_static(glyph)),
)
.into_any_element()
}
@@ -424,6 +427,19 @@ impl AssetSource for IconAssets {
mod tests {
use super::*;
#[test]
fn every_role_has_a_unique_slug() {
for (index, role) in IconRole::all().iter().enumerate() {
for other in &IconRole::all()[index + 1..] {
assert_ne!(
role.slug(),
other.slug(),
"{role:?} and {other:?} share a slug"
);
}
}
}
#[test]
fn every_role_resolves_to_a_bundled_asset() {
for role in IconRole::all() {
crates/icons/src/segoe.rs
+25 -26
View File
@@ -3,34 +3,33 @@
use crate::IconRole;
/// The Segoe Fluent Icons codepoint for the role.
pub(crate) fn glyph(role: IconRole) -> Option<char> {
let codepoint = match role {
// No Segoe spinner glyph; the icon falls back to the bundled SVG,
// which the spinner rotates.
/// The Segoe Fluent Icons glyph for the role.
pub(crate) fn glyph(role: IconRole) -> Option<&'static str> {
let glyph = match role {
IconRole::Check => "\u{E73E}", // CheckMark
IconRole::Close => "\u{E8BB}", // ChromeClose
IconRole::ChevronDown => "\u{E70D}", // ChevronDown
IconRole::ChevronLeft => "\u{E76B}", // ChevronLeft
IconRole::ChevronRight => "\u{E76C}", // ChevronRight
IconRole::ChevronUp => "\u{E70E}", // ChevronUp
IconRole::Plus => "\u{E710}", // Add
IconRole::Minus => "\u{E738}", // Remove
IconRole::Search => "\u{E721}", // Search
IconRole::Folder => "\u{E8B7}", // Folder
IconRole::Warning => "\u{E7BA}", // Warning
IconRole::Info => "\u{E946}", // Info
IconRole::Copy => "\u{E8C8}", // Copy
IconRole::Eye => "\u{E7B3}", // RedEye
IconRole::EyeOff => "\u{ED1A}", // Hide
IconRole::PanelLeft => "\u{E90C}", // DockLeft
IconRole::PanelRight => "\u{E90D}", // DockRight
IconRole::WindowMinimize => "\u{E921}", // ChromeMinimize
IconRole::WindowMaximize => "\u{E922}", // ChromeMaximize
IconRole::WindowRestore => "\u{E923}", // ChromeRestore
// No Segoe spinner glyph, the icon falls back to the bundled SVG.
IconRole::Loader => return None,
IconRole::Check => 0xE73E, // CheckMark
IconRole::Close => 0xE8BB, // ChromeClose
IconRole::ChevronDown => 0xE70D, // ChevronDown
IconRole::ChevronLeft => 0xE76B, // ChevronLeft
IconRole::ChevronRight => 0xE76C, // ChevronRight
IconRole::ChevronUp => 0xE70E, // ChevronUp
IconRole::Plus => 0xE710, // Add
IconRole::Minus => 0xE738, // Remove
IconRole::Search => 0xE721, // Search
IconRole::Folder => 0xE8B7, // Folder
IconRole::Warning => 0xE7BA, // Warning
IconRole::Info => 0xE946, // Info
IconRole::Copy => 0xE8C8, // Copy
IconRole::Eye => 0xE7B3, // RedEye
IconRole::EyeOff => 0xED1A, // Hide
IconRole::PanelLeft => 0xE90C, // DockLeft
IconRole::PanelRight => 0xE90D, // DockRight
IconRole::WindowMinimize => 0xE921, // ChromeMinimize
IconRole::WindowMaximize => 0xE922, // ChromeMaximize
IconRole::WindowRestore => 0xE923, // ChromeRestore
};
char::from_u32(codepoint)
Some(glyph)
}
/// The system font the codepoints resolve against (Windows 11+).
crates/layout/Cargo.toml
+2 -1
View File
@@ -8,7 +8,7 @@ description = "Application layout bootstrap: sidebars and a center dock, one car
gpui = { workspace = true }
gpui-native-theme = { workspace = true }
gpui-native-utils = { workspace = true }
gpui-native-core = { workspace = true, optional = true, features = ["button"] }
gpui-native-core = { workspace = true, optional = true }
gpui-native-data = { workspace = true, optional = true, features = ["sidebar"] }
gpui-native-icons = { workspace = true, optional = true }
@@ -33,6 +33,7 @@ shell = [
"resize_handle",
"window_controls",
"dep:gpui-native-core",
"gpui-native-core/button",
"dep:gpui-native-data",
"dep:gpui-native-icons",
]
crates/layout/src/dock.rs
+34 -42
View File
@@ -32,6 +32,7 @@ type PanelBuilder = Box<dyn Fn(&mut Window, &mut App) -> AnyView>;
type OpenRightSidebarHandler = Rc<dyn Fn(&mut App)>;
/// A registered panel: its identity, chrome, and how its view is built.
#[must_use]
pub struct PanelDescriptor {
id: SharedString,
title: SharedString,
@@ -237,7 +238,7 @@ impl DockState {
/// Points the right sidebar at the panel's own view and asks the app to open it.
fn show_right_view_of(&mut self, id: &str, cx: &mut Context<Self>) {
let right_view = tab_in(&self.root, id).and_then(|tab| tab.right_view.clone());
let right_view = Self::tab_in(&self.root, id).and_then(|tab| tab.right_view.clone());
let Some(right_view) = right_view else {
return;
};
@@ -300,7 +301,7 @@ impl DockState {
// The sidebar showed the closed panel's view.
if self.right_view.as_ref() == closed_right_view.as_ref() {
self.right_view = first_right_view(&self.root);
self.right_view = Self::first_right_view(&self.root);
}
if emptied {
@@ -341,7 +342,7 @@ impl DockState {
})
})
.and_then(|tab| tab.right_view.clone())
.or_else(|| first_right_view(&self.root));
.or_else(|| Self::first_right_view(&self.root));
cx.notify();
}
}
@@ -372,7 +373,7 @@ impl DockState {
}
// The closed pane's views are gone; show the first remaining one.
self.right_view = first_right_view(&self.root);
self.right_view = Self::first_right_view(&self.root);
cx.notify();
}
@@ -495,7 +496,7 @@ impl DockState {
/// The active tab of the pane new panels open into.
pub fn active_panel(&self) -> Option<SharedString> {
let pane = pane_in(&self.root, self.target_pane_key())?;
let pane = Self::pane_in(&self.root, self.target_pane_key())?;
pane.active.clone()
}
@@ -522,7 +523,7 @@ impl DockState {
}
fn target_pane_key(&self) -> u64 {
if pane_in(&self.root, self.active_pane).is_some() {
if Self::pane_in(&self.root, self.active_pane).is_some() {
self.active_pane
} else {
self.first_pane_key().unwrap_or(0)
@@ -613,7 +614,7 @@ impl DockState {
) {
match node {
Node::Pane(pane) if pane.key == key => {
let old_pane = take_node(node);
let old_pane = Self::take_node(node);
let split = if direction.leads() {
Split {
key: split_key,
@@ -635,9 +636,9 @@ impl DockState {
}
Node::Pane(_) => {}
Node::Split(split) => {
if pane_in(&split.a, key).is_some() {
if Self::pane_in(&split.a, key).is_some() {
Self::wrap_in(&mut split.a, key, new_pane, direction, split_key);
} else if pane_in(&split.b, key).is_some() {
} else if Self::pane_in(&split.b, key).is_some() {
Self::wrap_in(&mut split.b, key, new_pane, direction, split_key);
}
}
@@ -654,14 +655,14 @@ impl DockState {
return;
};
let a_direct = direct_pane_key(&split.a) == Some(key);
let b_direct = direct_pane_key(&split.b) == Some(key);
let a_direct = Self::direct_pane_key(&split.a) == Some(key);
let b_direct = Self::direct_pane_key(&split.b) == Some(key);
if a_direct != b_direct {
let survivor = if a_direct {
take_node(&mut split.b)
Self::take_node(&mut split.b)
} else {
take_node(&mut split.a)
Self::take_node(&mut split.a)
};
*node = survivor;
} else {
@@ -699,42 +700,35 @@ impl DockState {
}
snap(&self.root)
}
}
/// Finds a pane by key anywhere in the tree.
fn pane_in(node: &Node, key: u64) -> Option<&Pane> {
match node {
Node::Pane(pane) => (pane.key == key).then_some(pane),
Node::Split(split) => pane_in(&split.a, key).or_else(|| pane_in(&split.b, key)),
}
}
/// Finds an open tab by panel id, anywhere in the tree.
fn tab_in<'a>(node: &'a Node, id: &str) -> Option<&'a PanelTab> {
/// Finds an open tab by panel id, anywhere in the tree.
fn tab_in<'a>(node: &'a Node, id: &str) -> Option<&'a PanelTab> {
match node {
Node::Pane(pane) => pane.tabs.iter().find(|tab| tab.panel.as_ref() == id),
Node::Split(split) => tab_in(&split.a, id).or_else(|| tab_in(&split.b, id)),
Node::Split(split) => Self::tab_in(&split.a, id).or_else(|| Self::tab_in(&split.b, id)),
}
}
}
/// The first open tab's right sidebar view, in display order.
fn first_right_view(node: &Node) -> Option<AnyView> {
/// The first open tab's right sidebar view, in display order.
fn first_right_view(node: &Node) -> Option<AnyView> {
match node {
Node::Pane(pane) => pane.tabs.iter().find_map(|tab| tab.right_view.clone()),
Node::Split(split) => first_right_view(&split.a).or_else(|| first_right_view(&split.b)),
Node::Split(split) => {
Self::first_right_view(&split.a).or_else(|| Self::first_right_view(&split.b))
}
}
}
}
/// The pane key of a node that is a pane, for seam-level tree edits.
fn direct_pane_key(node: &Node) -> Option<u64> {
/// The pane key of a node that is a pane, for seam-level tree edits.
fn direct_pane_key(node: &Node) -> Option<u64> {
match node {
Node::Pane(pane) => Some(pane.key),
Node::Split(_) => None,
}
}
}
/// Takes a node out, leaving a placeholder that is never read again.
fn take_node(node: &mut Node) -> Node {
/// Takes a node out, leaving a placeholder that is never read again.
fn take_node(node: &mut Node) -> Node {
std::mem::replace(
node,
Node::Pane(Pane {
@@ -743,6 +737,7 @@ fn take_node(node: &mut Node) -> Node {
active: None,
}),
)
}
}
/// One open panel view, per frame.
@@ -776,6 +771,7 @@ enum TreeView {
/// A dock: renders the pane tree of a [`DockState`].
#[derive(IntoElement)]
#[must_use]
pub struct Dock {
id: ElementId,
state: Entity<DockState>,
@@ -1095,6 +1091,7 @@ fn render_pane(
});
let bar_id = SharedString::from(format!("{dock_id}-pane-{}-bar", pane.key));
let strip_id = SharedString::from(format!("{dock_id}-pane-{}-strip", pane.key));
h_flex()
.id(bar_id.clone())
@@ -1111,13 +1108,8 @@ fn render_pane(
.pr(padding_x)
.child(tabs)
.child(titlebar_strip(
div()
.id(SharedString::from(format!(
"{dock_id}-pane-{}-strip",
pane.key
)))
.flex_1()
.self_stretch(),
div().id(strip_id.clone()).flex_1().self_stretch(),
strip_id,
window,
cx,
))
crates/layout/src/resizable.rs
+14 -11
View File
@@ -6,15 +6,11 @@ use gpui::{
InteractiveElement as _, IntoElement, ParentElement as _, Pixels, RenderOnce, SharedString,
StyleRefinement, Styled, Window, canvas, div, px,
};
use gpui_native_theme::{PANE_DEFAULT_SIZE, PANE_MIN_SIZE};
use gpui_native_utils::StyledExt as _;
use crate::resize_handle::ResizeHandle;
/// The size a pane starts at before the group has measured its extent.
const DEFAULT_PANE_SIZE: f32 = 200.0;
/// The floor a pane keeps while dragging unless the caller lowers it.
const DEFAULT_PANE_MIN: f32 = 48.0;
type DebugSelector = std::rc::Rc<dyn Fn() -> String>;
/// The retained pane sizes of one resizable group.
@@ -56,11 +52,12 @@ impl ResizableState {
}
}
/// The equal split of the measured extent.
/// The equal split of the measured extent, or the default pane size unmeasured.
fn equal_split(&self, pane_count: usize) -> Pixels {
match self.measured {
Some(extent) => extent / pane_count as f32,
None => px(DEFAULT_PANE_SIZE),
// usize can exceed f32's exact integer range; bound it via u32 before casting.
Some(extent) => extent / u32::try_from(pane_count).unwrap_or(u32::MAX) as f32,
None => PANE_DEFAULT_SIZE,
}
}
@@ -93,8 +90,11 @@ impl ResizableState {
size = size.min(ceiling);
}
// Earlier panes hold the equal split they already render at, so the
// first drag does not snap them to a backfilled default.
let backfill = self.equal_split(pane_count);
while self.sizes.len() <= ix {
self.sizes.push(px(DEFAULT_PANE_SIZE));
self.sizes.push(backfill);
}
self.sizes[ix] = size;
@@ -105,7 +105,7 @@ impl ResizableState {
fn reset_pane(&mut self, ix: usize, pane_count: usize, cx: &mut Context<Self>) {
let split = self.equal_split(pane_count);
while self.sizes.len() <= ix {
self.sizes.push(px(DEFAULT_PANE_SIZE));
self.sizes.push(split);
}
self.sizes[ix] = split;
cx.notify();
@@ -113,6 +113,7 @@ impl ResizableState {
}
/// One pane of a resizable group: its content and its drag floor.
#[must_use]
pub struct ResizablePane {
content: AnyElement,
min: Pixels,
@@ -120,7 +121,7 @@ pub struct ResizablePane {
impl ResizablePane {
/// The floor a pane keeps while dragging unless the caller lowers it.
pub const DEFAULT_MIN: Pixels = px(DEFAULT_PANE_MIN);
pub const DEFAULT_MIN: Pixels = PANE_MIN_SIZE;
/// Wraps this element as a pane.
pub fn new<E>(content: E) -> Self
@@ -142,6 +143,7 @@ impl ResizablePane {
/// A group of panes stacked along one axis, separated by drag dividers.
#[derive(IntoElement)]
#[must_use]
pub struct Resizable {
id: ElementId,
state: Entity<ResizableState>,
@@ -250,6 +252,7 @@ impl RenderOnce for Resizable {
.into_any_element();
let divider = (!remainder).then(|| {
// The positional index is a stable id: panes are append-only, never reordered.
ResizeHandle::new(SharedString::from(format!("{}-divider-{ix}", self.id)))
.axis(axis)
.on_resize({
crates/layout/src/resize_handle.rs
+12 -9
View File
@@ -10,7 +10,9 @@ use gpui::{
SharedString, StatefulInteractiveElement as _, Styled as _, Window, canvas, deferred, div,
fill, point, px,
};
use gpui_native_theme::{ActiveTheme as _, RESIZE_KEYBOARD_STEP, Size};
use gpui_native_theme::{
ActiveTheme as _, BORDER_WIDTH, HAIRLINE_WIDTH, RESIZE_KEYBOARD_STEP, Size,
};
use gpui_native_utils::{focus_handle, focus_ring};
/// How far one keyboard arrow step moves the seam.
@@ -28,12 +30,13 @@ struct DragState {
/// A thin drag divider that resizes the adjacent region.
#[derive(IntoElement)]
#[must_use]
pub struct ResizeHandle {
id: ElementId,
/// The axis the drag moves along: a vertical seam drags horizontally.
axis: Axis,
disabled: bool,
a11y_label: Option<SharedString>,
accessibility_label: Option<SharedString>,
on_resize: Option<ResizeHandler>,
on_reset: Option<ResetHandler>,
}
@@ -48,7 +51,7 @@ impl ResizeHandle {
id: id.into(),
axis: Axis::Horizontal,
disabled: false,
a11y_label: None,
accessibility_label: None,
on_resize: None,
on_reset: None,
}
@@ -71,7 +74,7 @@ impl ResizeHandle {
where
L: Into<SharedString>,
{
self.a11y_label = Some(label.into());
self.accessibility_label = Some(label.into());
self
}
@@ -105,7 +108,7 @@ impl RenderOnce for ResizeHandle {
let straddle = -thickness / 2.0;
let label = self
.a11y_label
.accessibility_label
.clone()
.unwrap_or_else(|| SharedString::from("Resize"));
@@ -221,17 +224,17 @@ impl RenderOnce for ResizeHandle {
let line = match axis {
Axis::Horizontal => {
let x = bounds.center().x - px(0.5);
let x = bounds.center().x - HAIRLINE_WIDTH;
Bounds::from_corners(
point(x, bounds.top()),
point(x + px(1.), bounds.bottom()),
point(x + BORDER_WIDTH, bounds.bottom()),
)
}
Axis::Vertical => {
let y = bounds.center().y - px(0.5);
let y = bounds.center().y - HAIRLINE_WIDTH;
Bounds::from_corners(
point(bounds.left(), y),
point(bounds.right(), y + px(1.)),
point(bounds.right(), y + BORDER_WIDTH),
)
}
};
crates/layout/src/shell.rs
+51 -38
View File
@@ -10,19 +10,14 @@ use gpui_native_core::button::{Button, ButtonVariant};
use gpui_native_core::common::{Sizable as _, h_flex, v_flex};
use gpui_native_data::sidebar::Sidebar;
use gpui_native_icons::IconRole;
use gpui_native_theme::{ActiveTheme as _, Size};
use gpui_native_theme::{
ActiveTheme as _, SIDEBAR_DEFAULT_WIDTH, SIDEBAR_MAX_WIDTH, SIDEBAR_MIN_WIDTH, Size,
};
use crate::resize_handle::ResizeHandle;
use crate::window_controls::{TRAFFIC_LIGHT_PAD, WindowControls, titlebar_strip};
use crate::window_frame::frame;
/// The width a sidebar opens at.
const DEFAULT_SIDEBAR_WIDTH: f32 = 240.0;
/// The narrowest a sidebar can be dragged to.
const MIN_SIDEBAR_WIDTH: f32 = 160.0;
/// The widest a sidebar can be dragged to.
const MAX_SIDEBAR_WIDTH: f32 = 480.0;
/// The layout the application owns.
pub struct LayoutState {
left_visible: bool,
@@ -37,8 +32,8 @@ impl LayoutState {
cx.new(|_| Self {
left_visible: true,
right_visible: false,
left_width: px(DEFAULT_SIDEBAR_WIDTH),
right_width: px(DEFAULT_SIDEBAR_WIDTH),
left_width: SIDEBAR_DEFAULT_WIDTH,
right_width: SIDEBAR_DEFAULT_WIDTH,
})
}
@@ -80,17 +75,21 @@ impl LayoutState {
/// Applies a drag delta to the left sidebar's width, clamped.
fn resize_left(&mut self, delta: Pixels, cx: &mut Context<Self>) {
self.left_width =
(self.left_width + delta).clamp(px(MIN_SIDEBAR_WIDTH), px(MAX_SIDEBAR_WIDTH));
let width = (self.left_width + delta).clamp(SIDEBAR_MIN_WIDTH, SIDEBAR_MAX_WIDTH);
if (self.left_width - width).abs() > px(f32::EPSILON) {
self.left_width = width;
cx.notify();
}
}
/// Applies a drag delta to the right sidebar's width, clamped.
fn resize_right(&mut self, delta: Pixels, cx: &mut Context<Self>) {
self.right_width =
(self.right_width - delta).clamp(px(MIN_SIDEBAR_WIDTH), px(MAX_SIDEBAR_WIDTH));
let width = (self.right_width - delta).clamp(SIDEBAR_MIN_WIDTH, SIDEBAR_MAX_WIDTH);
if (self.right_width - width).abs() > px(f32::EPSILON) {
self.right_width = width;
cx.notify();
}
}
}
/// Which sidebar a region or toggle belongs to.
@@ -111,6 +110,7 @@ impl Side {
/// The application shell.
#[derive(IntoElement)]
#[must_use]
pub struct Shell {
id: ElementId,
state: Entity<LayoutState>,
@@ -194,11 +194,13 @@ impl RenderOnce for Shell {
left.take()
.map(|sidebar| sidebar.into_any_element())
.unwrap_or_else(|| div().into_any_element()),
Side::Left,
left_material,
&state,
titlebar_height,
metrics.dense_padding_x,
Titlebar {
side: Side::Left,
material: left_material,
height: titlebar_height,
padding_x: metrics.dense_padding_x,
},
window,
cx,
))
@@ -231,11 +233,13 @@ impl RenderOnce for Shell {
(id.clone(), "right"),
width,
right.take().unwrap_or_else(|| div().into_any_element()),
Side::Right,
false,
&state,
titlebar_height,
metrics.dense_padding_x,
Titlebar {
side: Side::Right,
material: false,
height: titlebar_height,
padding_x: metrics.dense_padding_x,
},
window,
cx,
))
@@ -246,48 +250,57 @@ impl RenderOnce for Shell {
}
}
/// One sidebar: a header strip with the hide toggle over the app's content.
#[allow(clippy::too_many_arguments)]
fn sidebar_region(
id: impl Into<ElementId>,
width: Pixels,
content: AnyElement,
/// Which titlebar duties a sidebar's header strip carries.
#[derive(Clone, Copy)]
struct Titlebar {
side: Side,
material: bool,
state: &Entity<LayoutState>,
strip_height: Pixels,
height: Pixels,
padding_x: Pixels,
}
/// One sidebar: a header strip with the hide toggle over the app's content.
fn sidebar_region<I>(
id: I,
width: Pixels,
content: AnyElement,
state: &Entity<LayoutState>,
titlebar: Titlebar,
window: &mut Window,
cx: &mut App,
) -> AnyElement {
) -> AnyElement
where
I: Into<ElementId>,
{
let id = id.into();
let theme = cx.theme();
let background = theme.colors.background;
let strip_background = match (side, material) {
let strip_background = match (titlebar.side, titlebar.material) {
(Side::Left, true) => theme.material.background,
_ => theme.colors.background,
};
let strip = h_flex()
.id((id.clone(), "strip"))
.debug_selector(move || format!("sidebar-strip-{}", side.name()))
.debug_selector(move || format!("sidebar-strip-{}", titlebar.side.name()))
.flex_none()
.h(strip_height)
.h(titlebar.height)
.bg(strip_background)
.items_center()
.map(|strip| match side {
.map(|strip| match titlebar.side {
Side::Left => strip.when(cfg!(target_os = "macos"), |strip| {
strip.pl(TRAFFIC_LIGHT_PAD)
}),
Side::Right => strip,
})
.px(padding_x)
.px(titlebar.padding_x)
.child(titlebar_strip(
div().id((id.clone(), "strip-drag")).flex_1().self_stretch(),
(id.clone(), "strip-drag"),
window,
cx,
))
.map(|strip| match side {
.map(|strip| match titlebar.side {
Side::Left => strip.child(
Button::new((id, "sidebar-toggle"))
.icon(IconRole::PanelLeft)
@@ -314,7 +327,7 @@ fn sidebar_region(
.flex_1()
.min_h_0()
.overflow_hidden()
.when(!material, |content| content.bg(background))
.when(!titlebar.material, |content| content.bg(background))
.child(content),
)
.into_any_element()
crates/layout/src/window_controls.rs
+31 -19
View File
@@ -8,6 +8,8 @@ use gpui::WindowControlArea;
use gpui::{App, ClickEvent, Div, ElementId, IntoElement, RenderOnce, Stateful, Window, div};
use gpui::{InteractiveElement as _, MouseButton, StatefulInteractiveElement as _};
#[cfg(any(target_os = "windows", target_os = "linux"))]
use gpui::Styled as _;
#[cfg(any(target_os = "windows", target_os = "linux"))]
use gpui::prelude::FluentBuilder as _;
#[cfg(any(target_os = "windows", target_os = "linux"))]
@@ -19,13 +21,18 @@ use gpui_native_theme::ActiveTheme as _;
#[cfg(target_os = "linux")]
use gpui::Decorations;
#[cfg(any(target_os = "windows", target_os = "linux"))]
use gpui::SharedString;
#[cfg(target_os = "windows")]
use gpui::{SharedString, px, rgba};
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")]
use gpui_native_theme::{WINDOWS_CAPTION_WIDTH as CAPTION_WIDTH, WINDOWS_CLOSE_HOVER_HEX};
use gpui_native_theme::{
WINDOWS_CAPTION_WIDTH as CAPTION_WIDTH, WINDOWS_CLOSE_FOREGROUND, WINDOWS_CLOSE_HOVER,
WINDOWS_CLOSE_PRESSED,
};
/// The window controls for the trailing end of a titlebar strip.
#[derive(IntoElement)]
@@ -49,6 +56,7 @@ impl RenderOnce for WindowControls {
#[cfg(target_os = "macos")]
let controls = {
// macOS draws native traffic lights in the shell's reserved pad; nothing to render.
let _ = (id, window, cx);
div()
};
@@ -97,7 +105,6 @@ impl RenderOnce for WindowControls {
#[cfg(target_os = "linux")]
let controls = {
let _ = id;
let controls = window.window_controls();
let client_decorated =
matches!(window.window_decorations(), Decorations::Client { .. });
@@ -111,7 +118,7 @@ impl RenderOnce for WindowControls {
.when(client_decorated && controls.minimize, |row| {
row.child(circle_button(
cx,
"window-minimize",
SharedString::from(format!("{id}-minimize")),
IconRole::WindowMinimize,
window.is_minimizable(),
|window, _cx| window.minimize_window(),
@@ -120,7 +127,7 @@ impl RenderOnce for WindowControls {
.when(client_decorated && controls.maximize, |row| {
row.child(circle_button(
cx,
"window-maximize",
SharedString::from(format!("{id}-maximize")),
if window.is_maximized() {
IconRole::WindowRestore
} else {
@@ -133,7 +140,7 @@ impl RenderOnce for WindowControls {
.when(client_decorated, |row| {
row.child(circle_button(
cx,
"window-close",
SharedString::from(format!("{id}-close")),
IconRole::Close,
true,
|window, _cx| window.remove_window(),
@@ -155,6 +162,7 @@ fn maximize_on_double_click() -> impl Fn(&ClickEvent, &mut Window, &mut App) + '
window.titlebar_double_click();
#[cfg(target_os = "linux")]
window.zoom_window();
// Windows handles titlebar double-click natively via WindowControlArea::Drag.
#[cfg(target_os = "windows")]
{
let _ = (event, window);
@@ -162,9 +170,18 @@ fn maximize_on_double_click() -> impl Fn(&ClickEvent, &mut Window, &mut App) + '
}
}
/// Makes an element a titlebar strip.
pub fn titlebar_strip(this: Stateful<Div>, window: &mut Window, cx: &mut App) -> Stateful<Div> {
let should_move = window.use_state(cx, |_, _| false);
/// Makes an element a titlebar strip; `id` keys its drag state, which
/// `use_state` would otherwise share among every strip in the window.
pub fn titlebar_strip<I>(
this: Stateful<Div>,
id: I,
window: &mut Window,
cx: &mut App,
) -> Stateful<Div>
where
I: Into<ElementId>,
{
let should_move = window.use_keyed_state(id.into(), cx, |_, _| false);
this.window_control_area(WindowControlArea::Drag)
.on_mouse_down_out(window.listener_for(&should_move, |should_move, _, _, _| {
*should_move = false;
@@ -208,7 +225,7 @@ fn caption_button(
let glyph_size = theme.sizes.small.caption_size;
let hover = if close {
rgba(WINDOWS_CLOSE_HOVER_HEX)
WINDOWS_CLOSE_HOVER
} else {
theme.colors.muted_hover
};
@@ -236,7 +253,7 @@ fn caption_button(
.cursor_pointer()
.hover(|hovered| {
hovered.bg(hover).text_color(if close {
gpui::white()
WINDOWS_CLOSE_FOREGROUND
} else {
theme.colors.foreground
})
@@ -244,7 +261,7 @@ fn caption_button(
.active(|pressed| {
pressed
.bg(if close {
hover.opacity(0.8)
WINDOWS_CLOSE_PRESSED
} else {
theme.ramps.secondary.pressed
})
@@ -257,14 +274,9 @@ fn caption_button(
/// Adwaita's headerbar control: a small circle around a symbolic glyph.
#[cfg(target_os = "linux")]
fn circle_button<F>(
cx: &App,
id: &'static str,
role: IconRole,
enabled: bool,
action: F,
) -> AnyElement
fn circle_button<I, F>(cx: &App, id: I, role: IconRole, enabled: bool, action: F) -> AnyElement
where
I: Into<ElementId>,
F: Fn(&mut Window, &mut App) + 'static,
{
let theme = cx.theme();
crates/layout/src/window_frame.rs
+7 -5
View File
@@ -7,13 +7,15 @@ use gpui::{
IntoElement, MouseButton, ParentElement as _, Pixels, Point, ResizeEdge, Size, Styled as _,
Tiling, Window, canvas, div, point, px, size,
};
use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, WINDOW_RESIZE_INSET};
/// How much of the shadow's strength survives losing window focus.
const INACTIVE_SHADOW_OPACITY: f32 = 0.7;
use gpui_native_theme::{
ActiveTheme as _, BORDER_WIDTH, INACTIVE_SHADOW_OPACITY, WINDOW_RESIZE_INSET,
};
/// Wraps a window's root in the frame it owes.
pub fn frame(child: impl IntoElement, window: &mut Window, cx: &App) -> Div {
pub fn frame<E>(child: E, window: &mut Window, cx: &App) -> Div
where
E: IntoElement,
{
let Decorations::Client { tiling } = window.window_decorations() else {
return div().size_full().child(child);
};
crates/layout/tests/dock.rs
+2
View File
@@ -1,3 +1,5 @@
#![cfg(feature = "dock")]
use gpui::{
AppContext as _, Context, Entity, InteractiveElement as _, IntoElement, Modifiers, MouseButton,
MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement as _, Pixels, Render, Styled as _,
crates/layout/tests/resizable.rs
+2
View File
@@ -1,3 +1,5 @@
#![cfg(feature = "resizable")]
use gpui::{
AppContext as _, Context, Entity, IntoElement, Modifiers, MouseButton, MouseDownEvent,
MouseMoveEvent, ParentElement as _, Pixels, Render, Styled as _, Subscription, TestAppContext,
crates/layout/tests/resize_handle.rs
+2
View File
@@ -1,3 +1,5 @@
#![cfg(feature = "resize_handle")]
use std::cell::RefCell;
use std::rc::Rc;
crates/layout/tests/shell.rs
+2
View File
@@ -1,3 +1,5 @@
#![cfg(feature = "shell")]
use gpui::{
Entity, InteractiveElement as _, Modifiers, MouseButton, MouseDownEvent, MouseMoveEvent,
MouseUpEvent, ParentElement as _, Pixels, Render, Styled as _, TestAppContext,
crates/layout/tests/window_controls.rs
+2
View File
@@ -1,6 +1,8 @@
//! The titlebar duties: traffic-light pads and window controls, asserted per
//! platform — macOS draws only pads, Windows/Linux only draw their controls.
#![cfg(feature = "dock")]
use gpui::{
AppContext as _, Entity, IntoElement, ParentElement as _, Pixels, Render, Styled as _,
TestAppContext, VisualTestContext, Window, div, px,
crates/theme/Cargo.toml
+1
View File
@@ -7,6 +7,7 @@ description = "Native theme engine: reads the OS theme and resolves it into sema
[dependencies]
anyhow = "1"
gpui = { workspace = true }
log = "0.4"
serde = { version = "1", features = ["derive"] }
toml = "0.8"
crates/theme/src/definition.rs
+89 -61
View File
@@ -9,37 +9,37 @@ use crate::ThemeVariant;
#[derive(Clone, Debug, Default, PartialEq, Deserialize)]
pub struct ThemeDefinition {
pub mode: Option<ThemeVariant>,
pub control_radius: Option<f32>,
pub overlay_radius: Option<f32>,
pub sm_radius: Option<f32>,
pub accent: Option<String>,
pub accent_foreground: Option<String>,
pub background: Option<String>,
pub foreground: Option<String>,
pub surface: Option<String>,
pub surface_foreground: Option<String>,
pub primary: Option<String>,
pub primary_foreground: Option<String>,
pub secondary: Option<String>,
pub secondary_foreground: Option<String>,
pub muted: Option<String>,
pub muted_hover: Option<String>,
pub muted_foreground: Option<String>,
pub destructive: Option<String>,
pub destructive_foreground: Option<String>,
pub success: Option<String>,
pub success_foreground: Option<String>,
pub warning: Option<String>,
pub warning_foreground: Option<String>,
pub info: Option<String>,
pub info_foreground: Option<String>,
pub border: Option<String>,
pub input: Option<String>,
pub ring: Option<String>,
pub selection: Option<String>,
pub overlay: Option<String>,
pub scrollbar_thumb: Option<String>,
mode: Option<ThemeVariant>,
control_radius: Option<f32>,
overlay_radius: Option<f32>,
sm_radius: Option<f32>,
accent: Option<String>,
accent_foreground: Option<String>,
background: Option<String>,
foreground: Option<String>,
surface: Option<String>,
surface_foreground: Option<String>,
primary: Option<String>,
primary_foreground: Option<String>,
secondary: Option<String>,
secondary_foreground: Option<String>,
muted: Option<String>,
muted_hover: Option<String>,
muted_foreground: Option<String>,
destructive: Option<String>,
destructive_foreground: Option<String>,
success: Option<String>,
success_foreground: Option<String>,
warning: Option<String>,
warning_foreground: Option<String>,
info: Option<String>,
info_foreground: Option<String>,
border: Option<String>,
input: Option<String>,
ring: Option<String>,
selection: Option<String>,
overlay: Option<String>,
scrollbar_thumb: Option<String>,
}
impl ThemeDefinition {
@@ -47,112 +47,140 @@ impl ThemeDefinition {
Ok(toml::from_str(source)?)
}
pub fn mode(&self) -> Option<ThemeVariant> {
self.mode
}
pub fn control_radius(&self) -> Option<f32> {
self.control_radius
}
pub fn overlay_radius(&self) -> Option<f32> {
self.overlay_radius
}
pub fn sm_radius(&self) -> Option<f32> {
self.sm_radius
}
pub fn accent(&self) -> Option<Hsla> {
parse_hex(self.accent.as_deref()?)
self.color(&self.accent, "accent")
}
pub fn accent_foreground(&self) -> Option<Hsla> {
parse_hex(self.accent_foreground.as_deref()?)
self.color(&self.accent_foreground, "accent_foreground")
}
pub fn background(&self) -> Option<Hsla> {
parse_hex(self.background.as_deref()?)
self.color(&self.background, "background")
}
pub fn foreground(&self) -> Option<Hsla> {
parse_hex(self.foreground.as_deref()?)
self.color(&self.foreground, "foreground")
}
pub fn surface(&self) -> Option<Hsla> {
parse_hex(self.surface.as_deref()?)
self.color(&self.surface, "surface")
}
pub fn surface_foreground(&self) -> Option<Hsla> {
parse_hex(self.surface_foreground.as_deref()?)
self.color(&self.surface_foreground, "surface_foreground")
}
pub fn primary(&self) -> Option<Hsla> {
parse_hex(self.primary.as_deref()?)
self.color(&self.primary, "primary")
}
pub fn primary_foreground(&self) -> Option<Hsla> {
parse_hex(self.primary_foreground.as_deref()?)
self.color(&self.primary_foreground, "primary_foreground")
}
pub fn secondary(&self) -> Option<Hsla> {
parse_hex(self.secondary.as_deref()?)
self.color(&self.secondary, "secondary")
}
pub fn secondary_foreground(&self) -> Option<Hsla> {
parse_hex(self.secondary_foreground.as_deref()?)
self.color(&self.secondary_foreground, "secondary_foreground")
}
pub fn muted(&self) -> Option<Hsla> {
parse_hex(self.muted.as_deref()?)
self.color(&self.muted, "muted")
}
pub fn muted_hover(&self) -> Option<Hsla> {
parse_hex(self.muted_hover.as_deref()?)
self.color(&self.muted_hover, "muted_hover")
}
pub fn muted_foreground(&self) -> Option<Hsla> {
parse_hex(self.muted_foreground.as_deref()?)
self.color(&self.muted_foreground, "muted_foreground")
}
pub fn destructive(&self) -> Option<Hsla> {
parse_hex(self.destructive.as_deref()?)
self.color(&self.destructive, "destructive")
}
pub fn destructive_foreground(&self) -> Option<Hsla> {
parse_hex(self.destructive_foreground.as_deref()?)
self.color(&self.destructive_foreground, "destructive_foreground")
}
pub fn success(&self) -> Option<Hsla> {
parse_hex(self.success.as_deref()?)
self.color(&self.success, "success")
}
pub fn success_foreground(&self) -> Option<Hsla> {
parse_hex(self.success_foreground.as_deref()?)
self.color(&self.success_foreground, "success_foreground")
}
pub fn warning(&self) -> Option<Hsla> {
parse_hex(self.warning.as_deref()?)
self.color(&self.warning, "warning")
}
pub fn warning_foreground(&self) -> Option<Hsla> {
parse_hex(self.warning_foreground.as_deref()?)
self.color(&self.warning_foreground, "warning_foreground")
}
pub fn info(&self) -> Option<Hsla> {
parse_hex(self.info.as_deref()?)
self.color(&self.info, "info")
}
pub fn info_foreground(&self) -> Option<Hsla> {
parse_hex(self.info_foreground.as_deref()?)
self.color(&self.info_foreground, "info_foreground")
}
pub fn border(&self) -> Option<Hsla> {
parse_hex(self.border.as_deref()?)
self.color(&self.border, "border")
}
pub fn input(&self) -> Option<Hsla> {
parse_hex(self.input.as_deref()?)
self.color(&self.input, "input")
}
pub fn ring(&self) -> Option<Hsla> {
parse_hex(self.ring.as_deref()?)
self.color(&self.ring, "ring")
}
pub fn selection(&self) -> Option<Hsla> {
parse_hex(self.selection.as_deref()?)
self.color(&self.selection, "selection")
}
pub fn overlay(&self) -> Option<Hsla> {
parse_hex(self.overlay.as_deref()?)
self.color(&self.overlay, "overlay")
}
pub fn scrollbar_thumb(&self) -> Option<Hsla> {
parse_hex(self.scrollbar_thumb.as_deref()?)
self.color(&self.scrollbar_thumb, "scrollbar_thumb")
}
/// Parses a color field, warning when a stated value is malformed.
fn color(&self, field: &Option<String>, role: &str) -> Option<Hsla> {
let value = field.as_deref()?;
match parse_hex(value) {
Some(color) => Some(color),
None => {
log::warn!("theme definition {role} is not #rgb/#rrggbb: {value:?}");
None
}
}
}
}
@@ -226,12 +254,12 @@ mod tests {
"mode = \"dark\"\naccent = \"#7aa2f7\"\nbackground = \"#1a1b26\"\ninfo = \"#38bdf8\"\noverlay_radius = 15.0\nsm_radius = 6.0\n",
)
.unwrap();
assert_eq!(def.mode, Some(crate::ThemeVariant::Dark));
assert_eq!(def.mode(), Some(crate::ThemeVariant::Dark));
assert!(def.accent().is_some());
assert!(def.info().is_some());
assert!(def.foreground().is_none());
assert_eq!(def.overlay_radius, Some(15.0));
assert_eq!(def.sm_radius, Some(6.0));
assert_eq!(def.overlay_radius(), Some(15.0));
assert_eq!(def.sm_radius(), Some(6.0));
}
#[test]
crates/theme/src/lib.rs
+116 -40
View File
@@ -20,7 +20,9 @@ pub use ramps::{AccentShades, Oklch};
pub use resolve::{Ramps, ResolvedTheme};
pub use system::{AccessibilityPreferences, PartialPalette, SourceKind, SystemTheme};
use gpui::{App, Global, Hsla, Pixels, WindowAppearance, WindowBackgroundAppearance, px};
use gpui::{
App, Global, Hsla, Pixels, SpringConfig, WindowAppearance, WindowBackgroundAppearance, hsla, px,
};
use std::time::Duration;
/// The hairline width of the control border every button and field paints.
@@ -46,7 +48,51 @@ pub const TRAFFIC_LIGHT_PAD: Pixels = px(78.0);
/// The width of a Windows caption button.
pub const WINDOWS_CAPTION_WIDTH: Pixels = px(36.0);
/// Windows paints its caption close-button hover red in every theme.
pub const WINDOWS_CLOSE_HOVER_HEX: u32 = 0xE81120FF;
pub const WINDOWS_CLOSE_HOVER: Hsla = hsla(0.986043, 0.863406, 0.488235, 1.0);
/// The close-button hover dimmed while pressed.
pub const WINDOWS_CLOSE_PRESSED: Hsla = hsla(0.986043, 0.863406, 0.488235, 0.8);
/// The close glyph's color over the red hover.
pub const WINDOWS_CLOSE_FOREGROUND: Hsla = gpui::white();
/// The width a sidebar opens at.
pub const SIDEBAR_DEFAULT_WIDTH: Pixels = px(240.0);
/// The narrowest a sidebar may be dragged.
pub const SIDEBAR_MIN_WIDTH: Pixels = px(160.0);
/// The widest a sidebar may be dragged.
pub const SIDEBAR_MAX_WIDTH: Pixels = px(480.0);
/// The size a pane starts at before its group has measured the extent.
pub const PANE_DEFAULT_SIZE: Pixels = px(200.0);
/// The floor a pane keeps while dragging unless the caller lowers it.
pub const PANE_MIN_SIZE: Pixels = px(48.0);
/// The hairline a resize seam paints on a shared boundary.
pub const HAIRLINE_WIDTH: Pixels = px(0.5);
/// How much of the window shadow's strength survives losing focus.
pub const INACTIVE_SHADOW_OPACITY: f32 = 0.7;
/// The spread of the keyboard focus ring.
pub const FOCUS_RING_SPREAD: Pixels = px(3.0);
/// How far a pushed alert slides in on entry.
pub const ENTER_SLIDE_DISTANCE: Pixels = px(24.0);
/// The widest a toast may grow.
pub const TOAST_MAX_WIDTH: Pixels = px(480.0);
/// One revolution of the spinner.
pub const SPINNER_PERIOD: Duration = Duration::from_millis(800);
/// One sweep of the indeterminate progress bar.
pub const PROGRESS_ANIMATION_PERIOD: Duration = Duration::from_millis(1500);
/// How long an autohide scrollbar thumb stays fully visible before fading.
pub const SCROLLBAR_AUTOHIDE_DELAY: Duration = Duration::from_millis(700);
/// How long the autohide scrollbar's fade runs.
pub const SCROLLBAR_FADE_DURATION: Duration = Duration::from_millis(250);
/// How much a change wash tints the rows it covers.
pub const WASH_ALPHA: f32 = 0.14;
/// The stronger wash under number gutters and intra-line word changes.
pub const WASH_ALPHA_STRONG: f32 = 0.34;
/// The subtle wash that sets the number gutter off from the code.
pub const WASH_ALPHA_GUTTER: f32 = 0.18;
/// The soft wash that marks the active code row.
pub const WASH_ALPHA_SOFT: f32 = 0.45;
/// How far a scrolling list renders past its viewport.
pub const CODE_OVERSCROLL_MAX: Pixels = px(400.0);
/// The spring every control's toggle and segment animations ride.
pub const CONTROL_SPRING: SpringConfig = SpringConfig::new(500., 35., 1.);
/// The monospace advance estimate as a share of the text size.
pub const MONO_ADVANCE_RATIO: f32 = 0.62;
/// How much a pixel avatar's tint washes over its background.
@@ -73,6 +119,15 @@ impl ThemeVariant {
WindowAppearance::Dark | WindowAppearance::VibrantDark => Self::Dark,
}
}
/// Classifies a surface by its lightness, for platforms that state no mode.
pub fn by_lightness(background: Hsla) -> Self {
if background.l >= 0.5 {
Self::Light
} else {
Self::Dark
}
}
}
/// The resolved theme, installed as the app-wide global.
@@ -587,21 +642,23 @@ impl Theme {
reapply(cx);
}
/// Re-resolves when a window's appearance differs from the resolved variant.
/// Re-resolves when no override is set and a window's appearance differs
/// from the resolved variant; an override pins the variant instead.
///
/// Wire to `Window::observe_window_appearance`.
pub fn sync_from_window(window: &mut gpui::Window, cx: &mut App) {
let variant = ThemeVariant::from_appearance(window.appearance());
if cx.global::<Theme>().variant != variant
|| cx.global::<ThemeEngine>().mode_override.is_none()
{
let window_variant = ThemeVariant::from_appearance(window.appearance());
let theme = cx.global::<Theme>();
let engine = cx.global::<ThemeEngine>();
if engine.mode_override.is_none() && theme.variant != window_variant {
reapply(cx);
}
}
/// Sizes the window's rem to the theme's root font size.
pub fn sync_window_rem_size(window: &mut gpui::Window, cx: &App) {
window.set_rem_size(cx.global::<Theme>().root_font_size);
let theme = cx.global::<Theme>();
window.set_rem_size(theme.root_font_size);
}
}
@@ -617,20 +674,17 @@ impl Global for ThemeEngine {}
/// Reads the system, resolves through the current knobs,
/// installs the theme global, and repaints every window.
pub(crate) fn reapply(cx: &mut App) {
let (system_appearance, preset, mode_override) = {
let (preset, mode_override, system) = {
let engine = cx.global::<ThemeEngine>();
(
ThemeVariant::from_appearance(cx.window_appearance()),
engine.preset.as_ref().map(|(_, def)| def.clone()),
engine.mode_override,
)
let system_appearance = ThemeVariant::from_appearance(cx.window_appearance());
let preset = engine.preset.as_ref().map(|(_, def)| def.clone());
let mode_override = engine.mode_override;
let variant = mode_override
.or(preset.as_ref().and_then(|def| def.mode()))
.unwrap_or(system_appearance);
(preset, mode_override, engine.source.snapshot(variant))
};
let variant = mode_override
.or(preset.as_ref().and_then(|def| def.mode))
.unwrap_or(system_appearance);
let system = cx.global::<ThemeEngine>().source.snapshot(variant);
let resolved = resolve::resolve(&system, preset.as_ref(), mode_override);
cx.set_reduce_motion(resolved.accessibility.reduce_motion);
@@ -640,41 +694,39 @@ pub(crate) fn reapply(cx: &mut App) {
/// Forces a variant, independent of the OS. `None` follows the system.
pub fn set_mode_override(variant: Option<ThemeVariant>, cx: &mut App) {
cx.global_mut::<ThemeEngine>().mode_override = variant;
let engine = cx.global_mut::<ThemeEngine>();
engine.mode_override = variant;
reapply(cx);
}
/// Installs a built-in preset, or `None` to follow the system again.
pub fn set_preset(name: Option<&str>, cx: &mut App) -> anyhow::Result<()> {
let preset = match name {
Some(name) => {
let def =
presets::builtin(name).ok_or_else(|| anyhow::anyhow!("unknown preset: {name}"))?;
let static_name = presets::preset_names()
.iter()
.copied()
.find(|candidate| *candidate == name)
.ok_or_else(|| anyhow::anyhow!("unknown preset: {name}"))?;
Some((static_name, def))
}
None => None,
};
cx.global_mut::<ThemeEngine>().preset = preset;
let preset = name
.map(|name| {
presets::builtin(name).ok_or_else(|| {
anyhow::anyhow!(
"unknown preset: {name}; available: {}",
presets::preset_names().collect::<Vec<_>>().join(", ")
)
})
})
.transpose()?;
let engine = cx.global_mut::<ThemeEngine>();
engine.preset = preset;
reapply(cx);
Ok(())
}
/// The variant the mode override forces, if any.
pub fn mode_override(cx: &App) -> Option<ThemeVariant> {
cx.global::<ThemeEngine>().mode_override
let engine = cx.global::<ThemeEngine>();
engine.mode_override
}
/// The active preset name, if one is installed.
pub fn active_preset(cx: &App) -> Option<&'static str> {
cx.global::<ThemeEngine>()
.preset
.as_ref()
.map(|(name, _)| *name)
let engine = cx.global::<ThemeEngine>();
engine.preset.as_ref().map(|(name, _)| *name)
}
/// Clears the mode override and preset; the theme follows the system again.
@@ -687,5 +739,29 @@ pub fn follow_system(cx: &mut App) {
/// Which adapter produced the current system snapshot.
pub fn detected_source(cx: &App) -> &'static str {
cx.global::<ThemeEngine>().source.label()
let engine = cx.global::<ThemeEngine>();
engine.source.label()
}
#[cfg(test)]
mod tests {
use super::*;
use gpui::Rgba;
#[test]
fn the_windows_close_colors_match_the_legacy_hex() {
let hover = Hsla::from(gpui::rgba(0xE81123FF));
let pressed = hover.opacity(0.8);
for (token, expected) in [
(WINDOWS_CLOSE_HOVER, hover),
(WINDOWS_CLOSE_PRESSED, pressed),
] {
let (token, expected) = (Rgba::from(token), Rgba::from(expected));
assert!((token.r - expected.r).abs() < 1e-4);
assert!((token.g - expected.g).abs() < 1e-4);
assert!((token.b - expected.b).abs() < 1e-4);
assert!((token.a - expected.a).abs() < 1e-4);
}
assert_eq!(WINDOWS_CLOSE_FOREGROUND, gpui::white());
}
}
crates/theme/src/presets.rs
+29 -12
View File
@@ -2,22 +2,39 @@
use crate::definition::ThemeDefinition;
const TOKYO_NIGHT: &str = include_str!("../presets/tokyo-night.toml");
/// The bundled presets: `(name, TOML source)`. Enumeration and lookup both
/// read this one table.
const PRESETS: &[(&str, &str)] = &[("tokyo-night", include_str!("../presets/tokyo-night.toml"))];
pub fn preset_names() -> &'static [&'static str] {
&["tokyo-night"]
/// Every bundled preset's name.
pub fn preset_names() -> impl Iterator<Item = &'static str> {
PRESETS.iter().map(|(name, _)| *name)
}
/// Parses the named preset.
pub fn builtin(name: &str) -> Option<ThemeDefinition> {
match name {
"tokyo-night" => match ThemeDefinition::parse_toml(TOKYO_NIGHT) {
Ok(def) => Some(def),
Err(err) => {
eprintln!("bundled preset tokyo-night failed to parse: {err}");
/// Parses the named preset, returning its static name and definition.
pub fn builtin(name: &str) -> Option<(&'static str, ThemeDefinition)> {
let (name, source) = PRESETS
.iter()
.find(|(candidate, _)| *candidate == name)
.copied()?;
match ThemeDefinition::parse_toml(source) {
Ok(definition) => Some((name, definition)),
Err(error) => {
log::error!("bundled preset {name} failed to parse: {error}");
None
}
},
_ => None,
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn the_name_table_and_lookup_agree() {
for name in preset_names() {
assert!(builtin(name).is_some(), "{name} fails to parse");
}
assert!(builtin("no-such-preset").is_none());
}
}
crates/theme/src/ramps.rs
+1
View File
@@ -165,6 +165,7 @@ pub struct AccentShades {
/// Derives hover/pressed/subtle shades for an accent against its background.
///
/// Where a platform states ramps (WinUI, KDE) those are used instead,
/// every other platform derives its shades here.
pub fn derive_shades(accent: Hsla, background: Hsla, is_dark: bool) -> AccentShades {
let accent_ok = Oklch::from_hsla(accent);
let step = if is_dark { 0.05 } else { -0.05 };
crates/theme/src/resolve.rs
+4 -4
View File
@@ -55,7 +55,7 @@ pub(crate) fn resolve(
mode_override: Option<ThemeVariant>,
) -> ResolvedTheme {
let variant = mode_override
.or(preset.and_then(|def| def.mode))
.or(preset.and_then(|def| def.mode()))
.unwrap_or(system.variant);
let base = match variant {
@@ -246,7 +246,7 @@ pub(crate) fn resolve(
let mut radius = Radius::default();
if let Some(control) = preset
.and_then(|def| def.control_radius)
.and_then(|def| def.control_radius())
.map(px)
.or(system.control_radius)
{
@@ -254,7 +254,7 @@ pub(crate) fn resolve(
}
if let Some(overlay) = preset
.and_then(|def| def.overlay_radius)
.and_then(|def| def.overlay_radius())
.map(px)
.or(system.overlay_radius)
{
@@ -262,7 +262,7 @@ pub(crate) fn resolve(
}
if let Some(sm) = preset
.and_then(|def| def.sm_radius)
.and_then(|def| def.sm_radius())
.map(px)
.or(system.sm_radius)
{
crates/theme/src/source.rs
+10
View File
@@ -12,6 +12,16 @@ pub(crate) trait ThemeSource: 'static {
fn label(&self) -> &'static str;
}
/// Narrows an f64 color component to f32, clamping to the 0..=1 range and
/// mapping non-finite values to 0.0 rather than truncating garbage silently.
pub(crate) fn narrow_component(value: f64) -> f32 {
if value.is_finite() {
value.clamp(0.0, 1.0) as f32
} else {
0.0
}
}
#[cfg(target_os = "macos")]
pub(crate) fn platform_source() -> Box<dyn ThemeSource> {
Box::new(macos::MacosSource::default())
crates/theme/src/source/kde.rs
+15 -21
View File
@@ -77,7 +77,7 @@ impl KdeScheme {
//
// Older setups fall back to the scheme's background lightness.
variant: portal_variant
.or(self.background.map(variant_by_lightness))
.or(self.background.map(crate::ThemeVariant::by_lightness))
.unwrap_or(crate::ThemeVariant::Light),
accent: self.accent.or(portal_accent),
palette: self.palette,
@@ -99,14 +99,6 @@ impl KdeScheme {
}
}
fn variant_by_lightness(background: Hsla) -> crate::ThemeVariant {
if background.l >= 0.5 {
crate::ThemeVariant::Light
} else {
crate::ThemeVariant::Dark
}
}
/// The root font size of a `[General]` group's `font=` QFont string.
fn root_font_size(group: Option<&HashMap<&str, &str>>) -> Option<Pixels> {
let fields: Vec<&str> = group?.get("font")?.split(',').map(str::trim).collect();
@@ -158,7 +150,10 @@ fn color_list(value: &str) -> Option<Hsla> {
let green = components.next()?.parse::<f32>().ok()?;
let blue = components.next()?.parse::<f32>().ok()?;
let alpha = components.next().and_then(|a| a.parse::<f32>().ok());
if red < 0.0 || green < 0.0 || blue < 0.0 {
if !(0.0..=255.0).contains(&red)
|| !(0.0..=255.0).contains(&green)
|| !(0.0..=255.0).contains(&blue)
{
return None;
}
let scale = |component: f32| component / 255.0;
@@ -335,19 +330,18 @@ activeBackground=39,44,49
}
#[test]
fn the_scheme_states_breeze_metrics_and_the_default_font() {
fn the_default_font_applies_without_a_stated_font() {
let system = KdeScheme::parse(BREEZE_DARK).into_system(Default::default(), None, None);
assert!((system.root_font_size.expect("default font") - px(13.33)).abs() < px(0.01));
}
assert_eq!(system.control_height, Some(px(33.)));
assert_eq!(system.input_height, Some(px(29.)));
assert_eq!(system.menu_item_height, Some(px(29.)));
assert_eq!(system.control_radius, Some(px(5.)));
assert_eq!(system.overlay_radius, Some(px(5.)));
assert_eq!(system.switch_height, Some(px(18.)));
assert_eq!(system.switch_width, Some(px(36.)));
assert_eq!(system.switch_knob, Some(px(18.)));
assert_eq!(system.titlebar_height, Some(px(44.)));
assert!((system.root_font_size.unwrap() - px(13.33)).abs() < px(0.01));
#[test]
fn color_components_outside_0_to_255_are_rejected() {
let above = KdeScheme::parse("[Colors:Window]\nBackgroundNormal=300,20,20\n");
assert!(above.palette.background.is_none());
let below = KdeScheme::parse("[Colors:Window]\nBackgroundNormal=-5,20,20\n");
assert!(below.palette.background.is_none());
}
#[test]
crates/theme/src/source/linux.rs
+47 -35
View File
@@ -13,9 +13,30 @@ use super::kde;
use super::omarchy;
use super::portal;
use super::signal::ReapplySignal;
use crate::ThemeVariant;
use crate::system::{PartialPalette, SourceKind, SystemTheme};
/// libadwaita's control corner radius, in px at 100% scaling.
const CONTROL_RADIUS_PX: f32 = 9.0;
/// libadwaita's popover corner radius.
const OVERLAY_RADIUS_PX: f32 = 15.0;
/// The checkbox indicator's corner radius.
const SM_RADIUS_PX: f32 = 6.0;
/// libadwaita's standard control and text-field height.
const CONTROL_HEIGHT_PX: f32 = 34.0;
/// The GTK menu row height.
const MENU_ITEM_HEIGHT_PX: f32 = 32.0;
/// The GTK switch: a 46x26 track with a 20px knob.
const SWITCH_HEIGHT_PX: f32 = 26.0;
const SWITCH_WIDTH_PX: f32 = 46.0;
const SWITCH_KNOB_PX: f32 = 20.0;
/// GNOME's headerbar height, in px at 100% scaling.
const TITLEBAR_HEIGHT_PX: f32 = 47.0;
/// The default 11pt interface font, in px.
const ROOT_FONT_SIZE_PX: f32 = 14.67;
pub(crate) struct LinuxSource {
backend: Backend,
portal: Option<portal::io::PortalClient>,
@@ -154,20 +175,20 @@ impl LinuxSource {
variant,
accent,
palette: PartialPalette::default(),
control_radius: Some(gpui::px(9.)),
overlay_radius: Some(gpui::px(15.)),
sm_radius: Some(gpui::px(6.)),
control_height: Some(gpui::px(34.)),
input_height: Some(gpui::px(34.)),
menu_item_height: Some(gpui::px(32.)),
switch_height: Some(gpui::px(26.)),
switch_width: Some(gpui::px(46.)),
switch_knob: Some(gpui::px(20.)),
titlebar_height: Some(gpui::px(47.)),
control_radius: Some(gpui::px(CONTROL_RADIUS_PX)),
overlay_radius: Some(gpui::px(OVERLAY_RADIUS_PX)),
sm_radius: Some(gpui::px(SM_RADIUS_PX)),
control_height: Some(gpui::px(CONTROL_HEIGHT_PX)),
input_height: Some(gpui::px(CONTROL_HEIGHT_PX)),
menu_item_height: Some(gpui::px(MENU_ITEM_HEIGHT_PX)),
switch_height: Some(gpui::px(SWITCH_HEIGHT_PX)),
switch_width: Some(gpui::px(SWITCH_WIDTH_PX)),
switch_knob: Some(gpui::px(SWITCH_KNOB_PX)),
titlebar_height: Some(gpui::px(TITLEBAR_HEIGHT_PX)),
root_font_size: Some(
self.gsettings
.and_then(|gsettings| gsettings.root_font_size)
.unwrap_or(gpui::px(14.67)),
.unwrap_or(gpui::px(ROOT_FONT_SIZE_PX)),
),
accessibility,
window_background: None,
@@ -237,41 +258,44 @@ impl ThemeSource for LinuxSource {
fn install_watchers(&mut self, async_cx: gpui::AsyncApp) {
let signal = ReapplySignal::install(&async_cx);
let file_signal = signal.sender();
if let Some(portal) = &self.portal {
portal.spawn_watch(signal.sender());
}
// Stored before any fallible step: an early return below
// must not drop and cancel the reapply loop.
self._signal = Some(signal);
match self.backend {
Backend::Omarchy => {
let Some(current) = omarchy::io::current_dir() else {
return;
};
let reapply_signal = signal.sender();
let watcher = notify::recommended_watcher(
move |event: std::result::Result<notify::Event, notify::Error>| match event {
Ok(_) => ReapplySignal::poke(&reapply_signal),
Err(error) => eprintln!("theme: omarchy watch error: {error}"),
Ok(_) => ReapplySignal::poke(&file_signal),
Err(error) => log::warn!("theme: omarchy watch error: {error}"),
},
);
match watcher {
Ok(mut watcher) => {
if let Err(error) = watcher.watch(&current, RecursiveMode::NonRecursive) {
eprintln!("theme: omarchy watch failed: {error}");
log::warn!("theme: omarchy watch failed: {error}");
return;
}
self.file_watcher = Some(watcher);
}
Err(error) => eprintln!("theme: omarchy watcher unavailable: {error}"),
Err(error) => log::warn!("theme: omarchy watcher unavailable: {error}"),
}
}
Backend::Kde => {
let Some(config) = home_dir().map(|home| home.join(".config")) else {
return;
};
let reapply_signal = signal.sender();
let watcher = notify::recommended_watcher(
move |event: std::result::Result<notify::Event, notify::Error>| match event {
@@ -279,27 +303,25 @@ impl ThemeSource for LinuxSource {
if event.paths.iter().any(|path| {
path.file_name().is_some_and(|name| name == "kdeglobals")
}) {
ReapplySignal::poke(&reapply_signal);
ReapplySignal::poke(&file_signal);
}
}
Err(error) => eprintln!("theme: kde watch error: {error}"),
Err(error) => log::warn!("theme: kde watch error: {error}"),
},
);
match watcher {
Ok(mut watcher) => {
if let Err(error) = watcher.watch(&config, RecursiveMode::NonRecursive) {
eprintln!("theme: kde watch failed: {error}");
log::warn!("theme: kde watch failed: {error}");
return;
}
self.file_watcher = Some(watcher);
}
Err(error) => eprintln!("theme: kde watcher unavailable: {error}"),
Err(error) => log::warn!("theme: kde watcher unavailable: {error}"),
}
}
Backend::Portal | Backend::Fallback => {}
}
self._signal = Some(signal);
}
fn label(&self) -> &'static str {
@@ -354,7 +376,7 @@ mod tests {
}
#[test]
fn the_gnome_snapshot_states_the_libadwaita_metrics() {
fn the_gnome_snapshot_labels_gnome_and_defaults_the_root_font() {
let source = LinuxSource {
backend: Backend::Portal,
portal: None,
@@ -369,17 +391,7 @@ mod tests {
);
assert_eq!(system.source, SourceKind::Gnome);
assert_eq!(system.control_height, Some(gpui::px(34.)));
assert_eq!(system.input_height, Some(gpui::px(34.)));
assert_eq!(system.menu_item_height, Some(gpui::px(32.)));
assert_eq!(system.control_radius, Some(gpui::px(9.)));
assert_eq!(system.overlay_radius, Some(gpui::px(15.)));
assert_eq!(system.sm_radius, Some(gpui::px(6.)));
assert_eq!(system.switch_height, Some(gpui::px(26.)));
assert_eq!(system.switch_width, Some(gpui::px(46.)));
assert_eq!(system.switch_knob, Some(gpui::px(20.)));
assert_eq!(system.titlebar_height, Some(gpui::px(47.)));
// The default 11pt font when gsettings states none.
assert_eq!(system.root_font_size, Some(gpui::px(14.67)));
assert_eq!(system.root_font_size, Some(gpui::px(ROOT_FONT_SIZE_PX)));
}
}
crates/theme/src/source/macos.rs
+6 -4
View File
@@ -14,6 +14,8 @@ use objc2_foundation::{
};
use std::ptr::NonNull;
use super::narrow_component;
use super::ThemeSource;
use crate::ThemeVariant;
use crate::system::{AccessibilityPreferences, PartialPalette, SourceKind, SystemTheme};
@@ -46,10 +48,10 @@ impl MacosSource {
let converted = color.colorUsingColorSpace(&srgb)?;
Some(gpui::Hsla::from(gpui::Rgba {
r: converted.redComponent() as f32,
g: converted.greenComponent() as f32,
b: converted.blueComponent() as f32,
a: converted.alphaComponent() as f32,
r: narrow_component(converted.redComponent()),
g: narrow_component(converted.greenComponent()),
b: narrow_component(converted.blueComponent()),
a: narrow_component(converted.alphaComponent()),
}))
}
crates/theme/src/source/omarchy.rs
+2 -18
View File
@@ -27,7 +27,7 @@ impl OmarchyTheme {
.get("mode")
.and_then(toml::Value::as_str)
.and_then(mode_variant)
.unwrap_or_else(|| variant_by_lightness(background));
.unwrap_or_else(|| ThemeVariant::by_lightness(background));
let accent = hex_color(&table, "accent").or_else(|| hex_color(&table, "color4"));
let selection = hex_color(&table, "selection");
@@ -86,14 +86,6 @@ fn mode_variant(mode: &str) -> Option<ThemeVariant> {
}
}
fn variant_by_lightness(background: Hsla) -> ThemeVariant {
if background.l >= 0.5 {
ThemeVariant::Light
} else {
ThemeVariant::Dark
}
}
fn hex_color(table: &Table, key: &str) -> Option<Hsla> {
let value = table.get(key)?.as_str()?;
let digits = value.trim().strip_prefix('#')?;
@@ -224,18 +216,10 @@ color15 = \"#635d6f\"
}
#[test]
fn omarchy_shares_the_gnome_control_metrics() {
fn omarchy_states_no_titlebar_or_root_font() {
let theme = OmarchyTheme::parse(TOKYO_NIGHT).expect("parses");
let system = theme.into_system(Default::default());
assert_eq!(system.control_height, Some(gpui::px(34.)));
assert_eq!(system.input_height, Some(gpui::px(34.)));
assert_eq!(system.menu_item_height, Some(gpui::px(32.)));
assert_eq!(system.control_radius, Some(gpui::px(9.)));
assert_eq!(system.overlay_radius, Some(gpui::px(15.)));
assert_eq!(system.switch_height, Some(gpui::px(26.)));
assert_eq!(system.switch_width, Some(gpui::px(46.)));
assert_eq!(system.switch_knob, Some(gpui::px(20.)));
assert_eq!(system.titlebar_height, None);
assert_eq!(system.root_font_size, None);
}
crates/theme/src/source/portal.rs
+16 -9
View File
@@ -5,6 +5,8 @@
use gpui::Hsla;
use super::narrow_component;
use crate::{ThemeVariant, system::AccessibilityPreferences};
/// The raw portal values, already converted off the DBus wire types.
@@ -26,9 +28,9 @@ impl AppearanceValues {
color_scheme: self.color_scheme,
accent: self.accent_rgb.map(|(r, g, b)| {
Hsla::from(gpui::Rgba {
r: r as f32,
g: g as f32,
b: b as f32,
r: narrow_component(r),
g: narrow_component(g),
b: narrow_component(b),
a: 1.0,
})
}),
@@ -98,7 +100,9 @@ pub(crate) mod io {
/// The most recently read appearance.
pub(crate) fn appearance(&self) -> Appearance {
*self.appearance.lock().expect("portal cache poisoned")
// A watch-thread panic must not crash the UI thread.
let cache = self.appearance.lock();
*cache.unwrap_or_else(std::sync::PoisonError::into_inner)
}
/// Forwards portal `SettingChanged` events to the reapply signal from a dedicated thread.
@@ -107,17 +111,17 @@ pub(crate) mod io {
std::thread::spawn(move || {
let Some(connection) = Connection::session().ok() else {
eprintln!("theme: portal watch skipped, no session bus");
log::warn!("theme: portal watch skipped, no session bus");
return;
};
let Some(proxy) = settings_proxy(connection) else {
eprintln!("theme: portal watch skipped, settings proxy unavailable");
log::warn!("theme: portal watch skipped, settings proxy unavailable");
return;
};
let Ok(signals) = proxy.receive_signal("SettingChanged") else {
eprintln!("theme: portal watch skipped, signal subscription failed");
log::warn!("theme: portal watch skipped, signal subscription failed");
return;
};
@@ -134,10 +138,13 @@ pub(crate) mod io {
match read_appearance(&proxy) {
Some(latest) => {
*appearance.lock().expect("portal cache poisoned") = latest;
let mut cache = appearance
.lock()
.unwrap_or_else(std::sync::PoisonError::into_inner);
*cache = latest;
super::super::signal::ReapplySignal::poke(&reapply_signal);
}
None => eprintln!("theme: portal read failed on SettingChanged"),
None => log::warn!("theme: portal read failed on SettingChanged"),
}
}
});
crates/theme/src/source/signal.rs
+1 -1
View File
@@ -32,7 +32,7 @@ impl ReapplySignal {
/// Pokes the pipeline from a thread holding a [`Self::sender`] clone.
pub(crate) fn poke(sender: &async_channel::Sender<()>) {
if let Err(error) = sender.try_send(()) {
eprintln!("theme: reapply signal failed: {error}");
log::warn!("theme: reapply signal failed: {error}");
}
}
}
crates/theme/src/source/windows.rs
+10 -13
View File
@@ -74,16 +74,19 @@ pub(crate) struct WindowsSource {
}
pub(crate) fn platform_source() -> Box<dyn ThemeSource> {
// SAFETY: WinRT activation requires COM on this thread; the STA matches
// the UI thread's message pump, and RPC_E_CHANGED_MODE means COM is
// already initialized in another apartment.
let initialized = unsafe { CoInitializeEx(None, COINIT_APARTMENTTHREADED) };
if initialized.is_err() && initialized != RPC_E_CHANGED_MODE {
eprintln!("theme: COM initialization failed: {initialized:?}");
log::error!("theme: COM initialization failed: {initialized:?}");
}
match WindowsSource::new() {
Some(source) => Box::new(source),
None => {
eprintln!("theme: Windows system theme unavailable; using fallback");
log::warn!("theme: Windows system theme unavailable; using fallback");
Box::new(super::fallback::FallbackSource)
}
}
@@ -94,7 +97,7 @@ impl WindowsSource {
let ui_settings = match UISettings::new() {
Ok(ui_settings) => ui_settings,
Err(error) => {
eprintln!("theme: UISettings unavailable: {error}");
log::warn!("theme: UISettings unavailable: {error}");
return None;
}
};
@@ -102,7 +105,7 @@ impl WindowsSource {
let accessibility_settings = match AccessibilitySettings::new() {
Ok(accessibility_settings) => accessibility_settings,
Err(error) => {
eprintln!("theme: AccessibilitySettings unavailable: {error}");
log::warn!("theme: AccessibilitySettings unavailable: {error}");
return None;
}
};
@@ -157,13 +160,7 @@ impl ThemeSource for WindowsSource {
let foreground = self.color(UIColorType::Foreground);
let variant = background
.map(|background| {
if background.l >= 0.5 {
ThemeVariant::Light
} else {
ThemeVariant::Dark
}
})
.map(ThemeVariant::by_lightness)
.or(self.registry.apps_use_light_theme.map(|light| {
if light {
ThemeVariant::Light
@@ -212,7 +209,7 @@ impl ThemeSource for WindowsSource {
});
if let Err(error) = self.ui_settings.ColorValuesChanged(&color_handler) {
eprintln!("theme: color change watch failed: {error}");
log::warn!("theme: color change watch failed: {error}");
}
let contrast_signal = signal.sender();
@@ -226,7 +223,7 @@ impl ThemeSource for WindowsSource {
.accessibility_settings
.HighContrastChanged(&contrast_handler)
{
eprintln!("theme: high contrast watch failed: {error}");
log::warn!("theme: high contrast watch failed: {error}");
}
self._signal = Some(signal);
crates/utils/Cargo.toml
+1
View File
@@ -7,3 +7,4 @@ description = "Small helpers shared by the component crates: layout shorthands,
[dependencies]
gpui = { workspace = true }
gpui-native-theme = { workspace = true }
log = "0.4"
crates/utils/src/lib.rs
+25 -2
View File
@@ -4,21 +4,42 @@ use gpui::{
Refineable as _, StatefulInteractiveElement, StyleRefinement, Styled, Window, WindowId, div,
px,
};
use gpui_native_theme::ActiveTheme as _;
use gpui_native_theme::{ActiveTheme as _, FOCUS_RING_SPREAD};
use std::collections::HashMap;
/// A row whose children center on the cross axis.
#[must_use]
pub fn h_flex() -> Div {
div().flex().flex_row().items_center()
}
/// A column whose children stack on the main axis.
#[must_use]
pub fn v_flex() -> Div {
div().flex().flex_col()
}
/// Logs the error and yields the success value, if any.
pub trait ResultLogErr<T> {
/// Logs the error and yields the success value, if any.
fn log_err(self) -> Option<T>;
}
impl<T, E: std::fmt::Display> ResultLogErr<T> for Result<T, E> {
fn log_err(self) -> Option<T> {
match self {
Ok(value) => Some(value),
Err(error) => {
log::warn!("{error}");
None
}
}
}
}
/// Extensions over [`Styled`], shared by the components.
pub trait StyledExt: Styled + Sized {
#[must_use]
fn refine_style(mut self, style: &StyleRefinement) -> Self {
self.style().refine(style);
self
@@ -38,6 +59,7 @@ pub fn focus_handle(id: &ElementId, window: &mut Window, cx: &mut App) -> FocusH
}
/// The painted bounds of elements that tooltips anchor to, per window and element id.
/// Entries are never evicted: bounds are bounded by live windows, though long-lived processes minting dynamic per-item ids could accumulate.
#[derive(Default)]
struct AnchorBoundsRegistry(HashMap<(WindowId, ElementId), Bounds<Pixels>>);
@@ -72,7 +94,7 @@ pub fn record_anchor_bounds(
/// Returns a focus ring shadow with the given color at half ink.
pub fn focus_ring(color: Hsla) -> Vec<BoxShadow> {
vec![BoxShadow::new(px(0.), px(0.), color.alpha(0.5)).spread_radius(px(3.))]
vec![BoxShadow::new(px(0.), px(0.), color.alpha(0.5)).spread_radius(FOCUS_RING_SPREAD)]
}
/// The next selectable row in the direction, or `None` at the ends.
@@ -128,6 +150,7 @@ pub fn selectable_label_color(cx: &App, selected: bool, disabled: bool) -> Hsla
}
/// A selectable row's background.
#[must_use]
pub fn paint_selectable_row<R>(cx: &App, row: R, selected: bool, disabled: bool) -> R
where
R: IntoElement + Styled + StatefulInteractiveElement,
examples/gallery/Cargo.toml
+2 -1
View File
@@ -11,9 +11,10 @@ reqwest_client = { workspace = true }
gpui-native-core = { workspace = true, features = ["full"] }
gpui-native-data = { workspace = true, features = ["full"] }
gpui-native-editor = { workspace = true, features = ["full"] }
gpui-native-layout = { workspace = true }
gpui-native-layout = { workspace = true, features = ["full"] }
gpui-native-icons = { workspace = true }
gpui-native-theme = { workspace = true }
gpui-native-utils = { workspace = true }
[[bin]]
name = "gallery"
examples/gallery/src/main.rs
+221 -171
View File
@@ -5,7 +5,7 @@ use gpui::{
App, AppContext as _, Axis, Bounds, Context, Entity, FontWeight, InteractiveElement as _,
IntoElement, KeyBinding, ListAlignment, ListState, ParentElement as _, Pixels, Render,
SharedString, Styled as _, UniformListScrollHandle, WeakEntity, Window, WindowBounds,
WindowOptions, actions, div, list, px, size, uniform_list,
WindowOptions, actions, div, list, px, rems, size, uniform_list,
};
use gpui_native_core::alert::{Alert, AlertSeverity, Alerts, AlertsView};
use gpui_native_core::avatar::Avatar;
@@ -53,9 +53,10 @@ use gpui_native_layout::resizable::{Resizable, ResizableState};
use gpui_native_layout::resize_handle::ResizeHandle;
use gpui_native_layout::shell::{LayoutState, Shell};
use gpui_native_theme::{
ActiveTheme as _, Theme, ThemeVariant, active_preset, mode_override, set_mode_override,
set_preset,
ActiveTheme as _, CODE_OVERSCROLL_MAX, Theme, ThemeVariant, active_preset, mode_override,
set_mode_override, set_preset,
};
use gpui_native_utils::ResultLogErr as _;
use gpui_platform::application;
/// The component catalog: (group, [(panel id, sidebar label)]).
@@ -225,6 +226,7 @@ struct Gallery {
alert_open: bool,
/// Whether the app sidebar paints the window's native material.
sidebar_transparent: bool,
_subscriptions: Vec<gpui::Subscription>,
}
impl Gallery {
@@ -263,7 +265,11 @@ impl Gallery {
.iter()
.flat_map(|(group, panels)| {
let mut entries = vec![SidebarEntry::header(*group)];
entries.extend(panels.iter().map(|(_, label)| SidebarEntry::row(*label)));
entries.extend(
panels
.iter()
.map(|(id, label)| SidebarEntry::row(*id, *label)),
);
entries
})
.collect()
@@ -302,7 +308,7 @@ impl Gallery {
gallery.dialog_open = open;
cx.notify();
})
.ok();
.log_err();
})
.content(|_, _| {
div()
@@ -322,7 +328,7 @@ impl Gallery {
gallery.dialog_open = false;
cx.notify();
})
.ok();
.log_err();
})
.into_any_element(),
Button::new("gallery-dialog-delete")
@@ -334,7 +340,7 @@ impl Gallery {
gallery.dialog_open = false;
cx.notify();
})
.ok();
.log_err();
})
.into_any_element(),
]
@@ -353,7 +359,7 @@ impl Gallery {
gallery.alert_open = open;
cx.notify();
})
.ok();
.log_err();
})
.content(|_, _| {
div()
@@ -373,7 +379,7 @@ impl Gallery {
gallery.alert_open = false;
cx.notify();
})
.ok();
.log_err();
})
.into_any_element(),
Button::new("gallery-alert-signout")
@@ -385,7 +391,7 @@ impl Gallery {
gallery.alert_open = false;
cx.notify();
})
.ok();
.log_err();
})
.into_any_element(),
]
@@ -612,7 +618,12 @@ impl Gallery {
dock.register_panel(PanelDescriptor::new(
"resize-handle",
"Resize handle",
|_, cx| cx.new(|_| ResizeDemo { width: px(200.) }).into(),
|window, cx| {
cx.new(|_| ResizeDemo {
width: rems(ResizeDemo::WIDTH_DEFAULT_REMS).to_pixels(window.rem_size()),
})
.into()
},
));
dock.register_panel(PanelDescriptor::new("resizable", "Resizable", |_, cx| {
cx.new(ResizableDemo::new).into()
@@ -677,7 +688,7 @@ impl Render for WelcomePanel {
.child(
v_flex()
.gap_4()
.max_w(px(560.))
.max_w(rems(35.))
.child(
div()
.text_lg()
@@ -740,7 +751,7 @@ impl Render for WelcomePanel {
!gallery.sidebar_transparent;
cx.notify();
})
.ok();
.log_err();
}),
)
.child(
@@ -789,6 +800,17 @@ struct ButtonDemo {
clicks: usize,
}
impl ButtonDemo {
fn button_label(variant: ButtonVariant) -> &'static str {
match variant {
ButtonVariant::Primary => "Primary",
ButtonVariant::Secondary => "Secondary",
ButtonVariant::Ghost => "Ghost",
ButtonVariant::Destructive => "Delete",
}
}
}
impl Render for ButtonDemo {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let view = cx.entity();
@@ -813,7 +835,7 @@ impl Render for ButtonDemo {
let view = view.clone();
let mut button =
Button::new(SharedString::from(format!("button-demo-{name}")))
.label(button_label(variant))
.label(Self::button_label(variant))
.variant(variant)
.on_click(move |_, _, cx| {
view.update(cx, |demo, cx| {
@@ -839,7 +861,7 @@ impl Render for ButtonDemo {
let view = view.clone();
let mut button =
Button::new(SharedString::from(format!("button-demo-icon-{name}")))
.label(button_label(variant))
.label(Self::button_label(variant))
.icon(IconRole::Folder)
.variant(variant)
.on_click(move |_, _, cx| {
@@ -1174,10 +1196,6 @@ impl Render for StatusDotDemo {
}
}
fn combo_option(label: &'static str) -> ComboboxOption<SharedString> {
(SharedString::from(label), SharedString::from(label))
}
struct ComboboxDemo {
branch: Entity<ComboboxState<SharedString>>,
label: Entity<ComboboxState<SharedString>>,
@@ -1187,6 +1205,10 @@ struct ComboboxDemo {
}
impl ComboboxDemo {
fn combo_option(label: &'static str) -> ComboboxOption<SharedString> {
(SharedString::from(label), SharedString::from(label))
}
fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
let view = cx.entity();
let branch = cx.new(|cx| {
@@ -1195,10 +1217,10 @@ impl ComboboxDemo {
"combo-demo-branch",
"Branch",
vec![
combo_option("main"),
combo_option("next"),
combo_option("release/1.0"),
combo_option("release/2.0"),
Self::combo_option("main"),
Self::combo_option("next"),
Self::combo_option("release/1.0"),
Self::combo_option("release/2.0"),
],
)
.selected(SharedString::from("main"))
@@ -1206,7 +1228,7 @@ impl ComboboxDemo {
.keep_unmatched_text()
// Widths are style refinements on the builder; the popup
// always matches whatever the combobox ends up being.
.w(px(280.)),
.w(rems(17.5)),
window,
cx,
)
@@ -1215,9 +1237,9 @@ impl ComboboxDemo {
"combo-demo-label",
"Label",
vec![
combo_option("bug"),
combo_option("docs"),
combo_option("enhancement"),
Self::combo_option("bug"),
Self::combo_option("docs"),
Self::combo_option("enhancement"),
],
)
.placeholder("Pick or type a label…")
@@ -1245,10 +1267,10 @@ impl ComboboxDemo {
"combo-demo-fuzzy",
"Module",
vec![
combo_option("combobox"),
combo_option("dock"),
combo_option("editor"),
combo_option("markdown"),
Self::combo_option("combobox"),
Self::combo_option("dock"),
Self::combo_option("editor"),
Self::combo_option("markdown"),
],
)
.placeholder("Filter modules…")
@@ -1817,7 +1839,7 @@ impl ResizableDemo {
}
impl Render for ResizableDemo {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let colors = cx.theme().colors;
let pane = |text: &'static str| {
div().size_full().bg(colors.muted).p_2().child(
@@ -1836,8 +1858,8 @@ impl Render for ResizableDemo {
colors,
Resizable::new("resizable-demo-vertical", self.vertical.clone())
.size_full()
.h(px(320.))
.pane_with_min(pane("Tree"), px(96.))
.h(rems(20.))
.pane_with_min(pane("Tree"), rems(6.).to_pixels(window.rem_size()))
.pane(pane("Editor"))
.pane(pane("Terminal")),
))
@@ -1847,7 +1869,7 @@ impl Render for ResizableDemo {
Resizable::new("resizable-demo-horizontal", self.horizontal.clone())
.axis(Axis::Horizontal)
.size_full()
.h(px(120.))
.h(rems(7.5))
.pane(pane("Primary"))
.pane(pane("Inspector")),
))
@@ -2022,13 +2044,13 @@ impl Render for ListDemo {
})
.items(|_, _| {
vec![
ListItem::new("Documents").icon(IconRole::Folder),
ListItem::new("Pictures")
ListItem::new("Documents", "Documents").icon(IconRole::Folder),
ListItem::new("Pictures", "Pictures")
.icon(IconRole::Folder)
.detail("24 items"),
ListItem::new("Music").icon(IconRole::Folder),
ListItem::new("Archive").disabled(true),
ListItem::new("Trash").detail("emptied weekly"),
ListItem::new("Music", "Music").icon(IconRole::Folder),
ListItem::new("Archive", "Archive").disabled(true),
ListItem::new("Trash", "Trash").detail("emptied weekly"),
]
}),
))
@@ -2122,14 +2144,20 @@ impl TreeDemo {
nodes: &[GalleryNode],
depth: usize,
prefix: &[usize],
key_prefix: &str,
items: &mut Vec<TreeItem>,
paths: &mut Vec<Vec<usize>>,
) {
for (index, node) in nodes.iter().enumerate() {
let mut path = prefix.to_vec();
path.push(index);
// Slash-joined label paths key rows by domain identity, so element
// ids survive expansion changing the flat row order.
let key: SharedString = if key_prefix.is_empty() {
node.label.clone()
} else {
format!("{key_prefix}/{}", node.label).into()
};
let mut item = TreeItem::new(node.label.clone())
let mut item = TreeItem::new(key.clone(), node.label.clone())
.depth(depth)
.expandable(!node.children.is_empty())
.expanded(node.expanded);
@@ -2137,10 +2165,13 @@ impl TreeDemo {
item = item.icon(role);
}
items.push(item);
let mut path = prefix.to_vec();
path.push(index);
paths.push(path.clone());
if node.expanded {
Self::flatten(&node.children, depth + 1, &path, items, paths);
Self::flatten(&node.children, depth + 1, &path, &key, items, paths);
}
}
}
@@ -2162,7 +2193,7 @@ impl TreeDemo {
fn paths(nodes: &[GalleryNode]) -> Vec<Vec<usize>> {
let mut items = Vec::new();
let mut paths = Vec::new();
Self::flatten(nodes, 0, &[], &mut items, &mut paths);
Self::flatten(nodes, 0, &[], "", &mut items, &mut paths);
paths
}
}
@@ -2174,7 +2205,7 @@ impl Render for TreeDemo {
let colors = cx.theme().colors;
let mut items = Vec::new();
let mut paths = Vec::new();
Self::flatten(&self.nodes, 0, &[], &mut items, &mut paths);
Self::flatten(&self.nodes, 0, &[], "", &mut items, &mut paths);
ScrollArea::new("tree-demo")
.size_full()
@@ -2519,7 +2550,7 @@ impl Render for DialogDemo {
gallery.dialog_open = true;
cx.notify();
})
.ok();
.log_err();
}),
)
.child(
@@ -2532,7 +2563,7 @@ impl Render for DialogDemo {
gallery.alert_open = true;
cx.notify();
})
.ok();
.log_err();
}),
),
))
@@ -2694,7 +2725,10 @@ impl DropdownMenuDemo {
cx.notify();
}
fn set_status(&mut self, message: impl Into<SharedString>, cx: &mut Context<Self>) {
fn set_status<S>(&mut self, message: S, cx: &mut Context<Self>)
where
S: Into<SharedString>,
{
self.status = Some(message.into());
cx.notify();
}
@@ -2940,7 +2974,7 @@ impl Render for PopoverDemo {
.content(|_, _| {
v_flex()
.gap_1()
.w(px(240.))
.w(rems(15.))
.p_2()
.child(
Checkbox::new("popover-demo-telemetry").label("Enable telemetry"),
@@ -3013,7 +3047,7 @@ impl Render for EmptyStateDemo {
"with action",
colors,
div()
.h(px(180.))
.h(rems(11.25))
.rounded(radius.overlay)
.border_1()
.border_color(colors.border)
@@ -3033,7 +3067,7 @@ impl Render for EmptyStateDemo {
"bare",
colors,
div()
.h(px(120.))
.h(rems(7.5))
.rounded(radius.overlay)
.border_1()
.border_color(colors.border)
@@ -3062,7 +3096,7 @@ impl Render for ScrollAreaDemo {
let wide_rows = (0..12).map(|row| {
div()
.flex_none()
.w(px(760.))
.w(rems(47.5))
.px_3()
.py_1()
.border_b_1()
@@ -3077,7 +3111,7 @@ impl Render for ScrollAreaDemo {
"vertical",
colors,
div()
.h(px(200.))
.h(rems(12.5))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
@@ -3092,7 +3126,7 @@ impl Render for ScrollAreaDemo {
"both axes",
colors,
div()
.h(px(160.))
.h(rems(10.))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
@@ -3117,10 +3151,12 @@ struct ScrollbarDemo {
}
impl ScrollbarDemo {
const ROW_HEIGHT_REMS: [f32; 3] = [1.75, 2.5, 3.25];
fn new() -> Self {
Self {
uniform: UniformListScrollHandle::new(),
list: ListState::new(64, ListAlignment::Top, px(400.)),
list: ListState::new(64, ListAlignment::Top, CODE_OVERSCROLL_MAX),
visibility: ScrollbarVisibility::Platform,
}
}
@@ -3159,7 +3195,7 @@ impl Render for ScrollbarDemo {
colors,
div()
.relative()
.h(px(240.))
.h(rems(15.))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
@@ -3169,7 +3205,7 @@ impl Render for ScrollbarDemo {
range
.map(|row| {
div()
.h(px(24.))
.h(rems(1.5))
.px_3()
.flex()
.items_center()
@@ -3190,7 +3226,7 @@ impl Render for ScrollbarDemo {
colors,
div()
.relative()
.h(px(240.))
.h(rems(15.))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
@@ -3203,7 +3239,7 @@ impl Render for ScrollbarDemo {
.border_b_1()
.border_color(colors.border)
.child(format!("Item {row} — {} lines tall", 1 + row % 3))
.h(px(28. + (row % 3) as f32 * 12.))
.h(rems(Self::ROW_HEIGHT_REMS[row % 3]))
.into_any_element()
})
.h_full()
@@ -3284,9 +3320,31 @@ enum CodeSample {
/// The line count of the large-file sample.
const LARGE_SAMPLE_LINES: usize = 5000;
/// Generates a deterministic pseudo-Rust file of roughly `lines` lines, so
/// scrolling the code view can be exercised on realistic content.
fn large_sample(lines: usize) -> String {
struct CodeViewDemo {
code: Entity<CodeViewState>,
sample: CodeSample,
large_source: SharedString,
_subscription: gpui::Subscription,
}
impl CodeViewDemo {
fn new(cx: &mut Context<Self>) -> Self {
let code =
cx.new(|cx| CodeViewState::new("code-view-demo", RUST_SAMPLE, Language::Rust, cx));
// The panel is a cached view in the dock: it re-renders only when
// the code state it renders is notified.
let subscription = cx.observe(&code, |_, _, cx| cx.notify());
Self {
code,
sample: CodeSample::Rust,
large_source: Self::large_sample(LARGE_SAMPLE_LINES).into(),
_subscription: subscription,
}
}
/// Generates a deterministic pseudo-Rust file of roughly `lines` lines, so
/// scrolling the code view can be exercised on realistic content.
fn large_sample(lines: usize) -> String {
let mut source = String::with_capacity(lines * 48);
let mut index = 0usize;
while source.lines().count() < lines {
@@ -3310,28 +3368,6 @@ fn large_sample(lines: usize) -> String {
index += 1;
}
source
}
struct CodeViewDemo {
code: Entity<CodeViewState>,
sample: CodeSample,
large_source: SharedString,
_subscription: gpui::Subscription,
}
impl CodeViewDemo {
fn new(cx: &mut Context<Self>) -> Self {
let code =
cx.new(|cx| CodeViewState::new("code-view-demo", RUST_SAMPLE, Language::Rust, cx));
// The panel is a cached view in the dock: it re-renders only when
// the code state it renders is notified.
let subscription = cx.observe(&code, |_, _, cx| cx.notify());
Self {
code,
sample: CodeSample::Rust,
large_source: large_sample(LARGE_SAMPLE_LINES).into(),
_subscription: subscription,
}
}
}
@@ -3375,7 +3411,7 @@ impl Render for CodeViewDemo {
"source",
colors,
div()
.h(px(480.))
.h(rems(30.))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
@@ -3457,9 +3493,26 @@ enum DiffScenario {
/// The line count of each version in the large-diff sample.
const LARGE_DIFF_LINES: usize = 5000;
/// Generates a matched old/new pair of roughly `lines` lines each, with a
/// change every few lines so the diff has spread-out hunks.
fn large_diff_pair(lines: usize) -> (String, String) {
impl DiffViewDemo {
fn new(cx: &mut Context<Self>) -> Self {
let diff =
cx.new(|_| DiffViewState::new("diff-view-demo", DIFF_OLD, DIFF_NEW, Language::Rust));
// The panel is a cached view in the dock: it re-renders only when
// the diff state it renders is notified.
let subscription = cx.observe(&diff, |_, _, cx| cx.notify());
let (large_old, large_new) = Self::large_diff_pair(LARGE_DIFF_LINES);
Self {
diff,
scenario: DiffScenario::Small,
large_old: large_old.into(),
large_new: large_new.into(),
_subscription: subscription,
}
}
/// Generates a matched old/new pair of roughly `lines` lines each, with a
/// change every few lines so the diff has spread-out hunks.
fn large_diff_pair(lines: usize) -> (String, String) {
let mut old = String::with_capacity(lines * 48);
let mut new = String::with_capacity(lines * 48);
let mut index = 0usize;
@@ -3485,23 +3538,6 @@ fn large_diff_pair(lines: usize) -> (String, String) {
index += 1;
}
(old, new)
}
impl DiffViewDemo {
fn new(cx: &mut Context<Self>) -> Self {
let diff =
cx.new(|_| DiffViewState::new("diff-view-demo", DIFF_OLD, DIFF_NEW, Language::Rust));
// The panel is a cached view in the dock: it re-renders only when
// the diff state it renders is notified.
let subscription = cx.observe(&diff, |_, _, cx| cx.notify());
let (large_old, large_new) = large_diff_pair(LARGE_DIFF_LINES);
Self {
diff,
scenario: DiffScenario::Small,
large_old: large_old.into(),
large_new: large_new.into(),
_subscription: subscription,
}
}
}
@@ -3548,7 +3584,7 @@ impl Render for DiffViewDemo {
"unified, highlighted, virtualized",
colors,
div()
.h(px(480.))
.h(rems(30.))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
@@ -3617,23 +3653,6 @@ That is the news.
/// The section count of the large markdown sample.
const LARGE_MARKDOWN_SECTIONS: usize = 1000;
/// Generates a long markdown document, so scrolling the view can be
/// exercised on realistic content.
fn large_markdown(sections: usize) -> String {
let mut source = String::new();
for section in 0..sections {
source.push_str(&format!("## Section {section}\n\n"));
source.push_str(&format!(
"Handler {section} retries stale sockets and logs every outcome.\n\n"
));
source.push_str(&format!(
"- [ ] Audit handler {section}\n- See [issue {section}](https://example.com/issues/{section})\n\n"
));
source.push_str("```rust\nfn handle() -> bool { true }\n```\n\n");
}
source
}
struct MarkdownViewDemo {
view: Entity<MarkdownViewState>,
sample: MarkdownSample,
@@ -3660,10 +3679,27 @@ impl MarkdownViewDemo {
Self {
view,
sample: MarkdownSample::Guide,
large_source: large_markdown(LARGE_MARKDOWN_SECTIONS).into(),
large_source: Self::large_markdown(LARGE_MARKDOWN_SECTIONS).into(),
_subscription: subscription,
}
}
/// Generates a long markdown document, so scrolling the view can be
/// exercised on realistic content.
fn large_markdown(sections: usize) -> String {
let mut source = String::new();
for section in 0..sections {
source.push_str(&format!("## Section {section}\n\n"));
source.push_str(&format!(
"Handler {section} retries stale sockets and logs every outcome.\n\n"
));
source.push_str(&format!(
"- [ ] Audit handler {section}\n- See [issue {section}](https://example.com/issues/{section})\n\n"
));
source.push_str("```rust\nfn handle() -> bool { true }\n```\n\n");
}
source
}
}
impl Render for MarkdownViewDemo {
@@ -3704,7 +3740,7 @@ impl Render for MarkdownViewDemo {
"rendered, virtualized, links clickable",
colors,
div()
.h(px(480.))
.h(rems(30.))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
@@ -3741,8 +3777,8 @@ impl Render for SidebarDemo {
"standalone; the app's own left sidebar is this component",
colors,
div()
.w(px(280.))
.h(px(360.))
.w(rems(17.5))
.h(rems(22.5))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
@@ -3764,22 +3800,25 @@ impl Render for SidebarDemo {
};
vec![
SidebarEntry::header("Favorites"),
SidebarEntry::row("Documents").prefix(row_icon()),
SidebarEntry::row("Pictures")
SidebarEntry::row("Documents", "Documents")
.prefix(row_icon()),
SidebarEntry::row("Pictures", "Pictures")
.prefix(row_icon())
.detail("24")
.suffix(
Badge::new("sidebar-demo-new-badge", "new")
.variant(BadgeVariant::Accent),
),
SidebarEntry::row("Archive").disabled(true),
SidebarEntry::row("Archive", "Archive").disabled(true),
SidebarEntry::header("Locations"),
SidebarEntry::row("iCloud").prefix(row_icon()).suffix(
SidebarEntry::row("iCloud", "iCloud")
.prefix(row_icon())
.suffix(
StatusDot::new("sidebar-demo-icloud-status")
.small()
.variant(StatusDotVariant::Success),
),
SidebarEntry::row("Trash"),
SidebarEntry::row("Trash", "Trash"),
]
}),
),
@@ -3798,6 +3837,12 @@ struct ResizeDemo {
width: Pixels,
}
impl ResizeDemo {
const WIDTH_DEFAULT_REMS: f32 = 12.5;
const WIDTH_MIN_REMS: f32 = 6.;
const WIDTH_MAX_REMS: f32 = 20.;
}
impl Render for ResizeDemo {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let view = cx.entity();
@@ -3814,7 +3859,7 @@ impl Render for ResizeDemo {
"seam",
colors,
h_flex()
.h(px(112.))
.h(rems(7.))
.rounded(radius.control)
.border_1()
.border_color(colors.border)
@@ -3831,15 +3876,21 @@ impl Render for ResizeDemo {
)
.child(
ResizeHandle::new("resize-demo-handle")
.on_resize(move |delta, _, cx| {
.on_resize(move |delta, window, cx| {
view.update(cx, |demo, cx| {
demo.width = (demo.width + delta).clamp(px(96.), px(320.));
demo.width = (demo.width + delta).clamp(
rems(ResizeDemo::WIDTH_MIN_REMS)
.to_pixels(window.rem_size()),
rems(ResizeDemo::WIDTH_MAX_REMS)
.to_pixels(window.rem_size()),
);
cx.notify();
});
})
.on_reset(move |_, cx| {
.on_reset(move |window, cx| {
view_reset.update(cx, |demo, cx| {
demo.width = px(200.);
demo.width = rems(ResizeDemo::WIDTH_DEFAULT_REMS)
.to_pixels(window.rem_size());
cx.notify();
});
}),
@@ -3871,7 +3922,7 @@ impl Render for ResizeDemo {
struct ThemeDemo;
impl Render for ThemeDemo {
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let theme = cx.theme();
let colors = theme.colors;
let radius = theme.radius;
@@ -3928,7 +3979,7 @@ impl Render for ThemeDemo {
(PresetChoice::TokyoNight, "Tokyo Night"),
])
.on_change(|next, _, cx| {
set_preset(next.name(), cx).ok();
set_preset(next.name(), cx).log_err();
}),
))
.child(demo_section(
@@ -3987,24 +4038,17 @@ impl Render for ThemeDemo {
"icons (Lucide fallback; platform resolvers land later)",
colors,
div().flex().flex_wrap().items_center().gap_4().children(
IconRole::all()
.iter()
.map(|role| icon(*role).size(px(20.)).color(colors.foreground)),
IconRole::all().iter().map(|role| {
icon(*role)
.size(rems(1.25).to_pixels(window.rem_size()))
.color(colors.foreground)
}),
),
)),
)
}
}
fn button_label(variant: ButtonVariant) -> &'static str {
match variant {
ButtonVariant::Primary => "Primary",
ButtonVariant::Secondary => "Secondary",
ButtonVariant::Ghost => "Ghost",
ButtonVariant::Destructive => "Delete",
}
}
fn section_label(text: &str, colors: gpui_native_theme::ColorTokens) -> impl IntoElement + use<> {
div()
.text_sm()
@@ -4028,23 +4072,22 @@ where
}
fn main() {
// Without a client gpui installs a NullHttpClient and remote images —
// the avatar pictures — silently never load.
application()
.with_assets(IconAssets)
.with_http_client(std::sync::Arc::new(reqwest_client::ReqwestClient::new()))
.run(|cx: &mut App| {
gpui_native_core::init(cx);
gpui_native_editor::code_view::bind_code_view_keys(cx);
cx.bind_keys([
KeyBinding::new("cmd-k", OpenCommandPalette, None),
KeyBinding::new("ctrl-k", OpenCommandPalette, None),
]);
let layout_state = LayoutState::new(cx);
let dock_state = DockState::new(cx);
// A panel that declares a right sidebar view asks for it to open on
// activation; visibility itself stays on the shell's LayoutState.
let layout_for_dock = layout_state.clone();
dock_state.update(cx, |dock, _| {
dock.on_open_right_sidebar(move |cx| {
layout_for_dock.update(cx, |state, cx| {
@@ -4052,29 +4095,27 @@ fn main() {
});
});
});
let bounds = Bounds::centered(None, size(px(960.0), px(640.0)), cx);
let theme = cx.theme();
if let Err(err) = cx.open_window(
WindowOptions {
window_bounds: Some(WindowBounds::Windowed(bounds)),
titlebar: Some(gpui::TitlebarOptions {
title: Some("gpui-native-kit gallery".into()),
// The shell's strips are the titlebar; the native one only
// hosts the traffic lights on macOS.
appears_transparent: true,
..Default::default()
}),
// The strips move the window themselves, so a tab dragged inside
// the titlebar band never drags the window with it.
app_owns_titlebar_drag: true,
// The platform's native backdrop; the theme's material paints
// resolve over it and go opaque under reduced transparency.
window_background: cx.theme().window_background,
window_background: theme.window_background,
..Default::default()
},
|window, cx| {
Theme::sync_from_window(window, cx);
Theme::sync_window_rem_size(window, cx);
// Detached on purpose: the subscription lives as long as the window.
window
.observe_window_appearance(|window, cx| {
Theme::sync_from_window(window, cx);
@@ -4082,13 +4123,11 @@ fn main() {
cx.refresh_windows();
})
.detach();
let toasts = cx.new(|_| Toasts::default());
let alerts = cx.new(|_| Alerts::default());
let gallery = cx.new(|cx| {
// Toast pushes and dismissals repaint the stack.
cx.observe(&toasts, |_, _, cx| cx.notify()).detach();
// Alert pushes and dismissals repaint it.
cx.observe(&alerts, |_, _, cx| cx.notify()).detach();
Gallery {
layout_state: layout_state.clone(),
dock_state: dock_state.clone(),
@@ -4099,8 +4138,15 @@ fn main() {
dialog_open: false,
alert_open: false,
sidebar_transparent: true,
_subscriptions: vec![
// Toast pushes and dismissals repaint the stack.
cx.observe(&toasts, |_, _, cx| cx.notify()),
// Alert pushes and dismissals repaint it.
cx.observe(&alerts, |_, _, cx| cx.notify()),
],
}
});
let palette = cx.new(|cx| {
let matcher = |query: &str, commands: &[Command]| {
let needle = query.to_lowercase();
@@ -4111,6 +4157,7 @@ fn main() {
.collect()
};
let gallery_for_execute = gallery.downgrade();
CommandPaletteState::new(
CommandPalette::new("gallery-palette", gallery_commands(), matcher)
.on_execute(move |command: &Command, _, cx| {
@@ -4119,16 +4166,18 @@ fn main() {
gallery.palette_runs.push(command.id.clone());
cx.notify();
})
.ok();
.log_err();
}),
window,
cx,
)
});
gallery.update(cx, |gallery, cx| {
gallery.palette = Some(palette.clone());
cx.notify();
});
dock_state.update(cx, |dock, cx| {
Gallery::register_panels(
dock,
@@ -4139,16 +4188,17 @@ fn main() {
gallery.downgrade(),
cx,
);
// TEMPORARY perf probe: open the field panel under the
// autoplay env var so the probe types into a real window.
let first = if std::env::var("GPUI_FIELD_AUTOPLAY").is_ok() {
eprintln!("[field-probe] autoplay: opening field panel");
"field"
} else {
"welcome"
};
dock.open_panel(first, window, cx);
});
gallery
},
) {
src/lib.rs
+3 -1
View File
@@ -4,7 +4,6 @@ pub use gpui_native_icons as icons;
pub use gpui_native_theme as theme;
#[cfg(feature = "core")]
#[allow(unused_imports)]
pub use gpui_native_core::*;
#[cfg(feature = "data")]
@@ -13,6 +12,9 @@ pub use gpui_native_data as data;
#[cfg(feature = "layout")]
pub use gpui_native_layout as layout;
#[cfg(feature = "editor")]
pub use gpui_native_editor as editor;
use gpui::App;
/// Initializes the framework.