From 45a14a4dad96913504b308f88d52f0ab1e5c3b08 Mon Sep 17 00:00:00 2001 From: aiongg Date: Mon, 16 Nov 2026 16:45:11 +0000 Subject: [PATCH 1/3] Rulers: minor tick token, mid tick 6/9, ticks end at the divider band, vertical labels step by the label size, horizontal labels sit one gap below the strip top --- crates/theme/sizes/comfortable.json | 3 ++- crates/theme/sizes/compact.json | 3 ++- crates/theme/src/dump.rs | 3 ++- crates/theme/src/sizes.rs | 1 + crates/theme/src/tokens/size.rs | 5 +++-- .../tokens/adwaita-dark-high-comfortable.txt | 3 ++- .../tokens/adwaita-dark-high-compact.txt | 3 ++- .../adwaita-dark-standard-comfortable.txt | 3 ++- .../tokens/adwaita-dark-standard-compact.txt | 3 ++- .../tokens/adwaita-light-high-comfortable.txt | 3 ++- .../tokens/adwaita-light-high-compact.txt | 3 ++- .../adwaita-light-standard-comfortable.txt | 3 ++- .../tokens/adwaita-light-standard-compact.txt | 3 ++- .../tokens/artcraft-dark-high-comfortable.txt | 3 ++- .../tokens/artcraft-dark-high-compact.txt | 3 ++- .../artcraft-dark-standard-comfortable.txt | 3 ++- .../tokens/artcraft-dark-standard-compact.txt | 3 ++- .../artcraft-light-high-comfortable.txt | 3 ++- .../tokens/artcraft-light-high-compact.txt | 3 ++- .../artcraft-light-standard-comfortable.txt | 3 ++- .../artcraft-light-standard-compact.txt | 3 ++- .../tokens/breeze-dark-high-comfortable.txt | 3 ++- .../dumps/tokens/breeze-dark-high-compact.txt | 3 ++- .../breeze-dark-standard-comfortable.txt | 3 ++- .../tokens/breeze-dark-standard-compact.txt | 3 ++- .../tokens/breeze-light-high-comfortable.txt | 3 ++- .../tokens/breeze-light-high-compact.txt | 3 ++- .../breeze-light-standard-comfortable.txt | 3 ++- .../tokens/breeze-light-standard-compact.txt | 3 ++- .../tokens/classic-light-high-comfortable.txt | 3 ++- .../tokens/classic-light-high-compact.txt | 3 ++- .../classic-light-standard-comfortable.txt | 3 ++- .../tokens/classic-light-standard-compact.txt | 3 ++- .../tokens/graphite-dark-high-comfortable.txt | 3 ++- .../tokens/graphite-dark-high-compact.txt | 3 ++- .../graphite-dark-standard-comfortable.txt | 3 ++- .../tokens/graphite-dark-standard-compact.txt | 3 ++- .../graphite-light-high-comfortable.txt | 3 ++- .../tokens/graphite-light-high-compact.txt | 3 ++- .../graphite-light-standard-comfortable.txt | 3 ++- .../graphite-light-standard-compact.txt | 3 ++- .../tokens/pro-dark-high-comfortable.txt | 3 ++- .../dumps/tokens/pro-dark-high-compact.txt | 3 ++- ...ro-dark-standard-comfortable-app-sizes.txt | 3 ++- .../tokens/pro-dark-standard-comfortable.txt | 3 ++- .../tokens/pro-dark-standard-compact.txt | 3 ++- .../pro-light-gray-light-high-comfortable.txt | 3 ++- .../pro-light-gray-light-high-compact.txt | 3 ++- ...-light-gray-light-standard-comfortable.txt | 3 ++- .../pro-light-gray-light-standard-compact.txt | 3 ++- .../tokens/pro-light-high-comfortable.txt | 3 ++- .../dumps/tokens/pro-light-high-compact.txt | 3 ++- .../tokens/pro-light-standard-comfortable.txt | 3 ++- .../tokens/pro-light-standard-compact.txt | 3 ++- .../tokens/soft-dark-high-comfortable.txt | 3 ++- .../dumps/tokens/soft-dark-high-compact.txt | 3 ++- .../tokens/soft-dark-standard-comfortable.txt | 3 ++- .../tokens/soft-dark-standard-compact.txt | 3 ++- .../tokens/soft-light-high-comfortable.txt | 3 ++- .../dumps/tokens/soft-light-high-compact.txt | 3 ++- .../soft-light-standard-comfortable.txt | 3 ++- .../tokens/soft-light-standard-compact.txt | 3 ++- .../solarized-dark-dark-high-comfortable.txt | 3 ++- .../solarized-dark-dark-high-compact.txt | 3 ++- ...larized-dark-dark-standard-comfortable.txt | 3 ++- .../solarized-dark-dark-standard-compact.txt | 3 ++- .../tokens/studio-dark-high-comfortable.txt | 3 ++- .../dumps/tokens/studio-dark-high-compact.txt | 3 ++- .../studio-dark-standard-comfortable.txt | 3 ++- .../tokens/studio-dark-standard-compact.txt | 3 ++- .../tokens/studio-light-high-comfortable.txt | 3 ++- .../tokens/studio-light-high-compact.txt | 3 ++- .../studio-light-standard-comfortable.txt | 3 ++- .../tokens/studio-light-standard-compact.txt | 3 ++- crates/ui-canvas/src/canvas/rulers/mod.rs | 22 ++++++++++++++----- crates/ui-canvas/tests/it/canvas/rulers.rs | 11 ++++++++++ crates/ui-contract/src/primitives/kit.rs | 6 ++--- 77 files changed, 178 insertions(+), 83 deletions(-) diff --git a/crates/theme/sizes/comfortable.json b/crates/theme/sizes/comfortable.json index 7b1dbfd68..02c680a30 100644 --- a/crates/theme/sizes/comfortable.json +++ b/crates/theme/sizes/comfortable.json @@ -98,7 +98,8 @@ }, "ruler": { "tick": { - "mid": 4.5 + "mid": 9.0, + "minor": 4.5 } }, "scroll_fade": 20.0, diff --git a/crates/theme/sizes/compact.json b/crates/theme/sizes/compact.json index daf316105..b54e86102 100644 --- a/crates/theme/sizes/compact.json +++ b/crates/theme/sizes/compact.json @@ -98,7 +98,8 @@ }, "ruler": { "tick": { - "mid": 3.0 + "mid": 6.0, + "minor": 3.0 } }, "scroll_fade": 20.0, diff --git a/crates/theme/src/dump.rs b/crates/theme/src/dump.rs index fbbe21615..130f5e6b5 100644 --- a/crates/theme/src/dump.rs +++ b/crates/theme/src/dump.rs @@ -199,8 +199,9 @@ fn size_lines(out: &mut Lines, size: &SizeTokens) { let PaneSizes { least } = pane; out.line("size.pane.least", len(*least)); let RulerSizes { tick } = ruler; - let RulerTickSizes { mid } = tick; + let RulerTickSizes { mid, minor } = tick; out.line("size.ruler.tick.mid", len(*mid)); + out.line("size.ruler.tick.minor", len(*minor)); let DockColumnSizes { column } = dock; out.line("size.dock.column", len(*column)); let NoticeSizes { width } = notice; diff --git a/crates/theme/src/sizes.rs b/crates/theme/src/sizes.rs index c93c6fc0d..a6adbf00b 100644 --- a/crates/theme/src/sizes.rs +++ b/crates/theme/src/sizes.rs @@ -141,6 +141,7 @@ pub(crate) fn leaves(b: &mut Preset) -> Vec> { "base.size.window.cascade" Num 8.0..=96.0 => s.window.cascade; "base.size.pane.least" Num 16.0..=128.0 => s.pane.least; "base.size.ruler.tick.mid" Num 1.0..=32.0 => s.ruler.tick.mid; + "base.size.ruler.tick.minor" Num 1.0..=32.0 => s.ruler.tick.minor; "base.size.story.height" Num 120.0..=1024.0 => s.story.height; "base.size.story.width_min" Num 120.0..=1024.0 => s.story.width_min; "base.size.story.width_max" Num 120.0..=2048.0 => s.story.width_max; diff --git a/crates/theme/src/tokens/size.rs b/crates/theme/src/tokens/size.rs index aaf089d51..8896e6f0f 100644 --- a/crates/theme/src/tokens/size.rs +++ b/crates/theme/src/tokens/size.rs @@ -261,12 +261,13 @@ pub struct RulerSizes { pub tick: RulerTickSizes, } -/// The lengths of a ruler's tick marks, in logical pixels. The minor tick is `space.gap.tight` and the major tick -/// spans the ruler's depth. +/// The lengths of a ruler's tick marks, in logical pixels. The major tick spans the ruler's depth. #[derive(Clone, Copy, Debug, Default, PartialEq)] pub struct RulerTickSizes { /// The tick halfway between two labelled ticks. pub mid: f32, + /// The tick between two other ticks. + pub minor: f32, } /// The sizes of the panes of a dock's split, in logical pixels. diff --git a/crates/theme/tests/dumps/tokens/adwaita-dark-high-comfortable.txt b/crates/theme/tests/dumps/tokens/adwaita-dark-high-comfortable.txt index 9e47f4a33..e1e34bf96 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-dark-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/adwaita-dark-high-compact.txt b/crates/theme/tests/dumps/tokens/adwaita-dark-high-compact.txt index 1c031a78e..234c614fd 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-dark-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/adwaita-dark-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/adwaita-dark-standard-comfortable.txt index aab9674f9..3ef6d8504 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-dark-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/adwaita-dark-standard-compact.txt b/crates/theme/tests/dumps/tokens/adwaita-dark-standard-compact.txt index 8e0380a50..a9aba5082 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-dark-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/adwaita-light-high-comfortable.txt b/crates/theme/tests/dumps/tokens/adwaita-light-high-comfortable.txt index 4416c34d0..2af6bbff1 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-light-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/adwaita-light-high-compact.txt b/crates/theme/tests/dumps/tokens/adwaita-light-high-compact.txt index 3d467b97f..d1648993d 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-light-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/adwaita-light-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/adwaita-light-standard-comfortable.txt index 8f1775250..b320cc27d 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-light-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/adwaita-light-standard-compact.txt b/crates/theme/tests/dumps/tokens/adwaita-light-standard-compact.txt index cc425f58d..1e29c9a77 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-light-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/artcraft-dark-high-comfortable.txt b/crates/theme/tests/dumps/tokens/artcraft-dark-high-comfortable.txt index 839f801ac..70b095cf4 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-dark-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/artcraft-dark-high-compact.txt b/crates/theme/tests/dumps/tokens/artcraft-dark-high-compact.txt index c5478f71f..ae6cd9e19 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-dark-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/artcraft-dark-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/artcraft-dark-standard-comfortable.txt index 0b350aca1..e1f8c22a7 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-dark-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/artcraft-dark-standard-compact.txt b/crates/theme/tests/dumps/tokens/artcraft-dark-standard-compact.txt index 969d9e279..4f76678e5 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-dark-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/artcraft-light-high-comfortable.txt b/crates/theme/tests/dumps/tokens/artcraft-light-high-comfortable.txt index 800f701a6..00a1091c9 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-light-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/artcraft-light-high-compact.txt b/crates/theme/tests/dumps/tokens/artcraft-light-high-compact.txt index 2274a79c8..bfb368afb 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-light-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/artcraft-light-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/artcraft-light-standard-comfortable.txt index 3ff25d13e..55f702a1f 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-light-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/artcraft-light-standard-compact.txt b/crates/theme/tests/dumps/tokens/artcraft-light-standard-compact.txt index 2ce62fd19..6ebe57241 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-light-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/breeze-dark-high-comfortable.txt b/crates/theme/tests/dumps/tokens/breeze-dark-high-comfortable.txt index b044315ed..709e21b2a 100644 --- a/crates/theme/tests/dumps/tokens/breeze-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/breeze-dark-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/breeze-dark-high-compact.txt b/crates/theme/tests/dumps/tokens/breeze-dark-high-compact.txt index 332a237b5..352f425c3 100644 --- a/crates/theme/tests/dumps/tokens/breeze-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/breeze-dark-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/breeze-dark-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/breeze-dark-standard-comfortable.txt index 453469b81..777b6c368 100644 --- a/crates/theme/tests/dumps/tokens/breeze-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/breeze-dark-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/breeze-dark-standard-compact.txt b/crates/theme/tests/dumps/tokens/breeze-dark-standard-compact.txt index 8073a34ba..39337fa26 100644 --- a/crates/theme/tests/dumps/tokens/breeze-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/breeze-dark-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/breeze-light-high-comfortable.txt b/crates/theme/tests/dumps/tokens/breeze-light-high-comfortable.txt index 8428b9cf2..d815f8260 100644 --- a/crates/theme/tests/dumps/tokens/breeze-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/breeze-light-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/breeze-light-high-compact.txt b/crates/theme/tests/dumps/tokens/breeze-light-high-compact.txt index 2e6b39b56..3a3de563a 100644 --- a/crates/theme/tests/dumps/tokens/breeze-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/breeze-light-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/breeze-light-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/breeze-light-standard-comfortable.txt index c9b3a8bc9..1c1046d51 100644 --- a/crates/theme/tests/dumps/tokens/breeze-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/breeze-light-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/breeze-light-standard-compact.txt b/crates/theme/tests/dumps/tokens/breeze-light-standard-compact.txt index 214b92872..d28858afa 100644 --- a/crates/theme/tests/dumps/tokens/breeze-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/breeze-light-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/classic-light-high-comfortable.txt b/crates/theme/tests/dumps/tokens/classic-light-high-comfortable.txt index 93c56a234..0a8745f5e 100644 --- a/crates/theme/tests/dumps/tokens/classic-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/classic-light-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/classic-light-high-compact.txt b/crates/theme/tests/dumps/tokens/classic-light-high-compact.txt index 3f5ffe515..6ded2511a 100644 --- a/crates/theme/tests/dumps/tokens/classic-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/classic-light-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/classic-light-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/classic-light-standard-comfortable.txt index bbd87cda8..64a72cd99 100644 --- a/crates/theme/tests/dumps/tokens/classic-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/classic-light-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/classic-light-standard-compact.txt b/crates/theme/tests/dumps/tokens/classic-light-standard-compact.txt index 97b9c5cd2..475e84eb3 100644 --- a/crates/theme/tests/dumps/tokens/classic-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/classic-light-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/graphite-dark-high-comfortable.txt b/crates/theme/tests/dumps/tokens/graphite-dark-high-comfortable.txt index 49ecc0c2b..ed62a4f67 100644 --- a/crates/theme/tests/dumps/tokens/graphite-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/graphite-dark-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/graphite-dark-high-compact.txt b/crates/theme/tests/dumps/tokens/graphite-dark-high-compact.txt index 424adea73..ed6911bd1 100644 --- a/crates/theme/tests/dumps/tokens/graphite-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/graphite-dark-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/graphite-dark-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/graphite-dark-standard-comfortable.txt index 11c882bc5..cb1c644a7 100644 --- a/crates/theme/tests/dumps/tokens/graphite-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/graphite-dark-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/graphite-dark-standard-compact.txt b/crates/theme/tests/dumps/tokens/graphite-dark-standard-compact.txt index 8b1c0be13..fd85432e1 100644 --- a/crates/theme/tests/dumps/tokens/graphite-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/graphite-dark-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/graphite-light-high-comfortable.txt b/crates/theme/tests/dumps/tokens/graphite-light-high-comfortable.txt index a334d9800..086e42f22 100644 --- a/crates/theme/tests/dumps/tokens/graphite-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/graphite-light-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/graphite-light-high-compact.txt b/crates/theme/tests/dumps/tokens/graphite-light-high-compact.txt index cc2924b65..20062381c 100644 --- a/crates/theme/tests/dumps/tokens/graphite-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/graphite-light-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/graphite-light-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/graphite-light-standard-comfortable.txt index 2d761e902..ac916ce09 100644 --- a/crates/theme/tests/dumps/tokens/graphite-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/graphite-light-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/graphite-light-standard-compact.txt b/crates/theme/tests/dumps/tokens/graphite-light-standard-compact.txt index 716fe824d..c7e474ea1 100644 --- a/crates/theme/tests/dumps/tokens/graphite-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/graphite-light-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-dark-high-comfortable.txt b/crates/theme/tests/dumps/tokens/pro-dark-high-comfortable.txt index 90c49d3b3..a653473ad 100644 --- a/crates/theme/tests/dumps/tokens/pro-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-dark-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-dark-high-compact.txt b/crates/theme/tests/dumps/tokens/pro-dark-high-compact.txt index 8c60fdb87..6c8c0dfee 100644 --- a/crates/theme/tests/dumps/tokens/pro-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-dark-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable-app-sizes.txt b/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable-app-sizes.txt index 797258314..a2fc1f7d2 100644 --- a/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable-app-sizes.txt +++ b/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable-app-sizes.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable.txt index 041c36956..c1cc33b3e 100644 --- a/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-dark-standard-compact.txt b/crates/theme/tests/dumps/tokens/pro-dark-standard-compact.txt index a1cb18d4f..1964a740c 100644 --- a/crates/theme/tests/dumps/tokens/pro-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-dark-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-light-gray-light-high-comfortable.txt b/crates/theme/tests/dumps/tokens/pro-light-gray-light-high-comfortable.txt index 420ec3787..f161ee554 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-gray-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-gray-light-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-light-gray-light-high-compact.txt b/crates/theme/tests/dumps/tokens/pro-light-gray-light-high-compact.txt index d6e47cbd3..32bf9b423 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-gray-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-gray-light-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-light-gray-light-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/pro-light-gray-light-standard-comfortable.txt index b5fe33bfd..284bb93e2 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-gray-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-gray-light-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-light-gray-light-standard-compact.txt b/crates/theme/tests/dumps/tokens/pro-light-gray-light-standard-compact.txt index 0047a440b..4dfa8b047 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-gray-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-gray-light-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-light-high-comfortable.txt b/crates/theme/tests/dumps/tokens/pro-light-high-comfortable.txt index 6a7eff5c6..257a367dd 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-light-high-compact.txt b/crates/theme/tests/dumps/tokens/pro-light-high-compact.txt index 5470da003..68cdaad75 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-light-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/pro-light-standard-comfortable.txt index f754f959e..1b2bc5507 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/pro-light-standard-compact.txt b/crates/theme/tests/dumps/tokens/pro-light-standard-compact.txt index d977bdbce..b4bbf55d3 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/soft-dark-high-comfortable.txt b/crates/theme/tests/dumps/tokens/soft-dark-high-comfortable.txt index 36797e580..ad8f3275d 100644 --- a/crates/theme/tests/dumps/tokens/soft-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/soft-dark-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/soft-dark-high-compact.txt b/crates/theme/tests/dumps/tokens/soft-dark-high-compact.txt index cd9087640..17d472b79 100644 --- a/crates/theme/tests/dumps/tokens/soft-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/soft-dark-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/soft-dark-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/soft-dark-standard-comfortable.txt index 97f5837e7..7b167d2e2 100644 --- a/crates/theme/tests/dumps/tokens/soft-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/soft-dark-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/soft-dark-standard-compact.txt b/crates/theme/tests/dumps/tokens/soft-dark-standard-compact.txt index 24c54ef9a..857b91ed1 100644 --- a/crates/theme/tests/dumps/tokens/soft-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/soft-dark-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/soft-light-high-comfortable.txt b/crates/theme/tests/dumps/tokens/soft-light-high-comfortable.txt index 44f676fdd..a2e781704 100644 --- a/crates/theme/tests/dumps/tokens/soft-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/soft-light-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/soft-light-high-compact.txt b/crates/theme/tests/dumps/tokens/soft-light-high-compact.txt index 11d3f9f71..a96f66c16 100644 --- a/crates/theme/tests/dumps/tokens/soft-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/soft-light-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/soft-light-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/soft-light-standard-comfortable.txt index aabc3e715..e113483a0 100644 --- a/crates/theme/tests/dumps/tokens/soft-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/soft-light-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/soft-light-standard-compact.txt b/crates/theme/tests/dumps/tokens/soft-light-standard-compact.txt index df11546dc..838825074 100644 --- a/crates/theme/tests/dumps/tokens/soft-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/soft-light-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/solarized-dark-dark-high-comfortable.txt b/crates/theme/tests/dumps/tokens/solarized-dark-dark-high-comfortable.txt index d1bfcec22..1a92c8898 100644 --- a/crates/theme/tests/dumps/tokens/solarized-dark-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/solarized-dark-dark-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/solarized-dark-dark-high-compact.txt b/crates/theme/tests/dumps/tokens/solarized-dark-dark-high-compact.txt index 8ce96e99d..36e54c9db 100644 --- a/crates/theme/tests/dumps/tokens/solarized-dark-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/solarized-dark-dark-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/solarized-dark-dark-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/solarized-dark-dark-standard-comfortable.txt index c4299ab4c..a6d0d66c2 100644 --- a/crates/theme/tests/dumps/tokens/solarized-dark-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/solarized-dark-dark-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/solarized-dark-dark-standard-compact.txt b/crates/theme/tests/dumps/tokens/solarized-dark-dark-standard-compact.txt index 8d78ad546..50b6a2dd9 100644 --- a/crates/theme/tests/dumps/tokens/solarized-dark-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/solarized-dark-dark-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/studio-dark-high-comfortable.txt b/crates/theme/tests/dumps/tokens/studio-dark-high-comfortable.txt index 9fd9afeb0..70ec56153 100644 --- a/crates/theme/tests/dumps/tokens/studio-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/studio-dark-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/studio-dark-high-compact.txt b/crates/theme/tests/dumps/tokens/studio-dark-high-compact.txt index e5ffddcc2..ac2fc9e97 100644 --- a/crates/theme/tests/dumps/tokens/studio-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/studio-dark-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/studio-dark-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/studio-dark-standard-comfortable.txt index 8a9f238ea..800b1a04d 100644 --- a/crates/theme/tests/dumps/tokens/studio-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/studio-dark-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/studio-dark-standard-compact.txt b/crates/theme/tests/dumps/tokens/studio-dark-standard-compact.txt index f3d87ae3d..6d573d055 100644 --- a/crates/theme/tests/dumps/tokens/studio-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/studio-dark-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/studio-light-high-comfortable.txt b/crates/theme/tests/dumps/tokens/studio-light-high-comfortable.txt index 773094894..310de3b24 100644 --- a/crates/theme/tests/dumps/tokens/studio-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/studio-light-high-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/studio-light-high-compact.txt b/crates/theme/tests/dumps/tokens/studio-light-high-compact.txt index 81bf249f9..2b734d0c3 100644 --- a/crates/theme/tests/dumps/tokens/studio-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/studio-light-high-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/studio-light-standard-comfortable.txt b/crates/theme/tests/dumps/tokens/studio-light-standard-comfortable.txt index ef67775ae..9daaaa4c8 100644 --- a/crates/theme/tests/dumps/tokens/studio-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/studio-light-standard-comfortable.txt @@ -177,7 +177,8 @@ size.float.width = 240 size.float.height = 300 size.window.cascade = 38 size.pane.least = 50 -size.ruler.tick.mid = 4.5 +size.ruler.tick.mid = 9 +size.ruler.tick.minor = 4.5 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/theme/tests/dumps/tokens/studio-light-standard-compact.txt b/crates/theme/tests/dumps/tokens/studio-light-standard-compact.txt index dad775ce1..e3baee9f6 100644 --- a/crates/theme/tests/dumps/tokens/studio-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/studio-light-standard-compact.txt @@ -177,7 +177,8 @@ size.float.width = 192 size.float.height = 240 size.window.cascade = 32 size.pane.least = 40 -size.ruler.tick.mid = 3 +size.ruler.tick.mid = 6 +size.ruler.tick.minor = 3 size.dock.column = 340 size.notice.width = 360 size.dialog.least = 380 diff --git a/crates/ui-canvas/src/canvas/rulers/mod.rs b/crates/ui-canvas/src/canvas/rulers/mod.rs index e4c1f20c7..f30d57f3a 100644 --- a/crates/ui-canvas/src/canvas/rulers/mod.rs +++ b/crates/ui-canvas/src/canvas/rulers/mod.rs @@ -133,8 +133,10 @@ pub struct RulersStyle { metrics: Metrics, /// The strips' thickness and the corner's side. thickness: f32, - /// Between a tick and its label. + /// Between a tick and its label, and above a horizontal label. pad: f32, + /// How far a vertical label's next character sits below the one before: the label role's size. + pitch: f32, fill: StyleColor, margin: StyleColor, label: TextLook, @@ -144,9 +146,9 @@ pub struct RulersStyle { /// The type role of the tick labels. const LABEL_ROLE: TypeRole = TypeRole::Caption; -/// A strip is as thick as its tick labels need, and no thinner than a small icon. +/// A strip is as thick as its tick labels and the gap above them need, and no thinner than a small icon. fn thickness(tokens: &UiTokens) -> f32 { - tokens.size.icon.sm.max(tokens.typography.get(LABEL_ROLE).line_height) + tokens.size.icon.sm.max(tokens.typography.get(LABEL_ROLE).line_height + tokens.space.gap.tight) } /// The top strip, the left strip and the corner inside `rect`. @@ -332,6 +334,7 @@ impl Component for Rulers<'_> { metrics: Metrics::new(), thickness: thickness(cx.tokens), pad: cx.tokens.space.gap.tight, + pitch: cx.tokens.typography.get(LABEL_ROLE).size, fill: cx.color(c.surface.chrome), margin: cx.color(c.surface.sunken), label: TextLook::new(LABEL_ROLE, Stateful::new(cx.color(c.text.muted))), @@ -525,7 +528,14 @@ impl Component for Rulers<'_> { let ticks = Self::axis_ticks(&text_of(part), &level, strip, part, zero); let marks: Vec = ticks.iter().map(|(tick, at)| Tick::new(*at - if vertical { strip.top() } else { strip.left() }, tick.rank)).collect(); - painter.ticks(strip, edge, &marks); + // The divider is painted inside the strip's inner edge; the ticks hang from its inner side so they keep their full length. + let band = draw.rule_width(RuleKind::Divider); + let tick_strip = if vertical { + Rect::from_min_max(strip.min, Pos2::new(strip.right() - band, strip.bottom())) + } else { + Rect::from_min_max(strip.min, Pos2::new(strip.right(), strip.bottom() - band)) + }; + painter.ticks(tick_strip, edge, &marks); for (tick, at) in ticks.iter().filter(|(tick, _)| tick.rank == TickRank::Major) { let text = text_of(part).tick_label(&numbers, tick.value, tick.step); if vertical { @@ -537,11 +547,11 @@ impl Component for Rulers<'_> { if shows(strip, Rect::from_min_size(at, layout.size())) { draw.galley(at, &layout); } - y += layout.size().y; + y += style.pitch; } } else { let layout = draw.layout(&TextRun::new(text).role(label.role).color(color), f32::INFINITY); - let at = Pos2::new(at + style.pad, strip.top()); + let at = Pos2::new(at + style.pad, strip.top() + style.pad); if shows(strip, Rect::from_min_size(at, layout.size())) { draw.galley(at, &layout); } diff --git a/crates/ui-canvas/tests/it/canvas/rulers.rs b/crates/ui-canvas/tests/it/canvas/rulers.rs index 94f564452..95ca61634 100644 --- a/crates/ui-canvas/tests/it/canvas/rulers.rs +++ b/crates/ui-canvas/tests/it/canvas/rulers.rs @@ -46,3 +46,14 @@ fn labelled_ticks_never_touch_at_any_zoom() { } } } + +/// A vertical label stacks its characters one label-role size apart; the longest label the metric rule gives at the +/// least step (five characters) and its gap to the tick stay inside that step, so neighbouring labels never touch. +#[trial] +fn a_five_character_vertical_label_fits_the_least_label_step() { + for mode in [craft_theme::Mode::Light, craft_theme::Mode::Dark] { + let tokens = craft_ui::testing::style::tokens(mode, craft_theme::Contrast::Standard); + let pitch = tokens.typography.get(craft_theme::TypeRole::Caption).size; + assert!(5.0 * pitch + tokens.space.gap.tight < LABEL_STEP_MIN, "{mode:?}: five characters at pitch {pitch}"); + } +} diff --git a/crates/ui-contract/src/primitives/kit.rs b/crates/ui-contract/src/primitives/kit.rs index becc4ca40..a20d020f3 100644 --- a/crates/ui-contract/src/primitives/kit.rs +++ b/crates/ui-contract/src/primitives/kit.rs @@ -34,7 +34,7 @@ pub enum TickEdge { #[derive(Clone, Copy, Debug, PartialEq, Eq)] #[non_exhaustive] pub enum TickRank { - /// The shortest, `space.gap.tight`. + /// The shortest, `size.ruler.tick.minor`. Minor, /// Halfway between two major ticks, `size.ruler.tick.mid`. Mid, @@ -535,14 +535,14 @@ pub fn grid_lines_with(look: &GridLook, grid: &GridLines, ink: &GridInk, pixels_ } /// The tick marks of `ticks` on one edge of `rect` that `clip` shows, `stroke.thin` lines of `text.faint`: minor ones -/// `gap.tight` long, mid ones `size.ruler.tick.mid`, major ones across the whole depth of `rect`, beside their labels. +/// `size.ruler.tick.minor` long, mid ones `size.ruler.tick.mid`, major ones across the whole depth of `rect`, beside their labels. pub fn ticks(tokens: &UiTokens, rect: Rect, edge: TickEdge, ticks: &[Tick], clip: Rect, pixels_per_point: f32) -> Vec { let look = RuleLook { color: rgba_color(tokens.color.text.faint), width: RuleWidth::Points(tokens.stroke.thin) }; let depth = match edge { TickEdge::Bottom | TickEdge::Top => rect.height(), TickEdge::Left | TickEdge::Right => rect.width(), }; - let (minor, mid, major) = (tokens.space.gap.tight, tokens.size.ruler.tick.mid, depth); + let (minor, mid, major) = (tokens.size.ruler.tick.minor, tokens.size.ruler.tick.mid, depth); ticks .iter() .filter_map(|tick| { From 03cec5ea4fd9179ff19c0e62549f46b947d94033 Mon Sep 17 00:00:00 2001 From: aiongg Date: Mon, 16 Nov 2026 16:45:16 +0000 Subject: [PATCH 2/3] Status readout: info text in the muted shade --- crates/ui-widgets/src/bars/status_readout.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/ui-widgets/src/bars/status_readout.rs b/crates/ui-widgets/src/bars/status_readout.rs index 73f3953ef..87fcb7981 100644 --- a/crates/ui-widgets/src/bars/status_readout.rs +++ b/crates/ui-widgets/src/bars/status_readout.rs @@ -4,7 +4,7 @@ use super::words::BarWords; use crate::buttons::IconButton; use crate::contract::{Bind, Entry, GlyphLabel, LabelKind, NoValue, Outcome, Props as _, Show as _, ShowContainer as _, SideLabel, Sizing}; -use crate::display::{Elide, Text}; +use crate::display::{Elide, Shade, Text}; use crate::form::Field; use crate::layout_components::Row; use crate::runtime::commands::{self, CommandRef}; @@ -223,7 +223,7 @@ impl<'a> StatusReadout<'a> { for edit in &events { self.view.reborrow().write(cx, edit); } - let mut info = Text::new(text.clone()).elide(Elide::End); + let mut info = Text::new(text.clone()).shade(Shade::Muted).elide(Elide::End); if let Some((_, tip)) = self.tips.iter().find(|(item, _)| *item == self.item) { info = info.tooltip(tip.clone()); } From 18f6bc55f89f7f2af5189a5c50ad3d7941f77350 Mon Sep 17 00:00:00 2001 From: aiongg Date: Mon, 16 Nov 2026 16:47:13 +0000 Subject: [PATCH 3/3] List rows: trailing icon buttons rest in the quiet panel-rail glyph role --- crates/ui-contract/src/style/cx.rs | 2 +- crates/ui-widgets/src/list/row/paint.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/ui-contract/src/style/cx.rs b/crates/ui-contract/src/style/cx.rs index 534c66687..acd749021 100644 --- a/crates/ui-contract/src/style/cx.rs +++ b/crates/ui-contract/src/style/cx.rs @@ -34,7 +34,7 @@ pub enum GlyphRole { Tool, /// A tool rail: `size.icon.lg`, resting in `text.muted` and in the variant's ink under the pointer. ToolRail, - /// A panel rail: the control glyph, resting in `text.faint` and in the variant's ink under the pointer. + /// A panel rail, or a list row's trailing icon button: the control glyph, resting in `text.faint` and in the variant's ink under the pointer. PanelRail, } diff --git a/crates/ui-widgets/src/list/row/paint.rs b/crates/ui-widgets/src/list/row/paint.rs index 7ad882ff3..b68c65916 100644 --- a/crates/ui-widgets/src/list/row/paint.rs +++ b/crates/ui-widgets/src/list/row/paint.rs @@ -12,7 +12,7 @@ use crate::contract::{Bind, Cx, PaintUi, Pointer as _, Props as _, Styled as _, use crate::controls::disclosure::Disclosure; use crate::list::toggle::{ToggleFace, ToggleState}; use crate::primitives::{Draw, IconSpec, PaintShape, Span, StrokeWidth, TextRun, Wrap}; -use crate::style::{Flags, Ink, StateMix, StateSet, StyleColor}; +use crate::style::{Flags, GlyphRole, Ink, StateMix, StateSet, StyleColor}; use craft_behavior::{Flow, IconId, Mixed, PartRef}; use craft_theme::ControlSize; use egui::{CornerRadius, Pos2, Rect, Vec2}; @@ -59,7 +59,7 @@ impl ListRow<'_> { icon.color.get_or_insert(cx.resolve(&cx.style.trailing_icon.color)); ui.draw().icon(shape, &icon); } - TrailingFace::Icon(icon) => ui.face(key, IconButton::new(icon.clone()).focusable(false).enabled(*enabled)), + TrailingFace::Icon(icon) => ui.face(key, IconButton::new(icon.clone()).focusable(false).enabled(*enabled).glyphs(GlyphRole::PanelRail)), TrailingFace::Disclosure { open } => ui.face(key, Disclosure::new(Bind::given(*open)).node(false).enabled(*enabled)), TrailingFace::Strong(text) => { ui.draw().text(*slot, &trailing_run(text, true));