mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-17 01:44:25 +00:00
Panel options: thumbnail size samples take their own size role
The samples beside the thumbnail size choices of a panel's options dialog (Layers, Channels, Paths) are larger than the
panel's own thumbnails, so the three choices read apart. They take `size.thumb.sample.{sm,md,lg}`: 36, 48 and 96 in
Compact, 36, 68 and 96 in Comfortable (twice the row thumbnails, as the old dialog drew them; PhotoCraft draws 38, 68
and 96). A Picture shows one through `PictureSize::Sample`, and the Layers options dialog's samples use it.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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": {
|
||||
|
||||
@@ -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": {
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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};
|
||||
|
||||
@@ -116,6 +116,9 @@ pub(crate) fn leaves(b: &mut Preset) -> Vec<Leaf<'_>> {
|
||||
"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;
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 }
|
||||
}
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user