Unify theme sizing and spacing on Base UI metrics
- Read only mode, accent, accessibility, and native window material from the OS. - Replace platform palettes, metrics, type ramps, borders, and elevations with unified tokens. - Align controls, overlays, and data rows with Base UI sizing.
This commit is contained in:
@@ -21,7 +21,7 @@ pub struct ColorTokens {
|
||||
pub foreground: Hsla,
|
||||
pub surface: Hsla,
|
||||
pub surface_foreground: Hsla,
|
||||
/// The docked sidebar's backdrop, matching the platform's window chrome.
|
||||
/// The docked sidebar's backdrop.
|
||||
pub sidebar: Hsla,
|
||||
pub primary: Hsla,
|
||||
pub primary_foreground: Hsla,
|
||||
@@ -77,8 +77,8 @@ impl ColorTokens {
|
||||
info: hex(0x0284c7),
|
||||
info_foreground: hex(0xffffff),
|
||||
border: hex(0xe4e4e7),
|
||||
input: hex(0xe4e4e7),
|
||||
ring: hex(0x93c5fd),
|
||||
input: hex(0xffffff),
|
||||
ring: hex(0x2563eb),
|
||||
selection: hex(0xdbeafe),
|
||||
overlay: scrim(0.25),
|
||||
// macOS light overlay thumbs are translucent black.
|
||||
@@ -112,8 +112,8 @@ impl ColorTokens {
|
||||
info: hex(0x38bdf8),
|
||||
info_foreground: hex(0x082f49),
|
||||
border: hex(0x27272a),
|
||||
input: hex(0x27272a),
|
||||
ring: hex(0x1d4ed8),
|
||||
input: hex(0x09090b),
|
||||
ring: hex(0x3b82f6),
|
||||
selection: hex(0x1e3a8a),
|
||||
overlay: scrim(0.45),
|
||||
// macOS dark overlay thumbs are translucent light gray.
|
||||
|
||||
+102
-190
@@ -19,7 +19,7 @@ pub use colors::{ColorTokens, MaterialTokens};
|
||||
pub use definition::ThemeDefinition;
|
||||
pub use ramps::{AccentShades, Oklch};
|
||||
pub use resolve::{Ramps, ResolvedTheme};
|
||||
pub use system::{AccessibilityPreferences, PartialPalette, SourceKind, SystemTheme};
|
||||
pub use system::{AccessibilityPreferences, SourceKind, SystemTheme};
|
||||
pub use typography::{TextRole, TypeMetrics, Typeset, Typography};
|
||||
|
||||
use gpui::{
|
||||
@@ -159,21 +159,19 @@ pub struct Theme {
|
||||
pub material: MaterialTokens,
|
||||
pub ramps: Ramps,
|
||||
pub radius: Radius,
|
||||
/// Per-platform border and focus chrome.
|
||||
pub borders: Borders,
|
||||
pub spacing: Spacing,
|
||||
pub elevations: Elevations,
|
||||
/// Overlay transition timing; gpui's animation primitives do the rest.
|
||||
pub motion: Motion,
|
||||
/// Overlay scrollbar geometry.
|
||||
pub scrollbar: Scrollbar,
|
||||
/// The height the window's titlebar strips draw at, per the platform.
|
||||
/// The height the window's titlebar strips draw at.
|
||||
pub titlebar_height: Pixels,
|
||||
/// The platform's native root font size; rem-based sizing scales with it.
|
||||
/// The theme's root font size; rem-based sizing scales with it.
|
||||
pub root_font_size: Pixels,
|
||||
/// The platform's monospace family, for code surfaces.
|
||||
/// The monospace family, for code surfaces.
|
||||
pub mono_font: &'static str,
|
||||
/// The platform's type ladder, resolved at the root font size.
|
||||
/// The type ladder, resolved at the root font size.
|
||||
pub typography: Typography,
|
||||
pub sizes: SizeTable,
|
||||
pub accessibility: AccessibilityPreferences,
|
||||
@@ -196,7 +194,6 @@ impl Theme {
|
||||
material: resolved.material,
|
||||
ramps: resolved.ramps,
|
||||
radius: resolved.radius,
|
||||
borders: resolved.borders,
|
||||
spacing: resolved.spacing,
|
||||
elevations: resolved.elevations,
|
||||
motion: resolved.motion,
|
||||
@@ -264,54 +261,7 @@ impl Default for Radius {
|
||||
}
|
||||
}
|
||||
|
||||
/// Which surfaces keep a 1px border, per the platform's chrome: Windows and
|
||||
/// KDE frame their controls, macOS and GNOME paint fills.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub struct Borders {
|
||||
/// Filled actions keep a border (Windows, KDE).
|
||||
pub buttons: bool,
|
||||
/// Text fields and selects keep a border.
|
||||
pub fields: bool,
|
||||
/// Floating layers keep a border.
|
||||
pub overlays: bool,
|
||||
/// Keyboard focus paints an accent ring around the control.
|
||||
pub focus_ring: bool,
|
||||
}
|
||||
|
||||
impl Borders {
|
||||
pub(crate) fn for_platform(source: SourceKind, variant: ThemeVariant) -> Self {
|
||||
let overlays = variant == ThemeVariant::Dark;
|
||||
|
||||
match source {
|
||||
SourceKind::Windows | SourceKind::Kde => Self {
|
||||
buttons: true,
|
||||
fields: true,
|
||||
overlays: true,
|
||||
focus_ring: false,
|
||||
},
|
||||
SourceKind::Macos => Self {
|
||||
buttons: false,
|
||||
fields: true,
|
||||
overlays,
|
||||
focus_ring: true,
|
||||
},
|
||||
SourceKind::Omarchy | SourceKind::Gnome => Self {
|
||||
buttons: false,
|
||||
fields: false,
|
||||
overlays,
|
||||
focus_ring: true,
|
||||
},
|
||||
SourceKind::Fallback => Self {
|
||||
buttons: true,
|
||||
fields: true,
|
||||
overlays: true,
|
||||
focus_ring: false,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The spacing rhythm of the platform: paddings and gaps step by this unit.
|
||||
/// The spacing rhythm: paddings and gaps step by this unit.
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
pub struct Spacing {
|
||||
pub unit: Pixels,
|
||||
@@ -420,7 +370,7 @@ pub struct Elevations {
|
||||
}
|
||||
|
||||
impl Elevations {
|
||||
pub(crate) fn for_platform(source: SourceKind, variant: ThemeVariant) -> Self {
|
||||
pub(crate) fn for_variant(variant: ThemeVariant) -> Self {
|
||||
if variant == ThemeVariant::Dark {
|
||||
return Self {
|
||||
popover: Elevation::none(),
|
||||
@@ -429,41 +379,21 @@ impl Elevations {
|
||||
};
|
||||
}
|
||||
|
||||
match source {
|
||||
SourceKind::Macos => Self {
|
||||
popover: Elevation::layered(
|
||||
Shadow::black(0., 4., 24., 0.12),
|
||||
Shadow::black(0., 1., 1., 0.05),
|
||||
),
|
||||
dialog: Elevation::layered(
|
||||
Shadow::black(0., 8., 40., 0.14),
|
||||
Shadow::black(0., 1., 2., 0.06),
|
||||
),
|
||||
control: Elevation::single(Shadow::black(0., 1., 2., 0.1)),
|
||||
},
|
||||
SourceKind::Windows => Self {
|
||||
popover: Elevation::layered(
|
||||
Shadow::black(0., 8., 16., 0.14),
|
||||
Shadow::black(0., 2., 4., 0.1),
|
||||
),
|
||||
dialog: Elevation::layered(
|
||||
Shadow::black(0., 16., 32., 0.16),
|
||||
Shadow::black(0., 4., 8., 0.1),
|
||||
),
|
||||
control: Elevation::single(Shadow::black(0., 1., 2., 0.12)),
|
||||
},
|
||||
SourceKind::Omarchy | SourceKind::Kde | SourceKind::Gnome | SourceKind::Fallback => {
|
||||
Self {
|
||||
popover: Elevation::single(Shadow::black(0., 3., 6., 0.2)),
|
||||
dialog: Elevation::single(Shadow::black(0., 9., 18., 0.24)),
|
||||
control: Elevation::single(Shadow::black(0., 1., 2., 0.16)),
|
||||
}
|
||||
}
|
||||
Self {
|
||||
popover: Elevation::layered(
|
||||
Shadow::black(0., 4., 24., 0.12),
|
||||
Shadow::black(0., 1., 1., 0.05),
|
||||
),
|
||||
dialog: Elevation::layered(
|
||||
Shadow::black(0., 8., 40., 0.14),
|
||||
Shadow::black(0., 1., 2., 0.06),
|
||||
),
|
||||
control: Elevation::single(Shadow::black(0., 1., 2., 0.1)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Overlay transition timings; the platform refines these per phase.
|
||||
/// Overlay transition timings.
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
pub struct Motion {
|
||||
/// The enter transition of popovers, menus, and dialogs.
|
||||
@@ -478,8 +408,7 @@ impl Default for Motion {
|
||||
}
|
||||
}
|
||||
|
||||
/// Overlay scrollbar presentation, transcribed from the platform's overlay
|
||||
/// crollbars.
|
||||
/// Overlay scrollbar presentation.
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
pub struct Scrollbar {
|
||||
/// The painted thumb's thickness.
|
||||
@@ -549,85 +478,105 @@ pub struct SizeTable {
|
||||
impl SizeTable {
|
||||
pub fn with_root_font_size(rem_size: Pixels) -> Self {
|
||||
struct ClassFactors {
|
||||
height: f32,
|
||||
padding: f32,
|
||||
text: f32,
|
||||
icon: f32,
|
||||
avatar: f32,
|
||||
strip: f32,
|
||||
inset: f32,
|
||||
floor_icon: bool,
|
||||
control_height: f32,
|
||||
input_height: f32,
|
||||
padding_x: f32,
|
||||
text_size: f32,
|
||||
icon_size: f32,
|
||||
dense_icon_size: f32,
|
||||
indicator_size: f32,
|
||||
avatar_size: f32,
|
||||
caption_size: f32,
|
||||
dense_padding_x: f32,
|
||||
plate_inset: f32,
|
||||
strip_height: f32,
|
||||
menu_item_height: f32,
|
||||
switch_height: f32,
|
||||
switch_width: f32,
|
||||
switch_knob: f32,
|
||||
}
|
||||
|
||||
let small = ClassFactors {
|
||||
height: 1.5,
|
||||
padding: 0.75,
|
||||
text: 0.85,
|
||||
icon: 0.875,
|
||||
avatar: 1.125,
|
||||
strip: 1.5,
|
||||
inset: 0.125,
|
||||
floor_icon: false,
|
||||
control_height: 1.75,
|
||||
input_height: 1.75,
|
||||
padding_x: 0.5,
|
||||
text_size: 0.75,
|
||||
icon_size: 0.875,
|
||||
dense_icon_size: 0.75,
|
||||
indicator_size: 0.875,
|
||||
avatar_size: 1.5,
|
||||
caption_size: 0.75,
|
||||
dense_padding_x: 0.5,
|
||||
plate_inset: 0.125,
|
||||
strip_height: 1.75,
|
||||
menu_item_height: 1.75,
|
||||
switch_height: 1.125,
|
||||
switch_width: 2.0,
|
||||
switch_knob: 0.75,
|
||||
};
|
||||
|
||||
let medium = ClassFactors {
|
||||
height: 1.75,
|
||||
padding: 1.0,
|
||||
text: 1.0,
|
||||
icon: 1.0,
|
||||
avatar: 1.5,
|
||||
strip: 2.0,
|
||||
inset: 0.25,
|
||||
floor_icon: true,
|
||||
control_height: 2.0,
|
||||
input_height: 2.0,
|
||||
padding_x: 0.75,
|
||||
text_size: 0.875,
|
||||
icon_size: 1.0,
|
||||
dense_icon_size: 0.75,
|
||||
indicator_size: 1.0,
|
||||
avatar_size: 2.0,
|
||||
caption_size: 0.75,
|
||||
dense_padding_x: 0.5,
|
||||
plate_inset: 0.125,
|
||||
strip_height: 2.0,
|
||||
menu_item_height: 2.0,
|
||||
switch_height: 1.25,
|
||||
switch_width: 2.25,
|
||||
switch_knob: 0.875,
|
||||
};
|
||||
|
||||
let large = ClassFactors {
|
||||
height: 2.25,
|
||||
padding: 1.25,
|
||||
text: 1.15,
|
||||
icon: 1.25,
|
||||
avatar: 2.0,
|
||||
strip: 3.0,
|
||||
inset: 0.375,
|
||||
floor_icon: true,
|
||||
control_height: 2.5,
|
||||
input_height: 2.5,
|
||||
padding_x: 1.0,
|
||||
text_size: 1.0,
|
||||
icon_size: 1.25,
|
||||
dense_icon_size: 0.9375,
|
||||
indicator_size: 1.25,
|
||||
avatar_size: 2.5,
|
||||
caption_size: 0.875,
|
||||
dense_padding_x: 0.75,
|
||||
plate_inset: 0.1875,
|
||||
strip_height: 2.5,
|
||||
menu_item_height: 2.25,
|
||||
switch_height: 1.5,
|
||||
switch_width: 2.75,
|
||||
switch_knob: 1.125,
|
||||
};
|
||||
|
||||
let metrics = |f: &ClassFactors| {
|
||||
let icon_size = if f.floor_icon {
|
||||
(rem_size * f.icon).max(px(16.))
|
||||
} else {
|
||||
rem_size * f.icon
|
||||
};
|
||||
let switch_height = rem_size * f.height * 0.75;
|
||||
ControlMetrics {
|
||||
control_height: rem_size * f.height,
|
||||
input_height: rem_size * (f.height + 0.125),
|
||||
padding_x: rem_size * f.padding,
|
||||
text_size: rem_size * f.text,
|
||||
icon_size,
|
||||
dense_icon_size: icon_size * 0.75,
|
||||
indicator_size: rem_size * f.height * 0.7,
|
||||
avatar_size: rem_size * f.avatar,
|
||||
caption_size: rem_size * f.text,
|
||||
dense_padding_x: rem_size * f.padding * 0.75,
|
||||
plate_inset: rem_size * f.inset,
|
||||
strip_height: rem_size * f.strip,
|
||||
menu_item_height: rem_size * f.height * 0.85,
|
||||
switch_height,
|
||||
switch_width: switch_height * 2.25,
|
||||
switch_knob: switch_height * 0.85,
|
||||
}
|
||||
let metrics = |f: &ClassFactors| ControlMetrics {
|
||||
control_height: rem_size * f.control_height,
|
||||
input_height: rem_size * f.input_height,
|
||||
padding_x: rem_size * f.padding_x,
|
||||
text_size: rem_size * f.text_size,
|
||||
icon_size: rem_size * f.icon_size,
|
||||
dense_icon_size: rem_size * f.dense_icon_size,
|
||||
indicator_size: rem_size * f.indicator_size,
|
||||
avatar_size: rem_size * f.avatar_size,
|
||||
caption_size: rem_size * f.caption_size,
|
||||
dense_padding_x: rem_size * f.dense_padding_x,
|
||||
plate_inset: rem_size * f.plate_inset,
|
||||
strip_height: rem_size * f.strip_height,
|
||||
menu_item_height: rem_size * f.menu_item_height,
|
||||
switch_height: rem_size * f.switch_height,
|
||||
switch_width: rem_size * f.switch_width,
|
||||
switch_knob: rem_size * f.switch_knob,
|
||||
};
|
||||
|
||||
let mut table = Self {
|
||||
Self {
|
||||
small: metrics(&small),
|
||||
medium: metrics(&medium),
|
||||
large: metrics(&large),
|
||||
};
|
||||
|
||||
table.small.caption_size = table.small.text_size * 0.85;
|
||||
table.large.caption_size = table.medium.text_size;
|
||||
table
|
||||
}
|
||||
}
|
||||
|
||||
/// The metrics for `size`.
|
||||
@@ -638,43 +587,6 @@ impl SizeTable {
|
||||
Size::Large => self.large,
|
||||
}
|
||||
}
|
||||
|
||||
/// Sets the medium class's text-field height to the platform's stated value.
|
||||
pub fn set_input_height(&mut self, medium_input_height: Pixels) {
|
||||
let ratio = medium_input_height / self.medium.input_height;
|
||||
self.small.input_height = (self.small.input_height * ratio).floor();
|
||||
self.medium.input_height = medium_input_height;
|
||||
self.large.input_height = (self.large.input_height * ratio).floor();
|
||||
}
|
||||
|
||||
/// Sets the medium class's control height to the platform's stated value.
|
||||
pub fn set_control_height(&mut self, medium_control_height: Pixels) {
|
||||
let ratio = medium_control_height / self.medium.control_height;
|
||||
self.small.control_height = (self.small.control_height * ratio).floor();
|
||||
self.medium.control_height = medium_control_height;
|
||||
self.large.control_height = (self.large.control_height * ratio).floor();
|
||||
}
|
||||
|
||||
/// Sets the medium class's menu row height to the platform's stated value.
|
||||
pub fn set_menu_item_height(&mut self, medium_menu_item_height: Pixels) {
|
||||
let ratio = medium_menu_item_height / self.medium.menu_item_height;
|
||||
self.small.menu_item_height *= ratio;
|
||||
self.medium.menu_item_height = medium_menu_item_height;
|
||||
self.large.menu_item_height *= ratio;
|
||||
}
|
||||
|
||||
/// Sets the medium class's switch dimensions to the platform's stated values.
|
||||
pub fn set_switch_metrics(&mut self, track_height: Pixels, track_width: Pixels, knob: Pixels) {
|
||||
let ratio = track_height / self.medium.switch_height;
|
||||
for metrics in [&mut self.small, &mut self.large] {
|
||||
metrics.switch_height *= ratio;
|
||||
metrics.switch_width *= ratio;
|
||||
metrics.switch_knob *= ratio;
|
||||
}
|
||||
self.medium.switch_height = track_height;
|
||||
self.medium.switch_width = track_width;
|
||||
self.medium.switch_knob = knob;
|
||||
}
|
||||
}
|
||||
|
||||
/// User customizations layered over the resolved theme.
|
||||
|
||||
+219
-546
File diff suppressed because it is too large
Load Diff
+12
-120
@@ -4,74 +4,40 @@
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use gpui::{Hsla, Pixels, px};
|
||||
use gpui::Hsla;
|
||||
|
||||
use crate::system::{PartialPalette, SourceKind, SystemTheme};
|
||||
use crate::system::{SourceKind, SystemTheme};
|
||||
|
||||
/// The colors stated in kdeglobals' `[Colors:*]` groups.
|
||||
/// The accent and window background stated in kdeglobals.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq)]
|
||||
pub(crate) struct KdeScheme {
|
||||
pub(crate) accent: Option<Hsla>,
|
||||
pub(crate) background: Option<Hsla>,
|
||||
pub(crate) palette: PartialPalette,
|
||||
/// The root font size parsed from `[General] font=` (family, pointSize,
|
||||
/// pixelSize, ...).
|
||||
pub(crate) root_font_size: Option<Pixels>,
|
||||
}
|
||||
|
||||
impl KdeScheme {
|
||||
/// Parses kdeglobals text.
|
||||
pub(crate) fn parse(text: &str) -> Self {
|
||||
let groups = parse_groups(text);
|
||||
let window = groups.get("Colors:Window");
|
||||
let view = groups.get("Colors:View");
|
||||
let button = groups.get("Colors:Button");
|
||||
let selection = groups.get("Colors:Selection");
|
||||
|
||||
let background = window.and_then(|group| group_color(group, "BackgroundNormal"));
|
||||
let background = groups
|
||||
.get("Colors:Window")
|
||||
.and_then(|group| group_color(group, "BackgroundNormal"));
|
||||
|
||||
let accent = groups
|
||||
.get("General")
|
||||
.and_then(|group| group.get("AccentColor"))
|
||||
.and_then(|value| color_list(value));
|
||||
|
||||
let palette = PartialPalette {
|
||||
background,
|
||||
foreground: window.and_then(|group| group_color(group, "ForegroundNormal")),
|
||||
surface: view.and_then(|group| group_color(group, "BackgroundNormal")),
|
||||
surface_foreground: view.and_then(|group| group_color(group, "ForegroundNormal")),
|
||||
secondary: button.and_then(|group| group_color(group, "BackgroundNormal")),
|
||||
secondary_foreground: button.and_then(|group| group_color(group, "ForegroundNormal")),
|
||||
muted: window.and_then(|group| group_color(group, "DecorationHover")),
|
||||
muted_foreground: window.and_then(|group| group_color(group, "ForegroundInactive")),
|
||||
destructive: window.and_then(|group| group_color(group, "ForegroundNegative")),
|
||||
success: window.and_then(|group| group_color(group, "ForegroundPositive")),
|
||||
border: window.and_then(|group| group_color(group, "DecorationNormal")),
|
||||
ring: window.and_then(|group| group_color(group, "DecorationFocus")),
|
||||
selection: selection.and_then(|group| group_color(group, "BackgroundNormal")),
|
||||
primary_foreground: selection.and_then(|group| group_color(group, "ForegroundNormal")),
|
||||
..PartialPalette::default()
|
||||
};
|
||||
|
||||
Self {
|
||||
accent,
|
||||
background,
|
||||
palette,
|
||||
root_font_size: root_font_size(groups.get("General")),
|
||||
}
|
||||
Self { accent, background }
|
||||
}
|
||||
|
||||
pub(crate) fn into_system(
|
||||
mut self,
|
||||
self,
|
||||
accessibility: crate::system::AccessibilityPreferences,
|
||||
portal_accent: Option<Hsla>,
|
||||
portal_variant: Option<crate::ThemeVariant>,
|
||||
) -> SystemTheme {
|
||||
// Schemes that state no DecorationFocus fall back to the accent.
|
||||
if self.palette.ring.is_none() {
|
||||
self.palette.ring = self.accent;
|
||||
}
|
||||
|
||||
SystemTheme {
|
||||
// The portal states the mode on Plasma 5.21+.
|
||||
//
|
||||
@@ -80,18 +46,6 @@ impl KdeScheme {
|
||||
.or(self.background.map(crate::ThemeVariant::by_lightness))
|
||||
.unwrap_or(crate::ThemeVariant::Light),
|
||||
accent: self.accent.or(portal_accent),
|
||||
palette: self.palette,
|
||||
control_radius: Some(px(5.)),
|
||||
overlay_radius: Some(px(5.)),
|
||||
sm_radius: None,
|
||||
control_height: Some(px(33.)),
|
||||
input_height: Some(px(29.)),
|
||||
menu_item_height: Some(px(29.)),
|
||||
switch_height: Some(px(18.)),
|
||||
switch_width: Some(px(36.)),
|
||||
switch_knob: Some(px(18.)),
|
||||
titlebar_height: Some(px(44.)),
|
||||
root_font_size: Some(self.root_font_size.unwrap_or(px(13.33))),
|
||||
accessibility,
|
||||
window_background: None,
|
||||
source: SourceKind::Kde,
|
||||
@@ -99,22 +53,6 @@ impl KdeScheme {
|
||||
}
|
||||
}
|
||||
|
||||
/// 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();
|
||||
let points = fields.get(1)?.parse::<f32>().ok()?;
|
||||
let pixels = fields
|
||||
.get(2)
|
||||
.and_then(|size| size.parse::<f32>().ok())
|
||||
.unwrap_or(-1.0);
|
||||
let size = if pixels > 0.0 {
|
||||
pixels
|
||||
} else {
|
||||
points * 96.0 / 72.0
|
||||
};
|
||||
(size > 0.0).then(|| px(size))
|
||||
}
|
||||
|
||||
fn parse_groups(text: &str) -> HashMap<&str, HashMap<&str, &str>> {
|
||||
let mut groups: HashMap<&str, HashMap<&str, &str>> = HashMap::new();
|
||||
let mut section: Option<&str> = None;
|
||||
@@ -236,10 +174,10 @@ activeBackground=39,44,49
|
||||
";
|
||||
|
||||
#[test]
|
||||
fn breeze_groups_map_onto_roles() {
|
||||
fn breeze_states_the_window_background() {
|
||||
let scheme = KdeScheme::parse(BREEZE_DARK);
|
||||
let scale = |component: u32| component as f32 / 255.0;
|
||||
let background = scheme.palette.background.expect("window background");
|
||||
let background = scheme.background.expect("window background");
|
||||
|
||||
assert_eq!(
|
||||
gpui::Rgba::from(background),
|
||||
@@ -250,41 +188,12 @@ activeBackground=39,44,49
|
||||
a: 1.0,
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
scheme.palette.selection,
|
||||
Some(Hsla::from(gpui::Rgba {
|
||||
r: scale(61),
|
||||
g: scale(174),
|
||||
b: scale(233),
|
||||
a: 1.0,
|
||||
}))
|
||||
);
|
||||
assert_eq!(
|
||||
scheme.palette.muted_foreground,
|
||||
Some(Hsla::from(gpui::Rgba {
|
||||
r: scale(161),
|
||||
g: scale(169),
|
||||
b: scale(177),
|
||||
a: 1.0,
|
||||
}))
|
||||
);
|
||||
assert_eq!(
|
||||
scheme.palette.destructive,
|
||||
Some(Hsla::from(gpui::Rgba {
|
||||
r: scale(218),
|
||||
g: scale(68),
|
||||
b: scale(83),
|
||||
a: 1.0,
|
||||
}))
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn localized_and_unrelated_keys_are_ignored() {
|
||||
let scheme = KdeScheme::parse(BREEZE_DARK);
|
||||
|
||||
assert!(scheme.accent.is_none());
|
||||
assert_eq!(scheme.palette.foreground, scheme.palette.surface_foreground);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -329,29 +238,12 @@ activeBackground=39,44,49
|
||||
assert_eq!(system.variant, crate::ThemeVariant::Light);
|
||||
}
|
||||
|
||||
#[test]
|
||||
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));
|
||||
}
|
||||
|
||||
#[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());
|
||||
assert!(above.background.is_none());
|
||||
|
||||
let below = KdeScheme::parse("[Colors:Window]\nBackgroundNormal=-5,20,20\n");
|
||||
assert!(below.palette.background.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_stated_font_beats_the_default() {
|
||||
let text = "[General]\nfont=Noto Sans,10,-1,5,50,0,0,0,0,0\n";
|
||||
let system = KdeScheme::parse(text).into_system(Default::default(), None, None);
|
||||
assert!((system.root_font_size.unwrap() - px(10.0 * 96.0 / 72.0)).abs() < px(0.01));
|
||||
|
||||
let text = "[General]\nfont=Adwaita Sans,-1,12,5,50,0,0,0,0,0\n";
|
||||
let system = KdeScheme::parse(text).into_system(Default::default(), None, None);
|
||||
assert_eq!(system.root_font_size, Some(px(12.)));
|
||||
assert!(below.background.is_none());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
//! Linux adapter selection: Omarchy → KDE → portal (GNOME/generic) →
|
||||
//! fallback, per the plan's detection cascade. Omarchy and KDE palettes come
|
||||
//! from their files; the portal supplements mode, accent, and the
|
||||
//! accessibility flags; `gsettings` covers sessions without a portal.
|
||||
//! fallback, per the plan's detection cascade. Omarchy and KDE state the mode
|
||||
//! and accent; the portal supplements both with the accessibility flags;
|
||||
//! `gsettings` covers sessions without a portal.
|
||||
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use gpui::{Hsla, Pixels};
|
||||
use gpui::Hsla;
|
||||
use notify::{RecursiveMode, Watcher};
|
||||
|
||||
use super::ThemeSource;
|
||||
@@ -16,26 +16,7 @@ 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;
|
||||
use crate::system::{SourceKind, SystemTheme};
|
||||
|
||||
pub(crate) struct LinuxSource {
|
||||
backend: Backend,
|
||||
@@ -87,7 +68,6 @@ fn detect(home: &Path, portal_reachable: bool, gsettings_reachable: bool) -> Bac
|
||||
struct GSettingsSnapshot {
|
||||
variant: Option<ThemeVariant>,
|
||||
accent: Option<Hsla>,
|
||||
root_font_size: Option<Pixels>,
|
||||
}
|
||||
|
||||
fn gsettings_value(args: &[&str]) -> Option<String> {
|
||||
@@ -129,22 +109,10 @@ fn read_gsettings() -> Option<GSettingsSnapshot> {
|
||||
let accent = gsettings_value(&["get", "org.gnome.desktop.interface", "accent-color"])
|
||||
.and_then(|value| accent_rgb(value.trim().trim_matches('\'')));
|
||||
|
||||
let root_font_size = gsettings_value(&["get", "org.gnome.desktop.interface", "font-name"])
|
||||
.and_then(|value| font_root_px(value.trim().trim_matches('\'')));
|
||||
|
||||
if variant.is_none() && accent.is_none() && root_font_size.is_none() {
|
||||
if variant.is_none() && accent.is_none() {
|
||||
return None;
|
||||
}
|
||||
Some(GSettingsSnapshot {
|
||||
variant,
|
||||
accent,
|
||||
root_font_size,
|
||||
})
|
||||
}
|
||||
|
||||
fn font_root_px(name: &str) -> Option<Pixels> {
|
||||
let points = name.split_whitespace().last()?.parse::<f32>().ok()?;
|
||||
(points > 0.0).then(|| gpui::px(points * 96.0 / 72.0))
|
||||
Some(GSettingsSnapshot { variant, accent })
|
||||
}
|
||||
|
||||
pub(crate) fn platform_source() -> Box<dyn ThemeSource> {
|
||||
@@ -174,22 +142,6 @@ impl LinuxSource {
|
||||
SystemTheme {
|
||||
variant,
|
||||
accent,
|
||||
palette: PartialPalette::default(),
|
||||
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(ROOT_FONT_SIZE_PX)),
|
||||
),
|
||||
accessibility,
|
||||
window_background: None,
|
||||
source: SourceKind::Gnome,
|
||||
@@ -358,25 +310,7 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_gsettings_font_name_states_the_root_font_size() {
|
||||
assert_eq!(
|
||||
font_root_px("Adwaita Sans 11"),
|
||||
Some(gpui::px(11.0 * 96.0 / 72.0))
|
||||
);
|
||||
assert_eq!(
|
||||
font_root_px("Noto Sans 10"),
|
||||
Some(gpui::px(10.0 * 96.0 / 72.0))
|
||||
);
|
||||
assert_eq!(
|
||||
font_root_px("Cantarell Bold 12.5"),
|
||||
Some(gpui::px(12.5 * 96.0 / 72.0))
|
||||
);
|
||||
assert_eq!(font_root_px("Adwaita Sans"), None);
|
||||
assert_eq!(font_root_px("Sans 0"), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_gnome_snapshot_labels_gnome_and_defaults_the_root_font() {
|
||||
fn the_gnome_snapshot_labels_gnome() {
|
||||
let source = LinuxSource {
|
||||
backend: Backend::Portal,
|
||||
portal: None,
|
||||
@@ -391,7 +325,7 @@ mod tests {
|
||||
);
|
||||
|
||||
assert_eq!(system.source, SourceKind::Gnome);
|
||||
// The default 11pt font when gsettings states none.
|
||||
assert_eq!(system.root_font_size, Some(gpui::px(ROOT_FONT_SIZE_PX)));
|
||||
assert_eq!(system.variant, ThemeVariant::Light);
|
||||
assert_eq!(system.accent, None);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
//! macOS Adapter
|
||||
//!
|
||||
//! Reads AppKit's semantic colors in the effective appearance and watches
|
||||
//! the system's color preferences.
|
||||
//! Reads the system accent and watches the system's color preferences.
|
||||
|
||||
use objc2::rc::Retained;
|
||||
use objc2::runtime::{AnyObject, NSObject};
|
||||
use objc2::{AnyThread, DefinedClass, define_class, msg_send, sel};
|
||||
use objc2_app_kit::{
|
||||
NSAppearance, NSAppearanceNameAqua, NSAppearanceNameDarkAqua, NSColor, NSColorSpace,
|
||||
NSWorkspace, NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification,
|
||||
NSColor, NSColorSpace, NSWorkspace, NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification,
|
||||
};
|
||||
use objc2_foundation::{
|
||||
NSDictionary, NSDistributedNotificationCenter, NSKeyValueObservingOptions, NSNotification,
|
||||
@@ -20,24 +18,7 @@ use super::narrow_component;
|
||||
use super::ThemeSource;
|
||||
use super::signal::ReapplySignal;
|
||||
use crate::ThemeVariant;
|
||||
use crate::system::{AccessibilityPreferences, PartialPalette, SourceKind, SystemTheme};
|
||||
|
||||
/// Default control radius for macOS controls.
|
||||
const CONTROL_RADIUS_PTS: f32 = 6.0;
|
||||
/// The text field's intrinsic height at regular size, square or rounded bezel alike.
|
||||
const INPUT_HEIGHT_PTS: f32 = 24.0;
|
||||
/// AppKit's regular push button, measured via `NSButton::fittingSize`.
|
||||
const CONTROL_HEIGHT_PTS: f32 = 24.0;
|
||||
/// The `NSMenu` row height; 20 before the macOS 26 redesign.
|
||||
const MENU_ITEM_HEIGHT_PTS: f32 = 24.0;
|
||||
/// `NSSwitch`, measured via `fittingSize`.
|
||||
const SWITCH_TRACK_HEIGHT_PTS: f32 = 24.0;
|
||||
const SWITCH_TRACK_WIDTH_PTS: f32 = 54.0;
|
||||
const SWITCH_KNOB_PTS: f32 = 20.0;
|
||||
/// The standard titled window's titlebar, measured via `contentLayoutRect`.
|
||||
const TITLEBAR_HEIGHT_PTS: f32 = 32.0;
|
||||
/// The HIG's default body text on macOS is 13 pt (system font size 13 at 1x).
|
||||
const ROOT_FONT_SIZE_PTS: f32 = 13.0;
|
||||
use crate::system::{AccessibilityPreferences, SourceKind, SystemTheme};
|
||||
|
||||
// An observer that forwards distributed notifications and preference.
|
||||
define_class!(
|
||||
@@ -91,58 +72,6 @@ impl MacosSource {
|
||||
a: narrow_component(converted.alphaComponent()),
|
||||
}))
|
||||
}
|
||||
|
||||
/// Resolves the semantic colors with `variant` as the current drawing appearance.
|
||||
fn snapshot_in_appearance(&self, variant: ThemeVariant) -> PartialPalette {
|
||||
let name = match variant {
|
||||
ThemeVariant::Light => {
|
||||
// SAFETY: extern statics exported by AppKit, always initialized.
|
||||
unsafe { NSAppearanceNameAqua }
|
||||
}
|
||||
ThemeVariant::Dark => {
|
||||
// SAFETY: as above.
|
||||
unsafe { NSAppearanceNameDarkAqua }
|
||||
}
|
||||
};
|
||||
|
||||
let Some(appearance) = NSAppearance::appearanceNamed(name) else {
|
||||
return self.read_palette();
|
||||
};
|
||||
|
||||
let palette = std::cell::Cell::new(PartialPalette::default());
|
||||
appearance.performAsCurrentDrawingAppearance(&block2::RcBlock::new(|| {
|
||||
palette.set(self.read_palette());
|
||||
}));
|
||||
|
||||
palette.into_inner()
|
||||
}
|
||||
|
||||
fn read_palette(&self) -> PartialPalette {
|
||||
PartialPalette {
|
||||
background: Self::color_to_hsla(&NSColor::windowBackgroundColor()),
|
||||
foreground: Self::color_to_hsla(&NSColor::labelColor()),
|
||||
surface: Self::color_to_hsla(&NSColor::textBackgroundColor()),
|
||||
surface_foreground: Self::color_to_hsla(&NSColor::labelColor()),
|
||||
sidebar: Self::color_to_hsla(&NSColor::windowBackgroundColor()),
|
||||
primary_foreground: Self::color_to_hsla(&NSColor::alternateSelectedControlTextColor()),
|
||||
accent_foreground: Self::color_to_hsla(&NSColor::alternateSelectedControlTextColor()),
|
||||
secondary: None,
|
||||
secondary_foreground: Self::color_to_hsla(&NSColor::secondaryLabelColor()),
|
||||
muted: None,
|
||||
muted_hover: None,
|
||||
muted_foreground: Self::color_to_hsla(&NSColor::secondaryLabelColor()),
|
||||
destructive: Self::color_to_hsla(&NSColor::systemRedColor()),
|
||||
success: None,
|
||||
warning: None,
|
||||
info: None,
|
||||
border: Self::color_to_hsla(&NSColor::separatorColor()),
|
||||
input: Self::color_to_hsla(&NSColor::controlBackgroundColor()),
|
||||
ring: Self::color_to_hsla(&NSColor::keyboardFocusIndicatorColor()),
|
||||
selection: Self::color_to_hsla(&NSColor::selectedTextBackgroundColor()),
|
||||
overlay: None,
|
||||
scrollbar_thumb: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ThemeSource for MacosSource {
|
||||
@@ -155,26 +84,12 @@ impl ThemeSource for MacosSource {
|
||||
reduce_transparency: workspace.accessibilityDisplayShouldReduceTransparency(),
|
||||
};
|
||||
|
||||
let palette = self.snapshot_in_appearance(variant);
|
||||
|
||||
SystemTheme {
|
||||
variant,
|
||||
accent: Self::color_to_hsla(&NSColor::controlAccentColor()),
|
||||
palette,
|
||||
accessibility,
|
||||
// macOS blurs what is behind the window natively.
|
||||
window_background: Some(gpui::WindowBackgroundAppearance::Blurred),
|
||||
control_radius: Some(gpui::px(CONTROL_RADIUS_PTS)),
|
||||
overlay_radius: None,
|
||||
sm_radius: None,
|
||||
control_height: Some(gpui::px(CONTROL_HEIGHT_PTS)),
|
||||
input_height: Some(gpui::px(INPUT_HEIGHT_PTS)),
|
||||
menu_item_height: Some(gpui::px(MENU_ITEM_HEIGHT_PTS)),
|
||||
switch_height: Some(gpui::px(SWITCH_TRACK_HEIGHT_PTS)),
|
||||
switch_width: Some(gpui::px(SWITCH_TRACK_WIDTH_PTS)),
|
||||
switch_knob: Some(gpui::px(SWITCH_KNOB_PTS)),
|
||||
titlebar_height: Some(gpui::px(TITLEBAR_HEIGHT_PTS)),
|
||||
root_font_size: Some(gpui::px(ROOT_FONT_SIZE_PTS)),
|
||||
accessibility,
|
||||
source: SourceKind::Macos,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,15 +5,14 @@
|
||||
use gpui::Hsla;
|
||||
use toml::Table;
|
||||
|
||||
use crate::system::{PartialPalette, SourceKind, SystemTheme};
|
||||
use crate::system::{SourceKind, SystemTheme};
|
||||
use crate::{AccessibilityPreferences, ThemeVariant};
|
||||
|
||||
/// The palette Omarchy deploys with the current theme.
|
||||
/// The mode and accent Omarchy deploys with the current theme.
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
pub(crate) struct OmarchyTheme {
|
||||
pub(crate) variant: ThemeVariant,
|
||||
pub(crate) accent: Option<Hsla>,
|
||||
pub(crate) palette: PartialPalette,
|
||||
}
|
||||
|
||||
impl OmarchyTheme {
|
||||
@@ -21,7 +20,6 @@ impl OmarchyTheme {
|
||||
let table = text.parse::<Table>().ok()?;
|
||||
|
||||
let background = hex_color(&table, "background")?;
|
||||
let foreground = hex_color(&table, "foreground")?;
|
||||
|
||||
let variant = table
|
||||
.get("mode")
|
||||
@@ -30,47 +28,14 @@ impl OmarchyTheme {
|
||||
.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");
|
||||
let muted_foreground =
|
||||
hex_color(&table, "dark_foreground").or_else(|| hex_color(&table, "color8"));
|
||||
|
||||
let palette = PartialPalette {
|
||||
background: Some(background),
|
||||
foreground: Some(foreground),
|
||||
surface: hex_color(&table, "lighter_background"),
|
||||
surface_foreground: Some(foreground),
|
||||
muted_foreground,
|
||||
destructive: hex_color(&table, "red").or_else(|| hex_color(&table, "color1")),
|
||||
success: hex_color(&table, "green").or_else(|| hex_color(&table, "color2")),
|
||||
warning: hex_color(&table, "yellow").or_else(|| hex_color(&table, "orange")),
|
||||
ring: accent,
|
||||
selection,
|
||||
..PartialPalette::default()
|
||||
};
|
||||
|
||||
Some(Self {
|
||||
variant,
|
||||
accent,
|
||||
palette,
|
||||
})
|
||||
Some(Self { variant, accent })
|
||||
}
|
||||
|
||||
pub(crate) fn into_system(self, accessibility: AccessibilityPreferences) -> SystemTheme {
|
||||
SystemTheme {
|
||||
variant: self.variant,
|
||||
accent: self.accent,
|
||||
palette: self.palette,
|
||||
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: None,
|
||||
root_font_size: None,
|
||||
accessibility,
|
||||
window_background: None,
|
||||
source: SourceKind::Omarchy,
|
||||
@@ -171,25 +136,11 @@ color15 = \"#635d6f\"
|
||||
";
|
||||
|
||||
#[test]
|
||||
fn semantic_keys_map_onto_roles() {
|
||||
fn semantic_keys_state_the_mode_and_accent() {
|
||||
let theme = OmarchyTheme::parse(TOKYO_NIGHT).expect("tokyo-night parses");
|
||||
|
||||
assert_eq!(theme.variant, ThemeVariant::Dark);
|
||||
assert_eq!(theme.accent, Some(Hsla::from(gpui::rgb(0x7aa2f7))));
|
||||
|
||||
let palette = theme.palette;
|
||||
let background = palette.background.expect("background stated");
|
||||
assert_eq!(background, Hsla::from(gpui::rgb(0x1a1b26)));
|
||||
assert_eq!(palette.surface, Some(Hsla::from(gpui::rgb(0x24283b))));
|
||||
assert_eq!(
|
||||
palette.muted_foreground,
|
||||
Some(Hsla::from(gpui::rgb(0x565f89)))
|
||||
);
|
||||
assert_eq!(palette.destructive, Some(Hsla::from(gpui::rgb(0xf7768e))));
|
||||
assert_eq!(palette.success, Some(Hsla::from(gpui::rgb(0x9ece6a))));
|
||||
assert_eq!(palette.warning, Some(Hsla::from(gpui::rgb(0xe0af68))));
|
||||
assert_eq!(palette.selection, Some(Hsla::from(gpui::rgb(0x292e42))));
|
||||
assert_eq!(palette.ring, theme.accent);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -198,14 +149,6 @@ color15 = \"#635d6f\"
|
||||
|
||||
assert_eq!(theme.variant, ThemeVariant::Light);
|
||||
assert_eq!(theme.accent, Some(Hsla::from(gpui::rgb(0x0060ff))));
|
||||
assert_eq!(
|
||||
theme.palette.destructive,
|
||||
Some(Hsla::from(gpui::rgb(0xab2833)))
|
||||
);
|
||||
assert_eq!(
|
||||
theme.palette.muted_foreground,
|
||||
Some(Hsla::from(gpui::rgb(0x625e6a)))
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -216,11 +159,12 @@ color15 = \"#635d6f\"
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn omarchy_states_no_titlebar_or_root_font() {
|
||||
fn the_system_snapshot_keeps_only_mode_and_accent() {
|
||||
let theme = OmarchyTheme::parse(TOKYO_NIGHT).expect("parses");
|
||||
let system = theme.into_system(Default::default());
|
||||
|
||||
assert_eq!(system.titlebar_height, None);
|
||||
assert_eq!(system.root_font_size, None);
|
||||
assert_eq!(system.variant, ThemeVariant::Dark);
|
||||
assert_eq!(system.accent, theme.accent);
|
||||
assert_eq!(system.source, SourceKind::Omarchy);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
//! Windows 11 adapter: WinRT `UISettings` semantic colors with a
|
||||
//! Windows 11 adapter: WinRT `UISettings` accent and background with a
|
||||
//! `Personalize` registry fallback, watched through `ColorValuesChanged`,
|
||||
//! `TextScaleFactorChanged`, `AdvancedEffectsEnabledChanged`, and
|
||||
//! `HighContrastChanged`.
|
||||
//! `AdvancedEffectsEnabledChanged`, and `HighContrastChanged`.
|
||||
|
||||
use windows::Foundation::TypedEventHandler;
|
||||
use windows::UI::ViewManagement::{AccessibilitySettings, UIColorType, UISettings};
|
||||
@@ -12,26 +11,7 @@ use windows::core::IInspectable;
|
||||
use super::ThemeSource;
|
||||
use super::signal::ReapplySignal;
|
||||
use crate::ThemeVariant;
|
||||
use crate::system::{AccessibilityPreferences, PartialPalette, SourceKind, SystemTheme};
|
||||
|
||||
/// WinUI 11's `ControlCornerRadius`, in pixels at 100% scaling.
|
||||
const CONTROL_RADIUS_PX: f32 = 4.0;
|
||||
/// WinUI 11's `OverlayCornerRadius`, in pixels at 100% scaling.
|
||||
const OVERLAY_RADIUS_PX: f32 = 8.0;
|
||||
/// WinUI 11's default text-box height, in pixels at 100% scaling.
|
||||
const INPUT_HEIGHT_PX: f32 = 32.0;
|
||||
/// The default button height, in pixels at 100% scaling.
|
||||
const CONTROL_HEIGHT_PX: f32 = 32.0;
|
||||
/// The default menu row: item padding 4/5 + a 20px Body line + 2px item margins.
|
||||
const MENU_ITEM_HEIGHT_PX: f32 = 33.0;
|
||||
/// ToggleSwitch: a 40x20 track with a 12px resting knob.
|
||||
const SWITCH_TRACK_HEIGHT_PX: f32 = 20.0;
|
||||
const SWITCH_TRACK_WIDTH_PX: f32 = 40.0;
|
||||
const SWITCH_KNOB_PX: f32 = 12.0;
|
||||
/// The window caption's height, in pixels at 100% scaling, as Win32 reports it.
|
||||
const TITLEBAR_HEIGHT_PX: f32 = 32.0;
|
||||
/// WinUI 11's default body text size, in pixels at 100% scaling.
|
||||
const ROOT_FONT_SIZE_PX: f32 = 14.0;
|
||||
use crate::system::{AccessibilityPreferences, SourceKind, SystemTheme};
|
||||
|
||||
/// The `Personalize` registry values and the OS build number.
|
||||
#[derive(Clone, Copy, Debug, Default)]
|
||||
@@ -159,7 +139,6 @@ impl ThemeSource for WindowsSource {
|
||||
fn snapshot(&self, variant: ThemeVariant) -> SystemTheme {
|
||||
let accent = self.color(UIColorType::Accent);
|
||||
let background = self.color(UIColorType::Background);
|
||||
let foreground = self.color(UIColorType::Foreground);
|
||||
|
||||
let variant = background
|
||||
.map(ThemeVariant::by_lightness)
|
||||
@@ -172,30 +151,9 @@ impl ThemeSource for WindowsSource {
|
||||
}))
|
||||
.unwrap_or(variant);
|
||||
|
||||
let text_scale = self.ui_settings.TextScaleFactor().unwrap_or(1.0);
|
||||
|
||||
SystemTheme {
|
||||
variant,
|
||||
accent,
|
||||
// Windows states its ramp through UIColorType's accent variants.
|
||||
palette: PartialPalette {
|
||||
background,
|
||||
foreground,
|
||||
// Windows paints keyboard focus with the accent itself.
|
||||
ring: accent,
|
||||
..PartialPalette::default()
|
||||
},
|
||||
control_radius: Some(gpui::px(CONTROL_RADIUS_PX)),
|
||||
overlay_radius: Some(gpui::px(OVERLAY_RADIUS_PX)),
|
||||
sm_radius: None,
|
||||
control_height: Some(gpui::px(CONTROL_HEIGHT_PX)),
|
||||
input_height: Some(gpui::px(INPUT_HEIGHT_PX)),
|
||||
menu_item_height: Some(gpui::px(MENU_ITEM_HEIGHT_PX)),
|
||||
switch_height: Some(gpui::px(SWITCH_TRACK_HEIGHT_PX)),
|
||||
switch_width: Some(gpui::px(SWITCH_TRACK_WIDTH_PX)),
|
||||
switch_knob: Some(gpui::px(SWITCH_KNOB_PX)),
|
||||
titlebar_height: Some(gpui::px(TITLEBAR_HEIGHT_PX)),
|
||||
root_font_size: Some(gpui::px(ROOT_FONT_SIZE_PX * text_scale as f32)),
|
||||
accessibility: self.accessibility(),
|
||||
window_background: self.window_material(),
|
||||
source: SourceKind::Windows,
|
||||
@@ -214,16 +172,6 @@ impl ThemeSource for WindowsSource {
|
||||
log::warn!("theme: color change watch failed: {error}");
|
||||
}
|
||||
|
||||
let scale_signal = signal.sender();
|
||||
let scale_handler = TypedEventHandler::<UISettings, IInspectable>::new(move |_, _| {
|
||||
ReapplySignal::poke(&scale_signal);
|
||||
Ok(())
|
||||
});
|
||||
|
||||
if let Err(error) = self.ui_settings.TextScaleFactorChanged(&scale_handler) {
|
||||
log::warn!("theme: text scale watch failed: {error}");
|
||||
}
|
||||
|
||||
let effects_signal = signal.sender();
|
||||
let effects_handler = TypedEventHandler::<UISettings, IInspectable>::new(move |_, _| {
|
||||
ReapplySignal::poke(&effects_signal);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//! The normalized snapshot a platform adapter produces.
|
||||
|
||||
use gpui::{Hsla, Pixels, WindowBackgroundAppearance, px};
|
||||
use gpui::{Hsla, WindowBackgroundAppearance};
|
||||
|
||||
use crate::ThemeVariant;
|
||||
|
||||
@@ -43,49 +43,6 @@ impl SourceKind {
|
||||
pub fn scrollbar_autohide(self) -> bool {
|
||||
matches!(self, Self::Macos | Self::Omarchy | Self::Gnome)
|
||||
}
|
||||
|
||||
/// The base spacing unit:
|
||||
///
|
||||
/// - GNOME lays out on a 6px grid
|
||||
/// - Other platform on 4px grid
|
||||
pub fn spacing_unit(self) -> Pixels {
|
||||
match self {
|
||||
Self::Gnome | Self::Omarchy => px(6.),
|
||||
_ => px(4.),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A partial palette with optional colors.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq)]
|
||||
pub struct PartialPalette {
|
||||
pub background: Option<Hsla>,
|
||||
pub foreground: Option<Hsla>,
|
||||
pub surface: Option<Hsla>,
|
||||
pub surface_foreground: Option<Hsla>,
|
||||
/// Only macOS states it, the window backdrop its sidebars show.
|
||||
pub sidebar: Option<Hsla>,
|
||||
pub primary_foreground: Option<Hsla>,
|
||||
pub accent_foreground: Option<Hsla>,
|
||||
pub secondary: Option<Hsla>,
|
||||
pub secondary_foreground: Option<Hsla>,
|
||||
pub muted: Option<Hsla>,
|
||||
/// No platform states a hover wash, presets override it.
|
||||
pub muted_hover: Option<Hsla>,
|
||||
pub muted_foreground: Option<Hsla>,
|
||||
pub destructive: Option<Hsla>,
|
||||
/// No platform states severity colors, presets override them.
|
||||
pub success: Option<Hsla>,
|
||||
pub warning: Option<Hsla>,
|
||||
pub info: Option<Hsla>,
|
||||
pub border: Option<Hsla>,
|
||||
pub input: Option<Hsla>,
|
||||
pub ring: Option<Hsla>,
|
||||
pub selection: Option<Hsla>,
|
||||
/// No platform states a scrim color; preset and user files override it.
|
||||
pub overlay: Option<Hsla>,
|
||||
/// No platform states a scrollbar thumb color; presets override it.
|
||||
pub scrollbar_thumb: Option<Hsla>,
|
||||
}
|
||||
|
||||
/// A normalized snapshot of the running system's theme.
|
||||
@@ -93,29 +50,6 @@ pub struct PartialPalette {
|
||||
pub struct SystemTheme {
|
||||
pub variant: ThemeVariant,
|
||||
pub accent: Option<Hsla>,
|
||||
pub palette: PartialPalette,
|
||||
/// The platform's stated control corner radius, if it has one.
|
||||
pub control_radius: Option<Pixels>,
|
||||
/// The platform's stated menu/popover radius, if it has one.
|
||||
pub overlay_radius: Option<Pixels>,
|
||||
/// The platform's stated checkbox radius, if it has one.
|
||||
pub sm_radius: Option<Pixels>,
|
||||
/// The platform's stated control height, if it has one.
|
||||
pub control_height: Option<Pixels>,
|
||||
/// The platform's stated text-field height, if it has one.
|
||||
pub input_height: Option<Pixels>,
|
||||
/// The platform's stated menu row height, if it has one.
|
||||
pub menu_item_height: Option<Pixels>,
|
||||
/// The platform's stated switch track height, if it has one.
|
||||
pub switch_height: Option<Pixels>,
|
||||
/// The platform's stated switch track width, if it has one.
|
||||
pub switch_width: Option<Pixels>,
|
||||
/// The platform's stated switch knob size, if it has one.
|
||||
pub switch_knob: Option<Pixels>,
|
||||
/// The platform's native titlebar height, if it states one.
|
||||
pub titlebar_height: Option<Pixels>,
|
||||
/// The platform's native root font size, if it has one.
|
||||
pub root_font_size: Option<Pixels>,
|
||||
pub accessibility: AccessibilityPreferences,
|
||||
/// The window material the platform natively applies, if any.
|
||||
pub window_background: Option<WindowBackgroundAppearance>,
|
||||
@@ -127,18 +61,6 @@ impl SystemTheme {
|
||||
Self {
|
||||
variant,
|
||||
accent: None,
|
||||
palette: PartialPalette::default(),
|
||||
control_radius: None,
|
||||
overlay_radius: None,
|
||||
sm_radius: None,
|
||||
control_height: None,
|
||||
input_height: None,
|
||||
menu_item_height: None,
|
||||
switch_height: None,
|
||||
switch_width: None,
|
||||
switch_knob: None,
|
||||
titlebar_height: None,
|
||||
root_font_size: None,
|
||||
accessibility: AccessibilityPreferences::default(),
|
||||
window_background: None,
|
||||
source: SourceKind::Fallback,
|
||||
|
||||
+65
-387
@@ -1,224 +1,29 @@
|
||||
//! The platform's type ladder: eleven roles resolved from the OS's own text
|
||||
//! styles.
|
||||
//!
|
||||
//! Each [`SourceKind`] paints its stated ramp — Apple's macOS built-in text
|
||||
//! styles, WinUI's type ramp, GTK 4's typography classes, Kirigami's heading
|
||||
//! levels — and every rung scales with the theme's root font size, the way
|
||||
//! XAML text scaling and GTK's relative font sizes work. Platforms that state
|
||||
//! no styles paint the neutral ladder.
|
||||
//! One type ladder shared by every platform, scaled by the theme's root font
|
||||
//! size.
|
||||
|
||||
use gpui::{App, FontWeight, Pixels, Styled, px};
|
||||
|
||||
use crate::ActiveTheme;
|
||||
use crate::system::SourceKind;
|
||||
|
||||
const MACOS_BASE_PX: f32 = 13.0;
|
||||
const WINDOWS_BASE_PX: f32 = 14.0;
|
||||
const GNOME_BASE_PX: f32 = 44.0 / 3.0;
|
||||
const KDE_BASE_PX: f32 = 40.0 / 3.0;
|
||||
const NEUTRAL_BASE_PX: f32 = 16.0;
|
||||
const GNOME_LEADING: f32 = 1.33;
|
||||
const KDE_LEADING: f32 = 1.36;
|
||||
|
||||
/// Apple's macOS built-in text styles (HIG, Typography specifications).
|
||||
const MACOS: [Rung; 11] = [
|
||||
// Large Title
|
||||
(26.0, 32.0, FontWeight::NORMAL),
|
||||
// Title 1
|
||||
(22.0, 26.0, FontWeight::NORMAL),
|
||||
// Title 2
|
||||
(17.0, 22.0, FontWeight::NORMAL),
|
||||
// Title 3
|
||||
(15.0, 20.0, FontWeight::NORMAL),
|
||||
// Headline
|
||||
(13.0, 16.0, FontWeight::SEMIBOLD),
|
||||
// Body
|
||||
(13.0, 16.0, FontWeight::NORMAL),
|
||||
// Callout
|
||||
(12.0, 15.0, FontWeight::NORMAL),
|
||||
// Subheadline
|
||||
(11.0, 14.0, FontWeight::NORMAL),
|
||||
// Footnote
|
||||
(10.0, 13.0, FontWeight::NORMAL),
|
||||
// Caption 1
|
||||
(10.0, 13.0, FontWeight::NORMAL),
|
||||
// Caption 2
|
||||
(10.0, 13.0, FontWeight::MEDIUM),
|
||||
];
|
||||
|
||||
/// WinUI's type ramp (Segoe UI Variable, Windows 11).
|
||||
const WINDOWS: [Rung; 11] = [
|
||||
// TitleLarge
|
||||
(40.0, 52.0, FontWeight::SEMIBOLD),
|
||||
// Title
|
||||
(28.0, 36.0, FontWeight::SEMIBOLD),
|
||||
// Subtitle
|
||||
/// The shared ladder at a 16px root: size, line height, then weight.
|
||||
const LADDER: [Rung; 11] = [
|
||||
(24.0, 32.0, FontWeight::SEMIBOLD),
|
||||
(20.0, 28.0, FontWeight::SEMIBOLD),
|
||||
// BodyLarge
|
||||
(18.0, 24.0, FontWeight::NORMAL),
|
||||
// BodyStrong
|
||||
(14.0, 20.0, FontWeight::SEMIBOLD),
|
||||
// Body
|
||||
(14.0, 20.0, FontWeight::NORMAL),
|
||||
// Body
|
||||
(14.0, 20.0, FontWeight::NORMAL),
|
||||
// Caption
|
||||
(12.0, 16.0, FontWeight::NORMAL),
|
||||
// Caption
|
||||
(12.0, 16.0, FontWeight::NORMAL),
|
||||
// Caption
|
||||
(12.0, 16.0, FontWeight::NORMAL),
|
||||
// Caption
|
||||
(12.0, 16.0, FontWeight::NORMAL),
|
||||
];
|
||||
|
||||
/// GTK 4's typography classes (Adwaita, "General Typography"), stated as
|
||||
/// percentages of the default font.
|
||||
const GNOME: [Rung; 11] = [
|
||||
// large-title: 240%, light
|
||||
(
|
||||
GNOME_BASE_PX * 2.4,
|
||||
GNOME_BASE_PX * 2.4 * GNOME_LEADING,
|
||||
FontWeight::LIGHT,
|
||||
),
|
||||
// title-1: 200%
|
||||
(
|
||||
GNOME_BASE_PX * 2.0,
|
||||
GNOME_BASE_PX * 2.0 * GNOME_LEADING,
|
||||
FontWeight::EXTRA_BOLD,
|
||||
),
|
||||
// title-2: 150%
|
||||
(
|
||||
GNOME_BASE_PX * 1.5,
|
||||
GNOME_BASE_PX * 1.5 * GNOME_LEADING,
|
||||
FontWeight::EXTRA_BOLD,
|
||||
),
|
||||
// title-3: 150%
|
||||
(
|
||||
GNOME_BASE_PX * 1.5,
|
||||
GNOME_BASE_PX * 1.5 * GNOME_LEADING,
|
||||
FontWeight::BOLD,
|
||||
),
|
||||
// heading: 110%
|
||||
(
|
||||
GNOME_BASE_PX * 1.1,
|
||||
GNOME_BASE_PX * 1.1 * GNOME_LEADING,
|
||||
FontWeight::BOLD,
|
||||
),
|
||||
// body: the default font; the HIG's body is control-label size, so the
|
||||
// theme's `.body` class adds a further 10% only where apps ask for it.
|
||||
(
|
||||
GNOME_BASE_PX,
|
||||
GNOME_BASE_PX * GNOME_LEADING,
|
||||
FontWeight::NORMAL,
|
||||
),
|
||||
// body
|
||||
(
|
||||
GNOME_BASE_PX,
|
||||
GNOME_BASE_PX * GNOME_LEADING,
|
||||
FontWeight::NORMAL,
|
||||
),
|
||||
// caption: 90%
|
||||
(
|
||||
GNOME_BASE_PX * 0.9,
|
||||
GNOME_BASE_PX * 0.9 * GNOME_LEADING,
|
||||
FontWeight::NORMAL,
|
||||
),
|
||||
// caption
|
||||
(
|
||||
GNOME_BASE_PX * 0.9,
|
||||
GNOME_BASE_PX * 0.9 * GNOME_LEADING,
|
||||
FontWeight::NORMAL,
|
||||
),
|
||||
// caption
|
||||
(
|
||||
GNOME_BASE_PX * 0.9,
|
||||
GNOME_BASE_PX * 0.9 * GNOME_LEADING,
|
||||
FontWeight::NORMAL,
|
||||
),
|
||||
// caption-heading: 90%
|
||||
(
|
||||
GNOME_BASE_PX * 0.9,
|
||||
GNOME_BASE_PX * 0.9 * GNOME_LEADING,
|
||||
FontWeight::BOLD,
|
||||
),
|
||||
];
|
||||
|
||||
/// Kirigami's heading levels and Plasma's small font (Breeze).
|
||||
const KDE: [Rung; 11] = [
|
||||
// Heading level 1: 1.35×, DemiBold
|
||||
(
|
||||
KDE_BASE_PX * 1.35,
|
||||
KDE_BASE_PX * 1.35 * KDE_LEADING,
|
||||
FontWeight::SEMIBOLD,
|
||||
),
|
||||
// level 2: 1.20×
|
||||
(
|
||||
KDE_BASE_PX * 1.2,
|
||||
KDE_BASE_PX * 1.2 * KDE_LEADING,
|
||||
FontWeight::SEMIBOLD,
|
||||
),
|
||||
// level 3: 1.15×
|
||||
(
|
||||
KDE_BASE_PX * 1.15,
|
||||
KDE_BASE_PX * 1.15 * KDE_LEADING,
|
||||
FontWeight::SEMIBOLD,
|
||||
),
|
||||
// level 4: 1.10×
|
||||
(
|
||||
KDE_BASE_PX * 1.1,
|
||||
KDE_BASE_PX * 1.1 * KDE_LEADING,
|
||||
FontWeight::SEMIBOLD,
|
||||
),
|
||||
// level 5: DemiBold at the default size
|
||||
(KDE_BASE_PX, KDE_BASE_PX * KDE_LEADING, FontWeight::SEMIBOLD),
|
||||
// the default font
|
||||
(KDE_BASE_PX, KDE_BASE_PX * KDE_LEADING, FontWeight::NORMAL),
|
||||
// the default font
|
||||
(KDE_BASE_PX, KDE_BASE_PX * KDE_LEADING, FontWeight::NORMAL),
|
||||
// Plasma's small font (8pt at the 10pt default)
|
||||
(
|
||||
KDE_BASE_PX * 0.8,
|
||||
KDE_BASE_PX * 0.8 * KDE_LEADING,
|
||||
FontWeight::NORMAL,
|
||||
),
|
||||
(
|
||||
KDE_BASE_PX * 0.8,
|
||||
KDE_BASE_PX * 0.8 * KDE_LEADING,
|
||||
FontWeight::NORMAL,
|
||||
),
|
||||
(
|
||||
KDE_BASE_PX * 0.8,
|
||||
KDE_BASE_PX * 0.8 * KDE_LEADING,
|
||||
FontWeight::NORMAL,
|
||||
),
|
||||
// DemiBold, the platform's only stated emphasis weight
|
||||
(
|
||||
KDE_BASE_PX * 0.8,
|
||||
KDE_BASE_PX * 0.8 * KDE_LEADING,
|
||||
FontWeight::SEMIBOLD,
|
||||
),
|
||||
];
|
||||
|
||||
/// The fallback ladder for platforms that state no text styles.
|
||||
const NEUTRAL: [Rung; 11] = [
|
||||
(32.0, 40.0, FontWeight::NORMAL),
|
||||
(24.0, 32.0, FontWeight::NORMAL),
|
||||
(20.0, 26.0, FontWeight::NORMAL),
|
||||
(18.0, 24.0, FontWeight::NORMAL),
|
||||
(16.0, 24.0, FontWeight::SEMIBOLD),
|
||||
(18.0, 24.0, FontWeight::SEMIBOLD),
|
||||
(16.0, 24.0, FontWeight::BOLD),
|
||||
(14.0, 20.0, FontWeight::BOLD),
|
||||
(16.0, 24.0, FontWeight::NORMAL),
|
||||
(15.0, 22.0, FontWeight::NORMAL),
|
||||
(14.0, 20.0, FontWeight::NORMAL),
|
||||
(14.0, 20.0, FontWeight::NORMAL),
|
||||
(13.0, 18.0, FontWeight::NORMAL),
|
||||
(12.0, 16.0, FontWeight::NORMAL),
|
||||
(12.0, 16.0, FontWeight::MEDIUM),
|
||||
];
|
||||
|
||||
/// One rung: size and line height at the table's base size, then the weight.
|
||||
/// One rung: size and line height at a 16px root, then the weight.
|
||||
type Rung = (f32, f32, FontWeight);
|
||||
|
||||
/// A role in the platform's type ladder.
|
||||
/// A role in the unified type ladder.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
|
||||
pub enum TextRole {
|
||||
/// The largest heading — hero panels, greeters, welcome screens.
|
||||
@@ -253,7 +58,7 @@ pub struct TypeMetrics {
|
||||
pub weight: FontWeight,
|
||||
}
|
||||
|
||||
/// The platform's type ladder, resolved at the theme's root font size.
|
||||
/// The unified type ladder, resolved at the theme's root font size.
|
||||
#[derive(Clone, Copy, Debug, PartialEq)]
|
||||
pub struct Typography {
|
||||
pub large_title: TypeMetrics,
|
||||
@@ -270,19 +75,12 @@ pub struct Typography {
|
||||
}
|
||||
|
||||
impl Typography {
|
||||
pub(crate) fn resolve(source: SourceKind, root_font_size: Pixels) -> Self {
|
||||
let (ladder, base_px) = match source {
|
||||
SourceKind::Macos => (MACOS, MACOS_BASE_PX),
|
||||
SourceKind::Windows => (WINDOWS, WINDOWS_BASE_PX),
|
||||
SourceKind::Gnome => (GNOME, GNOME_BASE_PX),
|
||||
SourceKind::Kde => (KDE, KDE_BASE_PX),
|
||||
SourceKind::Fallback | SourceKind::Omarchy => (NEUTRAL, NEUTRAL_BASE_PX),
|
||||
};
|
||||
let scale = root_font_size / px(base_px);
|
||||
pub(crate) fn resolve(root_font_size: Pixels) -> Self {
|
||||
let scale = root_font_size / px(16.);
|
||||
|
||||
let metrics = |(size, line_height, weight): Rung| TypeMetrics {
|
||||
size: px(size * scale),
|
||||
line_height: px(line_height * scale),
|
||||
size: px(size) * scale,
|
||||
line_height: px(line_height) * scale,
|
||||
weight,
|
||||
};
|
||||
|
||||
@@ -298,7 +96,7 @@ impl Typography {
|
||||
footnote,
|
||||
caption,
|
||||
caption2,
|
||||
] = ladder.map(metrics);
|
||||
] = LADDER.map(metrics);
|
||||
|
||||
Self {
|
||||
large_title,
|
||||
@@ -335,7 +133,7 @@ impl Typography {
|
||||
|
||||
/// Paints a [`TextRole`] from the resolved theme, on anything styled.
|
||||
pub trait Typeset: Styled + Sized {
|
||||
/// Sizes, leads, and weights the element as the platform's `role`.
|
||||
/// Sizes, leads, and weights the element as `role`.
|
||||
fn typeset(self, role: TextRole, cx: &App) -> Self {
|
||||
let theme = cx.theme();
|
||||
let metrics = theme.typography.get(role);
|
||||
@@ -351,181 +149,61 @@ impl<E: Styled> Typeset for E {}
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn typography(source: SourceKind, root_font_size: f32) -> Typography {
|
||||
Typography::resolve(source, px(root_font_size))
|
||||
fn typography(root_font_size: f32) -> Typography {
|
||||
Typography::resolve(px(root_font_size))
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_platforms_paint_their_stated_styles() {
|
||||
let macos = typography(SourceKind::Macos, 13.0);
|
||||
assert_eq!(
|
||||
macos.body,
|
||||
TypeMetrics {
|
||||
size: px(13.0),
|
||||
line_height: px(16.0),
|
||||
weight: FontWeight::NORMAL
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
macos.headline,
|
||||
TypeMetrics {
|
||||
size: px(13.0),
|
||||
line_height: px(16.0),
|
||||
weight: FontWeight::SEMIBOLD
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
macos.caption2,
|
||||
TypeMetrics {
|
||||
size: px(10.0),
|
||||
line_height: px(13.0),
|
||||
weight: FontWeight::MEDIUM
|
||||
}
|
||||
);
|
||||
assert_eq!(macos.large_title.size, px(26.0));
|
||||
|
||||
let windows = typography(SourceKind::Windows, 14.0);
|
||||
assert_eq!(
|
||||
windows.body,
|
||||
TypeMetrics {
|
||||
size: px(14.0),
|
||||
line_height: px(20.0),
|
||||
weight: FontWeight::NORMAL
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
windows.headline,
|
||||
TypeMetrics {
|
||||
size: px(14.0),
|
||||
line_height: px(20.0),
|
||||
weight: FontWeight::SEMIBOLD
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
windows.large_title,
|
||||
TypeMetrics {
|
||||
size: px(40.0),
|
||||
line_height: px(52.0),
|
||||
weight: FontWeight::SEMIBOLD
|
||||
}
|
||||
);
|
||||
|
||||
let gnome_base = 44.0 / 3.0;
|
||||
let gnome = typography(SourceKind::Gnome, gnome_base);
|
||||
assert_eq!(
|
||||
gnome.body,
|
||||
TypeMetrics {
|
||||
size: px(gnome_base),
|
||||
line_height: px(gnome_base * GNOME_LEADING),
|
||||
weight: FontWeight::NORMAL
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
gnome.large_title,
|
||||
TypeMetrics {
|
||||
size: px(gnome_base * 2.4),
|
||||
line_height: px(gnome_base * 2.4 * GNOME_LEADING),
|
||||
weight: FontWeight::LIGHT
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
gnome.caption2,
|
||||
TypeMetrics {
|
||||
size: px(gnome_base * 0.9),
|
||||
line_height: px(gnome_base * 0.9 * GNOME_LEADING),
|
||||
weight: FontWeight::BOLD
|
||||
}
|
||||
);
|
||||
|
||||
let kde_base = 40.0 / 3.0;
|
||||
let kde = typography(SourceKind::Kde, kde_base);
|
||||
assert_eq!(
|
||||
kde.body,
|
||||
TypeMetrics {
|
||||
size: px(kde_base),
|
||||
line_height: px(kde_base * KDE_LEADING),
|
||||
weight: FontWeight::NORMAL
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
kde.large_title,
|
||||
TypeMetrics {
|
||||
size: px(kde_base * 1.35),
|
||||
line_height: px(kde_base * 1.35 * KDE_LEADING),
|
||||
weight: FontWeight::SEMIBOLD
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_raised_root_font_size_scales_the_whole_ladder() {
|
||||
// 26pt over macOS's 13pt base doubles every rung, weights carry over.
|
||||
let doubled = typography(SourceKind::Macos, 26.0);
|
||||
assert_eq!(
|
||||
doubled.body,
|
||||
TypeMetrics {
|
||||
size: px(26.0),
|
||||
line_height: px(32.0),
|
||||
weight: FontWeight::NORMAL
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
doubled.large_title,
|
||||
TypeMetrics {
|
||||
size: px(52.0),
|
||||
line_height: px(64.0),
|
||||
weight: FontWeight::NORMAL
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_body_rung_equals_the_root_font_size_on_every_platform() {
|
||||
let native = [
|
||||
(SourceKind::Macos, 13.0),
|
||||
(SourceKind::Windows, 14.0),
|
||||
(SourceKind::Gnome, 44.0 / 3.0),
|
||||
(SourceKind::Kde, 40.0 / 3.0),
|
||||
(SourceKind::Fallback, 16.0),
|
||||
(SourceKind::Omarchy, 16.0),
|
||||
fn the_unified_ladder_matches_the_base_contract() {
|
||||
let typography = typography(16.0);
|
||||
let expected = [
|
||||
(TextRole::LargeTitle, 24.0, 32.0, FontWeight::SEMIBOLD),
|
||||
(TextRole::Title, 20.0, 28.0, FontWeight::SEMIBOLD),
|
||||
(TextRole::Title2, 18.0, 24.0, FontWeight::SEMIBOLD),
|
||||
(TextRole::Title3, 16.0, 24.0, FontWeight::BOLD),
|
||||
(TextRole::Headline, 14.0, 20.0, FontWeight::BOLD),
|
||||
(TextRole::Body, 16.0, 24.0, FontWeight::NORMAL),
|
||||
(TextRole::Callout, 14.0, 20.0, FontWeight::NORMAL),
|
||||
(TextRole::Subheadline, 14.0, 20.0, FontWeight::NORMAL),
|
||||
(TextRole::Footnote, 13.0, 18.0, FontWeight::NORMAL),
|
||||
(TextRole::Caption, 12.0, 16.0, FontWeight::NORMAL),
|
||||
(TextRole::Caption2, 12.0, 16.0, FontWeight::MEDIUM),
|
||||
];
|
||||
for (source, base) in native {
|
||||
let typography = typography(source, base);
|
||||
assert_eq!(typography.body.size, px(base), "{source:?}");
|
||||
for (role, size, line_height, weight) in expected {
|
||||
assert_eq!(
|
||||
typography.get(role),
|
||||
TypeMetrics {
|
||||
size: px(size),
|
||||
line_height: px(line_height),
|
||||
weight,
|
||||
},
|
||||
"{role:?}"
|
||||
);
|
||||
}
|
||||
|
||||
let raised = typography(SourceKind::Windows, 18.9);
|
||||
assert!((raised.body.size - px(18.9)).abs() < px(0.01));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn every_platform_ladder_descends() {
|
||||
let sources = [
|
||||
SourceKind::Fallback,
|
||||
SourceKind::Omarchy,
|
||||
SourceKind::Macos,
|
||||
SourceKind::Windows,
|
||||
SourceKind::Gnome,
|
||||
SourceKind::Kde,
|
||||
];
|
||||
for source in sources {
|
||||
let typography = typography(source, 16.0);
|
||||
let ladder = [
|
||||
typography.get(TextRole::LargeTitle).size,
|
||||
typography.get(TextRole::Title).size,
|
||||
typography.get(TextRole::Title2).size,
|
||||
typography.get(TextRole::Title3).size,
|
||||
typography.get(TextRole::Headline).size,
|
||||
typography.get(TextRole::Body).size,
|
||||
typography.get(TextRole::Callout).size,
|
||||
typography.get(TextRole::Subheadline).size,
|
||||
typography.get(TextRole::Footnote).size,
|
||||
typography.get(TextRole::Caption).size,
|
||||
typography.get(TextRole::Caption2).size,
|
||||
];
|
||||
for pair in ladder.windows(2) {
|
||||
assert!(pair[0] >= pair[1], "{source:?}: {ladder:?}");
|
||||
}
|
||||
fn the_ladder_scales_from_a_16px_root() {
|
||||
let base = typography(16.0);
|
||||
let raised = typography(20.0);
|
||||
for role in [
|
||||
TextRole::LargeTitle,
|
||||
TextRole::Title,
|
||||
TextRole::Title2,
|
||||
TextRole::Title3,
|
||||
TextRole::Headline,
|
||||
TextRole::Body,
|
||||
TextRole::Callout,
|
||||
TextRole::Subheadline,
|
||||
TextRole::Footnote,
|
||||
TextRole::Caption,
|
||||
TextRole::Caption2,
|
||||
] {
|
||||
let base = base.get(role);
|
||||
let raised = raised.get(role);
|
||||
assert!((raised.size - base.size * 1.25).abs() < px(0.01));
|
||||
assert!((raised.line_height - base.line_height * 1.25).abs() < px(0.01));
|
||||
assert_eq!(raised.weight, base.weight);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user