Field and number widths per control size: size.length.field and size.length.number hold sm and md, and controls read them through ControlMetrics, so a field in a small options bar is narrower than one in a dialog

This commit is contained in:
aiongg
2026-11-12 14:32:49 +00:00
parent 20decd82d5
commit 7fcd160eca
92 changed files with 395 additions and 177 deletions
+24 -4
View File
@@ -100,7 +100,8 @@ impl Metrics {
}
}
/// The sizes a control takes from its `ControlSize`: height, icon side, horizontal padding and gap.
/// The sizes a control takes from its `ControlSize`: height, icon side, horizontal padding, gap and the widths of a
/// field and a number field.
#[derive(Clone, Copy, Debug, Default, PartialEq)]
#[non_exhaustive]
pub struct ControlMetrics {
@@ -112,12 +113,31 @@ pub struct ControlMetrics {
pub pad_x: f32,
/// The gap between content parts.
pub gap: f32,
/// The width of a text or value field where the room allows.
pub field: f32,
/// The width of a number field.
pub number: f32,
}
impl ControlMetrics {
/// The entries of the four tables at `size`.
pub fn at(size: ControlSize, height: &BySize<f32>, icon: &BySize<f32>, pad_x: &BySize<f32>, gap: &BySize<f32>) -> Self {
ControlMetrics { height: height.get(size), icon: icon.get(size), pad_x: pad_x.get(size), gap: gap.get(size) }
/// The entries of the six tables at `size`.
pub fn at(
size: ControlSize,
height: &BySize<f32>,
icon: &BySize<f32>,
pad_x: &BySize<f32>,
gap: &BySize<f32>,
field: &BySize<f32>,
number: &BySize<f32>,
) -> Self {
ControlMetrics {
height: height.get(size),
icon: icon.get(size),
pad_x: pad_x.get(size),
gap: gap.get(size),
field: field.get(size),
number: number.get(size),
}
}
/// The `Metrics` of a control of this height: horizontal padding, the height as the least height, the gap.
+1 -1
View File
@@ -56,7 +56,7 @@ impl BubbleLook {
gap: tokens.space.gap.tight,
radius: tokens.shape.radius.surface.round().clamp(0.0, 255.0) as u8,
offset: Vec2::new(tokens.size.pointer_tip.x, tokens.size.pointer_tip.y),
width: tokens.size.length.field,
width: control.field,
body: (body.size, body.line_height),
caption: (caption.size, caption.line_height),
}
+2 -2
View File
@@ -83,7 +83,7 @@ impl StorySheet {
}
StorySheet {
rows: LineIndex::new(&BTreeMap::new(), size.control.sm, SALES_ROWS),
columns: LineIndex::new(&BTreeMap::from([(WIDE_COLUMN, size.length.short)]), size.length.number, SALES_COLUMNS),
columns: LineIndex::new(&BTreeMap::from([(WIDE_COLUMN, size.length.short)]), size.length.number.md, SALES_COLUMNS),
merges: Vec::new(),
frozen: (1, 0),
cells,
@@ -102,7 +102,7 @@ impl StorySheet {
.collect::<Vec<_>>();
let mut sheet = StorySheet {
rows: LineIndex::new(&BTreeMap::new(), size.control.sm, rows),
columns: LineIndex::new(&hidden, size.length.number, SHEET_COLUMNS),
columns: LineIndex::new(&hidden, size.length.number.md, SHEET_COLUMNS),
merges: if rows > 3 { vec![CellRange::cells(CellAt::new(2, 1), CellAt::new(3, 2))] } else { Vec::new() },
frozen: (rows.min(1), 1),
cells,
+8 -2
View File
@@ -52,8 +52,14 @@
"sm": 14.0
},
"length": {
"field": 240.0,
"number": 90.0,
"field": {
"md": 240.0,
"sm": 192.0
},
"number": {
"md": 90.0,
"sm": 72.0
},
"short": 120.0,
"track": 144.0
},
+8 -2
View File
@@ -52,8 +52,14 @@
"sm": 12.0
},
"length": {
"field": 192.0,
"number": 72.0,
"field": {
"md": 192.0,
"sm": 160.0
},
"number": {
"md": 72.0,
"sm": 60.0
},
"short": 96.0,
"track": 128.0
},
+4 -2
View File
@@ -168,10 +168,12 @@ fn size_lines(out: &mut Lines, size: &SizeTokens) {
out.line("size.plot.width", len(*width));
out.line("size.plot.height", len(*height));
let LengthSizes { field, track, short, number } = length;
out.line("size.length.field", len(*field));
out.line("size.length.field.sm", len(field.sm));
out.line("size.length.field.md", len(field.md));
out.line("size.length.track", len(*track));
out.line("size.length.short", len(*short));
out.line("size.length.number", len(*number));
out.line("size.length.number.sm", len(number.sm));
out.line("size.length.number.md", len(number.md));
out.line("size.groove", len(*groove));
let RampSizes { bar, groove: ramp_groove } = ramp;
out.line("size.ramp.bar", len(*bar));
+2
View File
@@ -246,6 +246,8 @@ impl SizeSet {
}
};
le("base.size.control.sm", s.control.sm, "at most base.size.control.md", s.control.md);
le("base.size.length.field.sm", s.length.field.sm, "at most base.size.length.field.md", s.length.field.md);
le("base.size.length.number.sm", s.length.number.sm, "at most base.size.length.number.md", s.length.number.md);
le("base.size.icon.sm", s.icon.sm, "at most base.size.icon.md", s.icon.md);
le("base.size.icon.md", s.icon.md, "at most base.size.icon.lg", s.icon.lg);
le("base.size.icon.glyph_sm", s.icon.glyph_sm, "at most base.size.icon.sm", s.icon.sm);
+4 -2
View File
@@ -124,10 +124,12 @@ pub(crate) fn leaves(b: &mut Preset) -> Vec<Leaf<'_>> {
"base.size.checker" Num 1.0..=32.0 => s.checker;
"base.size.plot.width" Num 48.0..=640.0 => s.plot.width;
"base.size.plot.height" Num 32.0..=480.0 => s.plot.height;
"base.size.length.field" Num 64.0..=1024.0 => s.length.field;
"base.size.length.field.sm" Num 64.0..=1024.0 => s.length.field.sm;
"base.size.length.field.md" Num 64.0..=1024.0 => s.length.field.md;
"base.size.length.track" Num 48.0..=1024.0 => s.length.track;
"base.size.length.short" Num 32.0..=512.0 => s.length.short;
"base.size.length.number" Num 32.0..=512.0 => s.length.number;
"base.size.length.number.sm" Num 32.0..=512.0 => s.length.number.sm;
"base.size.length.number.md" Num 32.0..=512.0 => s.length.number.md;
"base.size.groove" Num 0.25..=16.0 => s.groove;
"base.size.ramp.bar" Num 1.0..=64.0 => s.ramp.bar;
"base.size.ramp.groove" Num 0.25..=32.0 => s.ramp.groove;
+6 -5
View File
@@ -139,7 +139,7 @@ pub struct Insets {
pub screen: f32,
}
/// Control heights, in logical pixels.
/// One length per control size, in logical pixels: control heights, field widths.
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct ControlSizes {
/// Small controls.
@@ -314,14 +314,15 @@ pub struct PointerTipOffset {
/// Lengths of controls that stretch along one axis, in logical pixels.
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct LengthSizes {
/// The width of a text or value field.
pub field: f32,
/// The width of a text or value field, one per control size: a field in a small options bar is narrower than one
/// in a dialog.
pub field: ControlSizes,
/// The length of a value track (a slider, a range slider, a thumb row).
pub track: f32,
/// The width of a short field, such as a number beside a slider.
pub short: f32,
/// The width of a number field over a slider.
pub number: f32,
/// The width of a number field over a slider, one per control size.
pub number: ControlSizes,
}
/// Thicknesses of gradient ramps, in logical pixels.
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 300
size.plot.height = 180
size.length.field = 240
size.length.field.sm = 192
size.length.field.md = 240
size.length.track = 144
size.length.short = 120
size.length.number = 90
size.length.number.sm = 72
size.length.number.md = 90
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -156,10 +156,12 @@ size.hit.target = 8
size.checker = 4
size.plot.width = 240
size.plot.height = 144
size.length.field = 192
size.length.field.sm = 160
size.length.field.md = 192
size.length.track = 128
size.length.short = 96
size.length.number = 72
size.length.number.sm = 60
size.length.number.md = 72
size.groove = 3
size.ramp.bar = 10
size.ramp.groove = 5
@@ -81,7 +81,7 @@ pub(super) fn decide(ctx: &egui::Context, env: &Env, input: &LabelIn<'_>, kids:
}
let baseline = leaf.baseline.get();
if input.side.layout == FieldLayout::Line {
let (cell, rest) = flow.take_end(env.tokens.size.length.number);
let (cell, rest) = flow.take_end(env.control(input.size).number);
let width = natural.x.min((rest.rect().width() - gap).max(0.0));
let drop = (cell.height() - natural.y).max(0.0) / 2.0;
let label = Flow::new(rest.rect(), rtl).align(Vec2::new(width, natural.y), Align::Min, Align::Min).translate(Vec2::new(0.0, drop));
@@ -103,8 +103,8 @@ pub enum FieldLayout {
/// After the control, as check box and radio labels sit: the control takes its narrowest width and the label
/// follows it, on the end side under RTL. The row never stacks.
After,
/// On one line: the label at the start and the control in a `size.length.number` cell at the end, as a number
/// field sits over its slider. The label elides before the cell. The row never stacks.
/// On one line: the label at the start and the control in a cell of `size.length.number` at the control's size at
/// the end, as a number field sits over its slider. The label elides before the cell. The row never stacks.
Line,
/// In the control's box at its start, in the slot a control that offers one shows it (a number field's leading
/// adornment); the control takes the whole row. For a glyph label of a body that is one such control: the slot
+1 -1
View File
@@ -275,7 +275,7 @@ impl Scoped {
self.scroll_owner.is_some_and(|owner| owner.view)
}
/// The height, icon side, padding and gap of a control of `size`, with the line ratio of this scope.
/// The height, icon side, padding, gap and field widths of a control of `size`, with the line ratio of this scope.
pub(crate) fn control(&self, size: craft_theme::ControlSize) -> craft_behavior::ControlMetrics {
crate::style::control_metrics(&self.tokens, size, self.line_ratio)
}
+1 -1
View File
@@ -22,7 +22,7 @@ pub struct EnvView<'a> {
}
impl<'a> EnvView<'a> {
/// The height, icon side, padding and gap of a control of `size`.
/// The height, icon side, padding, gap and field widths of a control of `size`.
pub(crate) fn control(&self, size: craft_theme::ControlSize) -> craft_behavior::ControlMetrics {
self.scoped.control(size)
}
+4 -2
View File
@@ -257,7 +257,7 @@ impl<'a> StyleCx<'a> {
})
}
/// The height, icon side, padding and gap of a control at the ambient size.
/// The height, icon side, padding, gap and field widths of a control at the ambient size.
pub fn control(&self) -> ControlMetrics {
self.control_of(self.size)
}
@@ -416,7 +416,7 @@ impl<'a> StyleCx<'a> {
}
}
/// The height, icon side, padding and gap of a control of `size`.
/// The height, icon side, padding, gap and field widths of a control of `size`.
///
/// The height is the size token, or more when the face that leads the interface stack sets taller rows than the
/// token's type line: the control's vertical padding (the token height less the label role's line height, which
@@ -434,5 +434,7 @@ pub(crate) fn control_metrics(tokens: &UiTokens, size: ControlSize, line_ratio:
&BySize { sm: sizes.icon.sm, md: sizes.icon.md },
&BySize { sm: pad, md: pad },
&BySize { sm: gap, md: gap },
&BySize { sm: sizes.length.field.sm, md: sizes.length.field.md },
&BySize { sm: sizes.length.number.sm, md: sizes.length.number.md },
)
}
@@ -50,7 +50,7 @@ impl PaneContent<u32> for Panes {
#[story(PaneArea<'static, u32>, covers = [], drive = Drive::Never)]
fn pane_area(ui: &mut Ui, _: &mut StoryData) -> StoryOutput {
let size = &Env::of(ui).tokens.size;
let mut content = Panes { float: Vec2::new(size.float.width, size.float.height), side: size.length.field, layers: layer_names() };
let mut content = Panes { float: Vec2::new(size.float.width, size.float.height), side: size.length.field.md, layers: layer_names() };
let open = [0_u32, 1];
PaneArea::new("Panes", &open, &mut content)
.show(ui, |ui, _| {
@@ -62,7 +62,7 @@ fn pane_area(ui: &mut Ui, _: &mut StoryData) -> StoryOutput {
fn spec(ui: &Ui, title: &str, collection_body: bool) -> PaneSpec {
let size = &Env::of(ui).tokens.size;
let mut spec =
PaneSpec::new(title.to_owned(), PaneState::docked(PaneEdge::Start, size.length.field), Vec2::new(size.float.width, size.float.height));
PaneSpec::new(title.to_owned(), PaneState::docked(PaneEdge::Start, size.length.field.md), Vec2::new(size.float.width, size.float.height));
spec.collection_body = collection_body;
spec
}
+1 -1
View File
@@ -186,7 +186,7 @@ impl<K: Value + 'static> Component for BreadcrumbBar<'_, K> {
gap,
joint: icon + 2.0 * gap,
ellipsis_pad: 2.0 * gap,
crumb_cap: cx.tokens.size.length.field,
crumb_cap: cx.control().field,
}
}
+2 -2
View File
@@ -227,10 +227,10 @@ impl Component for SliderField<'_> {
let control = cx.control();
SliderFieldStyle {
metrics: Metrics::new().gap(control.gap),
field: cx.tokens.size.length.number,
field: control.number,
inline_gap: cx.tokens.space.gap.section,
row: control.height,
width: cx.tokens.size.length.field,
width: control.field,
}
}
+2 -1
View File
@@ -121,7 +121,8 @@ impl Component for UnitSelect<'_> {
type Output = UnitSelectOutput;
fn style(cx: &StyleCx<'_>, _: UnitSelectStyleKey) -> UnitSelectStyle {
UnitSelectStyle { metrics: Metrics::new().gap(cx.control().gap), number: cx.tokens.size.length.field }
let control = cx.control();
UnitSelectStyle { metrics: Metrics::new().gap(control.gap), number: control.field }
}
fn sense(&self) -> Sense {
+3 -3
View File
@@ -34,8 +34,8 @@ use egui::Vec2;
pub struct FieldStyle {
#[style(surface)]
surface: SurfaceLook,
/// Padding, the gap between adornments and the text, a control high, and `size.length.field` wide where the room
/// allows; a row that lacks room narrows it to `size.length.short`.
/// Padding, the gap between adornments and the text, a control high, and `size.length.field` at the control's size
/// wide where the room allows; a row that lacks room narrows it to `size.length.short`.
#[style(metrics)]
metrics: Metrics,
/// A glyph adornment: its side and colour.
@@ -53,7 +53,7 @@ impl FieldStyle {
.padding(Insets::horizontal(control.pad_x))
.gap(control.gap)
.min_size(Vec2::new(cx.tokens.size.length.short, control.height))
.ideal_width(cx.tokens.size.length.field)
.ideal_width(control.field)
// Where a row shrinks it, a field narrows to its padding and one glyph; what it shows there (an
// ellipsis, its adornments) its content measure adds.
.least_width(2.0 * control.pad_x + control.icon);
+4 -1
View File
@@ -71,6 +71,8 @@ pub struct NumberStyle {
field: FieldStyle,
/// The colour of the inside label's glyph, a scrub handle.
handle: Stateful<StyleColor>,
/// The width of one number cell at the control's size (`size.length.number`), padding included.
cell: f32,
}
/// A number field: a text part over [`NumberCodec`]; empty text is `None`.
@@ -352,6 +354,7 @@ impl<V: NumberValue + 'static> Component for NumberField<'_, V> {
metrics: field.clone().sized_by_content().metrics,
unit: TextLook::new(TypeRole::Body, Stateful::new(faint).off(States::new(faint, faint, faint, cx.color(cx.tokens.color.text.disabled)))),
handle: Stateful::new(muted).off(States::new(muted, muted, muted, cx.color(cx.tokens.color.text.disabled))),
cell: cx.control().number,
field,
}
}
@@ -386,7 +389,7 @@ impl<V: NumberValue + 'static> Component for NumberField<'_, V> {
return Vec2::new(width, text.y);
}
let field = cx.style.field.metrics();
let width = width.max(cx.tokens.size.length.number - field.padding.start - field.padding.end);
let width = width.max(cx.style.cell - field.padding.start - field.padding.end);
Vec2::new(width, text.y)
}
+1
View File
@@ -9,3 +9,4 @@ mod number;
mod number_length;
mod selectable;
mod text_field;
mod widths;
+32
View File
@@ -0,0 +1,32 @@
//! A field takes the width of its control size: a small field, as an options bar shows it, is narrower than the same
//! field at the standard size, as a dialog shows it.
use craft_theme::ControlSize;
use craft_ui::contract::{Bind, Entry, Props as _, Show as _};
use craft_ui::pickers::Select;
use craft_ui::testing::{Frames, trial};
use craft_ui::text::{NumberField, TextField};
use std::cell::Cell;
/// The widths of a text field, a select and a number field shown at `size` in a wide row.
fn widths(size: ControlSize) -> [f32; 3] {
let mut frames = Frames::new();
let shown = Cell::new([0.0; 3]);
let (mut text, mut number, mut picked) = (String::new(), Some(1.0), 1u8);
let entries = [Entry::new(1u8, "One"), Entry::new(2u8, "Two")];
frames.idle(3, |ui| {
let text_width = TextField::new("Name", Bind::bound(&mut text)).size(size).id_salt("text").show(ui).response.rect.width();
let select_width = Select::new("Pick", Bind::bound(&mut picked), &entries).size(size).id_salt("select").show(ui).response.rect.width();
let number_width = NumberField::new("Size", Bind::bound(&mut number)).size(size).id_salt("number").show(ui).response.rect.width();
shown.set([text_width, select_width, number_width]);
});
shown.get()
}
#[trial]
fn a_small_field_is_narrower_than_a_standard_one() {
let (small, standard) = (widths(ControlSize::Sm), widths(ControlSize::Md));
for (name, (small, standard)) in ["text field", "select", "number field"].into_iter().zip(small.into_iter().zip(standard)) {
assert!(small > 0.0 && small < standard, "a small {name} is narrower than a standard one: {small} against {standard}");
}
}
+4 -2
View File
@@ -983,13 +983,15 @@ A theme with its own shape replaces the radii or adds an offset to control, surf
| `size.ramp.bar` | Gradient ramp drawn as a bar of its own |
| `size.ramp.groove` | Gradient ramp drawn as the groove of a value track |
| `size.rail.width`, `size.rail.button` | Tool rail and panel rail |
| `size.length.field`, `size.length.track`, `size.length.short`, `size.length.number` | Text or value field, value track, short field, number field over a slider |
| `size.length.field.sm`, `size.length.field.md` | Text or value field, one width per control size: a field in a small options bar is narrower than one in a dialog |
| `size.length.number.sm`, `size.length.number.md` | Number field and the number cell over a slider, one width per control size |
| `size.length.track`, `size.length.short` | Value track, short field |
| `size.notice.width` | Width of a toast card where the room allows |
| `size.story.height`, `size.story.width_min`, `size.story.width_max` | The stage a story of a canvas control draws its canvas on: its height and the range of its width; `width_min` is also the least width of a column of a story grid |
| `size.thumb.card` | The picture side of a tile card at zoom 1 (tile grids, preset browsers, the start screen) |
| `space.gap.*`, `space.pad.*` | Gaps between and padding inside components |
Both size sets (`crates/theme/sizes/compact.json` and `comfortable.json`) hold every role above. NumberField is at least `size.length.number` wide; apps set other widths per field.
Both size sets (`crates/theme/sizes/compact.json` and `comfortable.json`) hold every role above. NumberField is at least `size.length.number` at its control size wide; apps set other widths per field.
## Appendix B. Crate and module layout