diff --git a/crates/layers/src/ui/options/mod.rs b/crates/layers/src/ui/options/mod.rs index 946406cbe..9511e2752 100644 --- a/crates/layers/src/ui/options/mod.rs +++ b/crates/layers/src/ui/options/mod.rs @@ -310,7 +310,7 @@ impl StackDialog for LayersOptionsDialog { if size == ThumbSize::None { cx.labelled(ui, size, size.label(&list), side, Radio::new(size)); } else { - let sample = Picture::new(words.sample.clone(), SAMPLE_KEY, &sample_image).extent(PictureSize::Thumb(size)); + let sample = Picture::new(words.sample.clone(), SAMPLE_KEY, &sample_image).extent(PictureSize::Sample(size)); cx.labelled_with(ui, size, size.label(&list), side.kind(LabelKind::Hidden), Radio::new(size), sample); } } diff --git a/crates/theme/sizes/comfortable.json b/crates/theme/sizes/comfortable.json index c9d461dcb..0ff518979 100644 --- a/crates/theme/sizes/comfortable.json +++ b/crates/theme/sizes/comfortable.json @@ -111,6 +111,11 @@ "card": 160.0, "lg": 48.0, "md": 34.0, + "sample": { + "lg": 96.0, + "md": 68.0, + "sm": 36.0 + }, "sm": 18.0 }, "window": { diff --git a/crates/theme/sizes/compact.json b/crates/theme/sizes/compact.json index 831b9356f..a3087f603 100644 --- a/crates/theme/sizes/compact.json +++ b/crates/theme/sizes/compact.json @@ -111,6 +111,11 @@ "card": 128.0, "lg": 48.0, "md": 24.0, + "sample": { + "lg": 96.0, + "md": 48.0, + "sm": 36.0 + }, "sm": 18.0 }, "window": { diff --git a/crates/theme/src/dump.rs b/crates/theme/src/dump.rs index 6394cecf3..3e49dc6a1 100644 --- a/crates/theme/src/dump.rs +++ b/crates/theme/src/dump.rs @@ -9,7 +9,7 @@ use crate::{ BarSizes, ColorToken, ControlSizes, DialogSizes, DockColumnSizes, Easing, Edge, Elevation, ElevationTokens, FloatSizes, FontSlot, Gaps, HandleSizes, HitSizes, IconSizes, Insets, KnobShape, LengthSizes, Motion, MotionTokens, NoticeSizes, Pads, PaneSizes, PlotSizes, RadiusSet, RailSizes, RampSizes, Rgba, RowSizes, RowStyle, RulerSizes, RulerTickSizes, ShapeTokens, SizeTokens, SpaceTokens, StorySizes, StrokeTokens, - ThumbSizes, Tokens, TypeStyle, TypeTokens, WindowSizes, + ThumbSamples, ThumbSizes, Tokens, TypeStyle, TypeTokens, WindowSizes, }; /// The text of every token, one `key = value` line each, in a fixed order. @@ -153,11 +153,15 @@ fn size_lines(out: &mut Lines, size: &SizeTokens) { out.line("size.panel_header", len(*panel_header)); out.line("size.popup_min", len(*popup_min)); out.line("size.scroll_fade", len(*scroll_fade)); - let ThumbSizes { sm, md, lg, card } = thumbs; + let ThumbSizes { sm, md, lg, card, sample } = thumbs; out.line("size.thumb.sm", len(*sm)); out.line("size.thumb.md", len(*md)); out.line("size.thumb.lg", len(*lg)); out.line("size.thumb.card", len(*card)); + let ThumbSamples { sm, md, lg } = sample; + out.line("size.thumb.sample.sm", len(*sm)); + out.line("size.thumb.sample.md", len(*md)); + out.line("size.thumb.sample.lg", len(*lg)); let HandleSizes { sm, md, ring } = handle; out.line("size.handle.sm", len(*sm)); out.line("size.handle.md", len(*md)); diff --git a/crates/theme/src/format/sizes.rs b/crates/theme/src/format/sizes.rs index 6ebb7608d..40ec1d61e 100644 --- a/crates/theme/src/format/sizes.rs +++ b/crates/theme/src/format/sizes.rs @@ -257,6 +257,8 @@ impl SizeSet { le("base.stroke.thick", self.base.stroke.thick, "at most base.stroke.heavy", self.base.stroke.heavy); le("base.size.thumb.sm", s.thumb.sm, "at most base.size.thumb.md", s.thumb.md); le("base.size.thumb.md", s.thumb.md, "at most base.size.thumb.lg", s.thumb.lg); + le("base.size.thumb.sample.sm", s.thumb.sample.sm, "at most base.size.thumb.sample.md", s.thumb.sample.md); + le("base.size.thumb.sample.md", s.thumb.sample.md, "at most base.size.thumb.sample.lg", s.thumb.sample.lg); le("base.size.row.text", s.row.text, "at most base.size.control.sm", s.control.sm); let t = &self.base.typography; if s.row.text < t.body.line_height { diff --git a/crates/theme/src/lib.rs b/crates/theme/src/lib.rs index a286a7e6a..8297044e5 100644 --- a/crates/theme/src/lib.rs +++ b/crates/theme/src/lib.rs @@ -96,7 +96,7 @@ pub use tokens::{ ElevationTokens, FloatSizes, FontSlot, Gaps, HandleSizes, HitSizes, IconSizes, Insets, KnobShape, LengthSizes, LineColors, Motion, MotionTokens, NoticeSizes, OverlayColors, Pads, PaneSizes, PlotSizes, RadiusSet, RailSizes, RampSizes, RowSizes, RowStyle, RulerSizes, RulerTickSizes, ShapeTokens, SizeTokens, SpaceTokens, StateColors, Status, StatusColors, StatusKind, StorySizes, StrokeTokens, SurfaceColors, TextColors, - ThumbSizes, Tokens, TypeRole, TypeStyle, TypeTokens, WindowSizes, + ThumbSamples, ThumbSizes, Tokens, TypeRole, TypeStyle, TypeTokens, WindowSizes, }; pub use values::ColorSource; pub use variant::{CustomVariant, Emphasis, RadiusStep, Variant, VariantLook}; diff --git a/crates/theme/src/sizes.rs b/crates/theme/src/sizes.rs index 8ffb397cc..769fc8ad6 100644 --- a/crates/theme/src/sizes.rs +++ b/crates/theme/src/sizes.rs @@ -116,6 +116,9 @@ pub(crate) fn leaves(b: &mut Preset) -> Vec> { "base.size.thumb.md" Num 12.0..=96.0 => s.thumb.md; "base.size.thumb.lg" Num 12.0..=96.0 => s.thumb.lg; "base.size.thumb.card" Num 48.0..=512.0 => s.thumb.card; + "base.size.thumb.sample.sm" Num 12.0..=192.0 => s.thumb.sample.sm; + "base.size.thumb.sample.md" Num 12.0..=192.0 => s.thumb.sample.md; + "base.size.thumb.sample.lg" Num 12.0..=192.0 => s.thumb.sample.lg; "base.size.handle.sm" Num 2.0..=32.0 => s.handle.sm; "base.size.handle.md" Num 2.0..=32.0 => s.handle.md; "base.size.handle.ring" Num 2.0..=64.0 => s.handle.ring; diff --git a/crates/theme/src/tokens/size.rs b/crates/theme/src/tokens/size.rs index a374d0c54..db4f6792d 100644 --- a/crates/theme/src/tokens/size.rs +++ b/crates/theme/src/tokens/size.rs @@ -416,4 +416,18 @@ pub struct ThumbSizes { pub lg: f32, /// The picture side of a tile card at zoom 1: the cards of a tile grid. pub card: f32, + /// The samples of a thumbnail size choice in a panel's options dialog (Layers, Channels, Paths). + pub sample: ThumbSamples, +} + +/// The sample pictures beside the three thumbnail size choices of a panel's options dialog, in logical pixels: larger +/// than the panel's own thumbnails, so the three read apart at a glance. +#[derive(Clone, Copy, Debug, Default, PartialEq)] +pub struct ThumbSamples { + /// The sample of the small size. + pub sm: f32, + /// The sample of the medium size. + pub md: f32, + /// The sample of the large size. + pub lg: f32, } 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 d45b78907..bc87090f5 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-dark-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 e3e5dfb54..b69adc6b1 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-dark-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 63c41c140..42c70e1ad 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-dark-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 9b513b5c9..5b0da8825 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-dark-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 8b5d0666f..574b6698d 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-light-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 f0b8e67ae..f76ca4315 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-light-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 8fb3e9955..a41187ba0 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-light-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 2d364c0cd..3f453c6a3 100644 --- a/crates/theme/tests/dumps/tokens/adwaita-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/adwaita-light-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 56dc975d2..e1efaac44 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-dark-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 9c86d969a..7fc60a23d 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-dark-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 a6d78f4cb..11396adb3 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-dark-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 aff4f5987..932635eda 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-dark-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 a55031ba5..e720daa15 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-light-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 9bd4ab750..2fdecd9fb 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-light-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 b1974fa1b..8dd4af4e8 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-light-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 f6de54320..db9e00682 100644 --- a/crates/theme/tests/dumps/tokens/artcraft-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/artcraft-light-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 f245d90f6..e48bd5da5 100644 --- a/crates/theme/tests/dumps/tokens/breeze-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/breeze-dark-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 d6f936651..0309ca12d 100644 --- a/crates/theme/tests/dumps/tokens/breeze-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/breeze-dark-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 fe4a8286d..95823548b 100644 --- a/crates/theme/tests/dumps/tokens/breeze-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/breeze-dark-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 8e3c7aeba..0c38c900e 100644 --- a/crates/theme/tests/dumps/tokens/breeze-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/breeze-dark-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 ada1aa988..2d6a3cc4f 100644 --- a/crates/theme/tests/dumps/tokens/breeze-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/breeze-light-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 73ae550c7..1c13c33c6 100644 --- a/crates/theme/tests/dumps/tokens/breeze-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/breeze-light-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 8bbedd250..4ea78a84a 100644 --- a/crates/theme/tests/dumps/tokens/breeze-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/breeze-light-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 2e5fd4ed1..bfb99eeb6 100644 --- a/crates/theme/tests/dumps/tokens/breeze-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/breeze-light-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 019653909..fb818ef4c 100644 --- a/crates/theme/tests/dumps/tokens/classic-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/classic-light-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 f7f774714..913621904 100644 --- a/crates/theme/tests/dumps/tokens/classic-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/classic-light-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 57e03aa9c..a65a60049 100644 --- a/crates/theme/tests/dumps/tokens/classic-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/classic-light-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 0ea4cb11e..5c69fc30c 100644 --- a/crates/theme/tests/dumps/tokens/classic-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/classic-light-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 157d53160..d9473f2d6 100644 --- a/crates/theme/tests/dumps/tokens/graphite-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/graphite-dark-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 07ce5197a..f368f538c 100644 --- a/crates/theme/tests/dumps/tokens/graphite-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/graphite-dark-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 3619813eb..958d8b02c 100644 --- a/crates/theme/tests/dumps/tokens/graphite-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/graphite-dark-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 f55f65d91..c9e83f1ef 100644 --- a/crates/theme/tests/dumps/tokens/graphite-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/graphite-dark-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 28cccacfa..9d56da341 100644 --- a/crates/theme/tests/dumps/tokens/graphite-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/graphite-light-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 826ba9d27..50980d9bf 100644 --- a/crates/theme/tests/dumps/tokens/graphite-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/graphite-light-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 c0ccf6c51..d25e5620b 100644 --- a/crates/theme/tests/dumps/tokens/graphite-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/graphite-light-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 be3ebb507..63f1942e6 100644 --- a/crates/theme/tests/dumps/tokens/graphite-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/graphite-light-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 6c7a0b7da..9a3b98b5e 100644 --- a/crates/theme/tests/dumps/tokens/pro-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-dark-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 4c408470e..0d381170f 100644 --- a/crates/theme/tests/dumps/tokens/pro-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-dark-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 8906e9f75..5b6a26da9 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 @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 c69187af9..8eb91933e 100644 --- a/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-dark-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 b7d271de7..133f363a0 100644 --- a/crates/theme/tests/dumps/tokens/pro-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-dark-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 ebe69b93a..2c6235614 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 @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 695248fc7..21430b9dd 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 @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 db3f4c9cb..edd656c24 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 @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 e280d3a6f..8db52b7dc 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 @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 d7ca9ff08..8e02efb76 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 f9e29e239..786599431 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 ff17733de..cd5a8d203 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 291ab5953..3dca3fe24 100644 --- a/crates/theme/tests/dumps/tokens/pro-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/pro-light-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 c62cfd8f8..a0dc21a34 100644 --- a/crates/theme/tests/dumps/tokens/soft-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/soft-dark-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 5ae200719..f618b07e6 100644 --- a/crates/theme/tests/dumps/tokens/soft-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/soft-dark-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 1516a4eba..aa2245082 100644 --- a/crates/theme/tests/dumps/tokens/soft-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/soft-dark-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 5275cb4e7..858b9ebb4 100644 --- a/crates/theme/tests/dumps/tokens/soft-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/soft-dark-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 9d99a6af1..8c7d91703 100644 --- a/crates/theme/tests/dumps/tokens/soft-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/soft-light-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 017fb7904..070e5ff55 100644 --- a/crates/theme/tests/dumps/tokens/soft-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/soft-light-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 eba0a5320..7adafd0c5 100644 --- a/crates/theme/tests/dumps/tokens/soft-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/soft-light-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 f174c455b..3216d3a11 100644 --- a/crates/theme/tests/dumps/tokens/soft-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/soft-light-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 7e80ac433..0dc10ceff 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 @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 5ec97c630..8d07ac103 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 @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 acbdd1d3e..754e84d1a 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 @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 055f9fd6d..b90e2f90d 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 @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 0252393a3..d4c69536b 100644 --- a/crates/theme/tests/dumps/tokens/studio-dark-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/studio-dark-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 01c26d48c..242787699 100644 --- a/crates/theme/tests/dumps/tokens/studio-dark-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/studio-dark-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 0679ce481..c42924b11 100644 --- a/crates/theme/tests/dumps/tokens/studio-dark-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/studio-dark-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 084ce1cae..135838d68 100644 --- a/crates/theme/tests/dumps/tokens/studio-dark-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/studio-dark-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 bbc498ea9..f1ba3140d 100644 --- a/crates/theme/tests/dumps/tokens/studio-light-high-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/studio-light-high-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 904daa2a6..9321fdaed 100644 --- a/crates/theme/tests/dumps/tokens/studio-light-high-compact.txt +++ b/crates/theme/tests/dumps/tokens/studio-light-high-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 9e425e609..26d12043c 100644 --- a/crates/theme/tests/dumps/tokens/studio-light-standard-comfortable.txt +++ b/crates/theme/tests/dumps/tokens/studio-light-standard-comfortable.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 34 size.thumb.lg = 48 size.thumb.card = 160 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 68 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 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 af540fce2..2c72064c7 100644 --- a/crates/theme/tests/dumps/tokens/studio-light-standard-compact.txt +++ b/crates/theme/tests/dumps/tokens/studio-light-standard-compact.txt @@ -148,6 +148,9 @@ size.thumb.sm = 18 size.thumb.md = 24 size.thumb.lg = 48 size.thumb.card = 128 +size.thumb.sample.sm = 36 +size.thumb.sample.md = 48 +size.thumb.sample.lg = 96 size.handle.sm = 6 size.handle.md = 8 size.handle.ring = 18 diff --git a/crates/ui-widgets/src/display/picture.rs b/crates/ui-widgets/src/display/picture.rs index e64cc0499..32f2dde40 100644 --- a/crates/ui-widgets/src/display/picture.rs +++ b/crates/ui-widgets/src/display/picture.rs @@ -21,6 +21,9 @@ pub enum PictureSize { Icon, /// A thumbnail step (`size.thumb.*`); `ThumbSize::None` shows no picture. Thumb(ThumbSize), + /// The sample of a thumbnail step in a panel's options dialog (`size.thumb.sample.*`); `ThumbSize::None` shows no + /// picture. + Sample(ThumbSize), } /// The style of a picture. @@ -82,6 +85,7 @@ impl Component for Picture<'_> { let height = match key.extent { PictureSize::Icon => cx.control().icon, PictureSize::Thumb(step) => step.pick([thumbs.sm, thumbs.md, thumbs.lg]), + PictureSize::Sample(step) => step.pick([thumbs.sample.sm, thumbs.sample.md, thumbs.sample.lg]), }; PictureStyle { metrics: Metrics::new(), height } } diff --git a/docs/craft-framework.md b/docs/craft-framework.md index 29015dfe5..382bc7c99 100644 --- a/docs/craft-framework.md +++ b/docs/craft-framework.md @@ -992,6 +992,7 @@ A theme with its own shape replaces the radii or adds an offset to control, surf | `size.dialog.button`, `size.dialog.side_button` | Least width of a dialog's footer button and of a button in its column beside the body | | `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) | +| `size.thumb.sample.sm`, `size.thumb.sample.md`, `size.thumb.sample.lg` | The sample beside each thumbnail size choice in a panel's options dialog (Layers, Channels, Paths): larger than the panel's thumbnails, so the choices read apart (`PictureSize::Sample`) | | `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` at its control size wide; apps set other widths per field.