Merge branch 'fw/det' into fw/mac1

# Conflicts:
#	crates/ui-widgets/src/bars/status_readout.rs
This commit is contained in:
aiongg
2026-11-16 16:48:00 +00:00
80 changed files with 183 additions and 88 deletions
+2 -1
View File
@@ -98,7 +98,8 @@
},
"ruler": {
"tick": {
"mid": 4.5
"mid": 9.0,
"minor": 4.5
}
},
"scroll_fade": 20.0,
+2 -1
View File
@@ -98,7 +98,8 @@
},
"ruler": {
"tick": {
"mid": 3.0
"mid": 6.0,
"minor": 3.0
}
},
"scroll_fade": 20.0,
+2 -1
View File
@@ -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;
+1
View File
@@ -141,6 +141,7 @@ pub(crate) fn leaves(b: &mut Preset) -> Vec<Leaf<'_>> {
"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;
+3 -2
View File
@@ -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.
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+16 -6
View File
@@ -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<Tick> =
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);
}
@@ -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}");
}
}
+3 -3
View File
@@ -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<Shape> {
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| {
+1 -1
View File
@@ -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,
}
+2 -2
View File
@@ -4,7 +4,7 @@
use super::words::BarWords;
use crate::buttons::IconButton;
use crate::contract::{Bind, Entry, LabelKind, NoValue, Outcome, Props as _, Show as _, ShowContainer as _, SideLabel};
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};
@@ -228,7 +228,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());
}
+2 -2
View File
@@ -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));