Theme: field widths follow the text size; a field holds a number of characters

This commit is contained in:
aiongg
2026-11-13 00:45:28 +00:00
parent fcc93550ef
commit a8607f3526
2 changed files with 14 additions and 3 deletions
+4 -3
View File
@@ -6,7 +6,7 @@ use super::ramp::Mode;
use super::scale::{Easing, Elevation};
use super::sizes;
use super::theme::{Appearance, Contrast, ContrastIntent, PinLayer, Pins, ThemeDef};
use super::tokens::{ColorToken, Edge, ElevationTokens, Motion, MotionTokens, RadiusSet, ShapeTokens, Tokens};
use super::tokens::{ColorToken, Edge, ElevationTokens, Motion, MotionTokens, RadiusSet, ShapeTokens, SizeTokens, Tokens};
use super::values;
use crate::AppId;
@@ -202,13 +202,14 @@ fn resolve_concrete(theme: &ThemeDef, appearance: Appearance, app: Option<&AppId
let radius = RadiusSet { sm: (radius.control / 2.0).round(), ..radius };
let shape =
ShapeTokens { radius, edge, rows: seed.and_then(|s| s.rows).unwrap_or(preset.rows), knob: seed.and_then(|s| s.knob).unwrap_or_default() };
let typography = preset.typography.scaled(sizes.text_steps.factor(appearance.text_size), values::TYPE_ROUNDING);
let text_factor = sizes.text_steps.factor(appearance.text_size);
let typography = preset.typography.scaled(text_factor, values::TYPE_ROUNDING);
let tokens = Tokens {
color,
shape,
space: preset.space,
size: preset.size,
size: SizeTokens { length: preset.size.length.text_scaled(text_factor), ..preset.size },
stroke: preset.stroke,
typography,
elevation,
+10
View File
@@ -342,6 +342,16 @@ pub struct LengthSizes {
pub number: ControlSizes,
}
impl LengthSizes {
/// The field widths multiplied by `factor` and rounded to whole pixels: a field holds a number of characters, so
/// its width follows the text size. The track holds no text and keeps its length.
pub(crate) fn text_scaled(self, factor: f32) -> LengthSizes {
let round = |v: f32| (v * factor).round();
let sizes = |c: ControlSizes| ControlSizes { sm: round(c.sm), md: round(c.md) };
LengthSizes { field: sizes(self.field), short: round(self.short), number: sizes(self.number), ..self }
}
}
/// Row heights other than a control's, in logical pixels.
#[derive(Clone, Copy, Debug, Default, PartialEq)]
pub struct RowSizes {