Add xsmall controls for close affordances

- Add the xsmall size class and Sizable::xsmall().
- Use xsmall close buttons in tabs, dialogs, and alerts.
- Assert xsmall and medium button heights.
This commit is contained in:
2026-11-16 19:05:44 +07:00
parent 03648469ec
commit be457c1bba
7 changed files with 71 additions and 11 deletions
+23
View File
@@ -169,6 +169,7 @@ impl ThemeVariant {
/// A named control size class.
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
pub enum Size {
XSmall,
Small,
/// The default.
#[default]
@@ -496,6 +497,7 @@ pub struct ControlMetrics {
/// The control metrics for every size class.
#[derive(Clone, Copy, Debug, PartialEq)]
pub struct SizeTable {
pub xsmall: ControlMetrics,
pub small: ControlMetrics,
pub medium: ControlMetrics,
pub large: ControlMetrics,
@@ -522,6 +524,25 @@ impl SizeTable {
switch_knob: f32,
}
let xsmall = ClassFactors {
control_height: 1.5,
input_height: 1.5,
padding_x: 0.375,
text_size: 0.75,
icon_size: 0.75,
dense_icon_size: 0.625,
indicator_size: 0.75,
avatar_size: 1.25,
caption_size: 0.625,
dense_padding_x: 0.375,
plate_inset: 0.0625,
strip_height: 1.5,
menu_item_height: 1.5,
switch_height: 1.0,
switch_width: 1.75,
switch_knob: 0.625,
};
let small = ClassFactors {
control_height: 1.75,
input_height: 1.75,
@@ -599,6 +620,7 @@ impl SizeTable {
};
Self {
xsmall: metrics(&xsmall),
small: metrics(&small),
medium: metrics(&medium),
large: metrics(&large),
@@ -608,6 +630,7 @@ impl SizeTable {
/// The metrics for `size`.
pub fn resolve(&self, size: Size) -> ControlMetrics {
match size {
Size::XSmall => self.xsmall,
Size::Small => self.small,
Size::Medium => self.medium,
Size::Large => self.large,
+13
View File
@@ -293,6 +293,19 @@ mod tests {
assert_eq!(resolved.sizes.medium.control_height, px(32.));
assert_eq!(resolved.sizes.medium.input_height, px(32.));
assert_eq!(resolved.sizes.medium.text_size, px(14.));
assert_eq!(resolved.sizes.xsmall.control_height, px(24.));
assert_eq!(resolved.sizes.xsmall.input_height, px(24.));
assert_eq!(resolved.sizes.xsmall.text_size, px(12.));
assert_eq!(resolved.sizes.xsmall.icon_size, px(12.));
assert_eq!(resolved.sizes.xsmall.indicator_size, px(12.));
assert_eq!(resolved.sizes.xsmall.avatar_size, px(20.));
assert_eq!(resolved.sizes.xsmall.caption_size, px(10.));
assert_eq!(resolved.sizes.xsmall.dense_padding_x, px(6.));
assert_eq!(resolved.sizes.xsmall.plate_inset, px(1.));
assert_eq!(resolved.sizes.xsmall.menu_item_height, px(24.));
assert_eq!(resolved.sizes.xsmall.switch_height, px(16.));
assert_eq!(resolved.sizes.xsmall.switch_width, px(28.));
assert_eq!(resolved.sizes.xsmall.switch_knob, px(10.));
assert_eq!(resolved.sizes.small.control_height, px(28.));
assert_eq!(resolved.sizes.small.text_size, px(12.));
assert_eq!(resolved.sizes.small.avatar_size, px(24.));