makeover_geometry/lib.rs
1//! The invariant half of the make-family design system.
2//!
3//! <!-- wiki: makeover-geometry -->
4//!
5//! [`makeover`] resolves colour, which varies by theme. This crate carries
6//! everything that does not: spacing, radius, border width and the type scale.
7//! The split is the same one Balanced Breakfast's theme contract has always
8//! drawn — *a theme overrides colour tokens only* — moved out of two app
9//! stylesheets so the three consumers stop maintaining three copies of it.
10//!
11//! # Spacing is relational, not numeric
12//!
13//! The Mac OS 8 Human Interface Guidelines specify white space by *what two
14//! things are being separated*, never by a size name, and define no base grid
15//! unit. A control and its satellite pop-up are set 4 pixels apart; peers
16//! stacked in a list get 6; a group box's inner margin is 10; separated groups
17//! and rows of push buttons get 12.
18//!
19//! That vocabulary is the primary interface here. [`Gap`] names the
20//! relationship and the size follows from it, exactly as `surface-raised`
21//! names an intent and the hex follows from it. The raw [`Step`] scale exists
22//! underneath for distances a relationship does not describe, but reaching for
23//! it is a smell worth a second look.
24//!
25//! Naming the relationship is what makes the rule reviewable. Whether a gap
26//! should be 6px or 8px is unanswerable in isolation; whether two things are
27//! peers is not.
28//!
29//! # Ratios, not pixel counts
30//!
31//! This is the deliberate departure from the HIG, which is specified in hard
32//! device pixels because in 1997 there was one pixel density and one text
33//! size. Every [`Step`] here is a [`Ratio`] of a single base unit, so the
34//! whole system scales from one knob: `--geometry-base`, `1rem` by default.
35//!
36//! At the default base the ratios land exactly on the HIG's numbers — `Snug`
37//! is three eighths of 16px, which is 6px — so nothing is lost in the
38//! translation. What is gained is that the layout tracks the user's text size
39//! instead of fighting it, an accessibility setting becomes one value rather
40//! than a sweep, and the scale means the same thing at any display density.
41//!
42//! # Density presets
43//!
44//! Naming relationships instead of sizes is what makes a density preset
45//! possible at all. [`Density`] changes what each relationship resolves to
46//! without touching a single call site, because no call site names a size.
47//! The mobile and desktop builds of a Tauri app should differ mostly by which
48//! preset they emit, not by a parallel set of hand-written mode-scoped rules.
49//!
50//! ## What Touch is a claim about
51//!
52//! Touch is a claim about the **contact patch and nothing else**. A fingertip
53//! is coarse where a cursor hotspot is a point, and the only consequence of
54//! that is mis-tap cost: when two adjacent things do different things, an
55//! imprecise contact needs more room between them to land on the intended one.
56//!
57//! Shells are not tap targets. Panel padding and the outer page margin separate
58//! a region from the edge of the screen, and no amount of coarseness in the
59//! pointing device makes that separation riskier. So **Touch opens the gaps
60//! that separate targets and leaves the shells exactly where Pointer put
61//! them**:
62//!
63//! | Gap | Pointer | Touch | why |
64//! |---|---|---|---|
65//! | bound | 4 | 4 | not a separation at all |
66//! | peer | 6 | 10 | adjacent distinct targets, the whole point |
67//! | group | 10 | 12 | holds the peer/group distinction open |
68//! | section | 12 | 16 | a deliberate break stays legible as one |
69//! | pane | 24 | 24 | a shell is not a target |
70//! | page | 32 | 32 | a shell is not a target |
71//!
72//! The previous Touch preset was thrown out on 2026-07-29 because it also
73//! *tightened* `Pane` and `Page`, on the argument that outer margin is screen
74//! you do not get. **That is a claim about screen budget, not about the input
75//! device**, and smuggling it into this axis is what broke: opening `Section`
76//! to 16 while tightening `Pane` below it made any Pointer `Pane` at or under
77//! 16 an inversion, so a derived preset silently set a floor under the one
78//! quoted from the HIG. A phone is small *and* touch; a tablet and a
79//! touchscreen laptop are big and touch. Screen budget is a separate axis and
80//! does not belong here.
81//!
82//! ## The one cross-density rule
83//!
84//! **Touch never resolves tighter than Pointer**, at any gap. Stated as a
85//! deliberate claim rather than inherited, and chosen for its direction: it
86//! constrains the *derived* preset by the *quoted* one, never the reverse. A
87//! Pointer retune downward moves freely and cannot be blocked by Touch, which
88//! is the exact failure this replaces. Only a Pointer move upward can push
89//! Touch, and that is the correct direction of authority.
90//!
91//! # Size class: the axis Density kept being asked to carry
92//!
93//! [`SizeClass`] answers **how much screen there is**, which is not the same
94//! question as what is pointing at it. A phone is small and touch; a tablet and
95//! a touchscreen laptop are big and touch; a half-width desktop window is small
96//! and pointer. Four real combinations, and one axis cannot name them.
97//!
98//! This is the home for the claim the old Touch preset was thrown out for
99//! making: *outer margin is screen you do not get*. That claim was never wrong,
100//! it was on the wrong axis, and putting it on the input device is what let a
101//! derived preset set a floor under a quoted one.
102//!
103//! Boundaries are **quoted** (Material 3 window size classes: 600 and 840)
104//! rather than derived, for the same reason the [`Gap`] values are. This crate
105//! carries the boundaries only; what appears or disappears at each is a product
106//! decision and belongs to `makeover-touch`.
107//!
108//! Deliberately absent: size class does not feed [`Gap::step_at`] yet. Whether
109//! shells tighten on a compact window is a look call, and deriving it a second
110//! time is how the last one went wrong.
111//!
112//! # Surfaces, and why a TUI is not a third density
113//!
114//! [`Surface`] is the fourth axis and the one that carries this to alloy_tui. A
115//! terminal is not a density preset; it is a surface whose smallest
116//! representable step is one cell rather than one pixel. Give
117//! [`Ratio::quanta`] a quantum and it answers in whole units of it, so the
118//! relational vocabulary crosses to a character grid with nothing added.
119//!
120//! Quantising is not a terminal special case either — a display quantises to
121//! the pixel. It is only that rounding 6.0 to the nearest pixel is
122//! uninteresting, while rounding three eighths of a cell to the nearest cell
123//! decides the layout.
124//!
125//! On [`Surface::terminal`] the pointer preset resolves to 0, 0, 1, 1, 2, 2
126//! cells. `Bound` and `Peer` collapsing to nothing is correct rather than lossy:
127//! in a grid that dense, both relationships are expressed by adjacency. A
128//! coarse surface genuinely has fewer distinctions available, and the model
129//! should say so instead of inventing a gap to keep six names distinct.
130//!
131//! So the three axes are: [`Gap`] is what is being separated, [`Density`] is
132//! who is operating it, [`Surface`] is what it is drawn on.
133
134#![forbid(unsafe_code)]
135
136use std::fmt::Write as _;
137
138/// The default base unit in CSS pixels, at a 16px root font size.
139pub const DEFAULT_BASE_PX: u16 = 16;
140
141/// The CSS custom property every ratio scales from.
142pub const BASE_TOKEN: &str = "geometry-base";
143
144/// A fraction of the base unit.
145///
146/// Rational rather than floating point so the scale is exact, comparable and
147/// usable in a `const`. At the default base every ratio below divides evenly.
148#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
149pub struct Ratio {
150 /// Top of the fraction.
151 pub numerator: u16,
152 /// Bottom of the fraction. Never zero for any ratio this crate defines.
153 pub denominator: u16,
154}
155
156impl Ratio {
157 /// Resolve against a base measured in whole pixels, rounding to nearest.
158 ///
159 /// Integer maths throughout, and exact for every [`Step`] at
160 /// [`DEFAULT_BASE_PX`] because the scale is eighths. This is
161 /// [`Self::quanta`] with a quantum of one pixel, kept separate only so the
162 /// common case stays `const`.
163 #[must_use]
164 pub const fn px_at(self, base_px: u16) -> u16 {
165 let (n, d) = (self.numerator as u32, self.denominator as u32);
166 let scaled = base_px as u32 * n;
167 // Round half away from zero without leaving integer arithmetic.
168 ((scaled * 2 + d) / (d * 2)) as u16
169 }
170
171 /// Resolve against an arbitrary base, keeping the fraction.
172 ///
173 /// The exact value, before any surface gets a say. Prefer
174 /// [`Surface::resolve`] unless you specifically want the unsnapped number.
175 #[must_use]
176 pub fn scale(self, base: f32) -> f32 {
177 base * f32::from(self.numerator) / f32::from(self.denominator)
178 }
179
180 /// How many whole quanta this ratio is worth on a surface whose smallest
181 /// representable step is `quantum`.
182 ///
183 /// The generalisation of "round to a pixel". A display quantises to one
184 /// pixel and the answer is usually uninteresting; a terminal quantises to
185 /// one cell and the answer is the whole design. Rounds to nearest, and
186 /// does not floor at one: a gap that lands below half a quantum should
187 /// collapse to nothing, because on that surface it *is* nothing.
188 ///
189 /// A `quantum` that is zero, negative or not finite yields `0` rather than
190 /// panicking or returning infinity — a surface with no smallest step is a
191 /// caller error, not a layout to guess at.
192 #[must_use]
193 pub fn quanta(self, base: f32, quantum: f32) -> u32 {
194 if !quantum.is_finite() || quantum <= 0.0 || !base.is_finite() {
195 return 0;
196 }
197 let exact = self.scale(base) / quantum;
198 if exact <= 0.0 {
199 0
200 } else {
201 // `as` saturates at the integer bound, so a wild base cannot wrap.
202 exact.round() as u32
203 }
204 }
205
206 /// Resolve against a base and snap to a whole number of `quantum`.
207 ///
208 /// The value [`Self::quanta`] counts, back in the surface's own units.
209 /// Guards the degenerate quantum in its own right rather than leaning on
210 /// [`Self::quanta`]: a count of zero times a non-finite quantum is NaN,
211 /// not zero.
212 #[must_use]
213 pub fn quantize(self, base: f32, quantum: f32) -> f32 {
214 if !quantum.is_finite() || quantum <= 0.0 || !base.is_finite() {
215 return 0.0;
216 }
217 self.quanta(base, quantum) as f32 * quantum
218 }
219
220 /// The CSS value, as an expression over [`BASE_TOKEN`].
221 ///
222 /// A whole multiple of the base emits without a division, and 1:1 emits
223 /// the bare `var()`, because `calc(var(--geometry-base) * 1 / 1)` is noise.
224 #[must_use]
225 pub fn css(self) -> String {
226 match (self.numerator, self.denominator) {
227 (n, d) if n == d => format!("var(--{BASE_TOKEN})"),
228 (n, 1) => format!("calc(var(--{BASE_TOKEN}) * {n})"),
229 (n, d) => format!("calc(var(--{BASE_TOKEN}) * {n} / {d})"),
230 }
231 }
232}
233
234/// What the layout is being drawn on: a base unit, and the smallest step the
235/// surface can actually represent.
236///
237/// Both are in the surface's own units, and the crate never assumes those are
238/// pixels. A display measures in pixels and can represent one of them; a
239/// terminal measures in cells and cannot represent less than one. That single
240/// difference is the whole of the terminal story — a TUI is not a density, it
241/// is a surface with a coarse quantum, and the relational vocabulary above
242/// crosses over untouched.
243///
244/// Quantising is not a terminal special case. A display does it too; it is
245/// just that rounding 6.0 to the nearest pixel is uninteresting, whereas
246/// rounding three eighths of a cell to the nearest cell is a design decision
247/// the surface makes for you.
248#[derive(Debug, Clone, Copy, PartialEq)]
249pub struct Surface {
250 /// The base unit, in this surface's units.
251 pub base: f32,
252 /// The smallest step this surface can represent, in the same units.
253 pub quantum: f32,
254}
255
256impl Surface {
257 /// A display measuring in CSS pixels: a 16px base, one-pixel quantum.
258 #[must_use]
259 pub fn web() -> Self {
260 Self {
261 base: f32::from(DEFAULT_BASE_PX),
262 quantum: 1.0,
263 }
264 }
265
266 /// A terminal measuring in cells: a one-cell base, one-cell quantum.
267 ///
268 /// The coarsest surface in the family, and the one that proves the
269 /// vocabulary. `bound` and `peer` collapse to no cells at all, which is
270 /// correct — in a grid this dense, "belongs to" and "is a peer of" are
271 /// both expressed by adjacency, not by a gap.
272 #[must_use]
273 pub fn terminal() -> Self {
274 Self {
275 base: 1.0,
276 quantum: 1.0,
277 }
278 }
279
280 /// Resolve a ratio on this surface, snapped to its quantum.
281 #[must_use]
282 pub fn resolve(self, ratio: Ratio) -> f32 {
283 ratio.quantize(self.base, self.quantum)
284 }
285
286 /// How many whole quanta a ratio is worth here.
287 ///
288 /// What a cell-addressed layout actually wants: the count, not the size.
289 #[must_use]
290 pub fn quanta(self, ratio: Ratio) -> u32 {
291 ratio.quanta(self.base, self.quantum)
292 }
293
294 /// Resolve a relationship on this surface at a given density, in quanta.
295 ///
296 /// The whole model in one call: *what* is being separated, *who* is
297 /// operating it, *what* it is drawn on.
298 #[must_use]
299 pub fn gap(self, gap: Gap, density: Density) -> u32 {
300 self.quanta(gap.step_at(density).ratio())
301 }
302}
303
304/// Which input the layout is being sized for.
305///
306/// A preset, not a breakpoint, and orthogonal to [`Surface`]: density decides
307/// which step a relationship picks, the surface decides how that step lands.
308/// Which density applies is the app's call — GoingsOn and Balanced Breakfast
309/// already decide it once and hang a `ui-mode-*` class off the result.
310#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
311pub enum Density {
312 /// Mouse or trackpad. Resolves to the Mac OS 8 HIG's own proportions.
313 #[default]
314 Pointer,
315 /// Finger. Opens the gaps that separate distinct tap targets and leaves
316 /// the shells where Pointer put them, because a coarse contact patch
317 /// raises mis-tap cost and a panel margin is not something you tap. See
318 /// the crate-level "Density presets" section for the derivation.
319 Touch,
320}
321
322/// How much screen there is, independent of what is pointing at it.
323///
324/// The second axis, and the one [`Density`] kept being asked to carry. A phone
325/// is small *and* touch; a tablet and a touchscreen laptop are big and touch; a
326/// half-width window on a desktop is small and pointer. Those are four real
327/// combinations and one axis cannot name them, which is what made the old Touch
328/// preset tighten shells it had no business tightening.
329///
330/// **Boundaries are quoted, not derived**, for the same reason the [`Gap`]
331/// values are: a derived boundary is one nobody can check. They are Material 3's
332/// window size classes, the best-known three-tier split with published numbers.
333/// Apple's size classes are two-tier and expressed as regular/compact per axis,
334/// which does not give a middle to aim at.
335///
336/// Source: <https://m3.material.io/foundations/layout/applying-layout/window-size-classes>
337///
338/// This enum carries the **boundaries only**. What appears, disappears or
339/// reflows at each is a product decision and belongs to `makeover-touch`, not
340/// here. Deliberately absent for now: size class does not feed [`Gap::step_at`].
341/// Whether shells should tighten on a compact window is a look call of exactly
342/// the kind that produced the 2026-07-29 demolition, so it waits for an eyeball
343/// rather than being derived a second time.
344#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Default)]
345pub enum SizeClass {
346 /// Under 600px. Phones in either orientation, and any window narrowed to
347 /// phone width regardless of what is pointing at it.
348 Compact,
349 /// 600px to 839px. Small tablets, split-screen panes, half-width windows.
350 #[default]
351 Medium,
352 /// 840px and up. Laptops, desktops, tablets in landscape.
353 Expanded,
354}
355
356impl SizeClass {
357 /// Lower bound in CSS pixels, inclusive. [`Self::Compact`] starts at zero.
358 #[must_use]
359 pub const fn min_px(self) -> u16 {
360 match self {
361 Self::Compact => 0,
362 Self::Medium => 600,
363 Self::Expanded => 840,
364 }
365 }
366
367 /// The media condition selecting exactly this class, without the `@media`.
368 ///
369 /// Bounded on both sides for the middle class, so the three are mutually
370 /// exclusive and a rule cannot land in two of them. `max-width` is one below
371 /// the next class's `min_px`, because CSS width ranges are inclusive.
372 #[must_use]
373 pub fn media_condition(self) -> String {
374 match self {
375 Self::Compact => format!("(max-width: {}px)", Self::Medium.min_px() - 1),
376 Self::Medium => format!(
377 "(min-width: {}px) and (max-width: {}px)",
378 Self::Medium.min_px(),
379 Self::Expanded.min_px() - 1
380 ),
381 Self::Expanded => format!("(min-width: {}px)", Self::Expanded.min_px()),
382 }
383 }
384
385 /// The CSS class name an app may hang off this, without the leading dot.
386 #[must_use]
387 pub const fn token(self) -> &'static str {
388 match self {
389 Self::Compact => "size-compact",
390 Self::Medium => "size-medium",
391 Self::Expanded => "size-expanded",
392 }
393 }
394
395 /// Every class, narrowest first.
396 #[must_use]
397 pub const fn all() -> [Self; 3] {
398 [Self::Compact, Self::Medium, Self::Expanded]
399 }
400
401 /// The class a given viewport width falls in.
402 #[must_use]
403 pub const fn at_width(px: u16) -> Self {
404 if px >= Self::Expanded.min_px() {
405 Self::Expanded
406 } else if px >= Self::Medium.min_px() {
407 Self::Medium
408 } else {
409 Self::Compact
410 }
411 }
412}
413
414/// A named separation between two things.
415///
416/// Pick by relationship. The size is a consequence of the name, not the other
417/// way round, and callers should never care what it is.
418#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
419pub enum Gap {
420 /// A control and the thing it belongs to: an edit field and its pop-up, a
421 /// checkbox and its label, an icon and the text it labels. Reads as one
422 /// object.
423 Bound,
424 /// Items of the same kind in a list: stacked checkboxes, radio buttons,
425 /// rows, chips in a row. Reads as a set.
426 Peer,
427 /// A container's inner margin, and the distance between sibling groups
428 /// side by side. Reads as "inside this box".
429 Group,
430 /// Separated groups, and rows of actions. The first gap that reads as a
431 /// deliberate break rather than as breathing room.
432 Section,
433 /// Panel padding and content shells. Layout, not controls.
434 Pane,
435 /// The outermost shell margin. One per screen, usually.
436 Page,
437}
438
439/// A raw step on the underlying scale.
440///
441/// Present because not every distance is a relationship between two controls —
442/// an optical nudge inside a badge is not a `Gap`. Prefer [`Gap`] wherever one
443/// fits: a step name says how big, a gap name says why.
444#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
445pub enum Step {
446 /// An eighth of the base. Optical nudges inside small inline elements.
447 Hair,
448 /// A quarter of the base.
449 Tight,
450 /// Three eighths of the base.
451 Snug,
452 /// Half the base.
453 Base,
454 /// Five eighths of the base.
455 Roomy,
456 /// Three quarters of the base.
457 Wide,
458 /// The base itself.
459 Loose,
460 /// One and a half times the base.
461 Broad,
462 /// Twice the base.
463 Vast,
464 /// Three times the base.
465 Colossal,
466}
467
468impl Step {
469 /// This step as a fraction of the base unit.
470 #[must_use]
471 pub const fn ratio(self) -> Ratio {
472 let (numerator, denominator) = match self {
473 Self::Hair => (1, 8),
474 Self::Tight => (1, 4),
475 Self::Snug => (3, 8),
476 Self::Base => (1, 2),
477 Self::Roomy => (5, 8),
478 Self::Wide => (3, 4),
479 Self::Loose => (1, 1),
480 Self::Broad => (3, 2),
481 Self::Vast => (2, 1),
482 Self::Colossal => (3, 1),
483 };
484 Ratio {
485 numerator,
486 denominator,
487 }
488 }
489
490 /// Size in CSS pixels at the default base.
491 #[must_use]
492 pub const fn px(self) -> u16 {
493 self.ratio().px_at(DEFAULT_BASE_PX)
494 }
495
496 /// The CSS custom-property name, without the leading `--`.
497 #[must_use]
498 pub const fn token(self) -> &'static str {
499 match self {
500 Self::Hair => "step-hair",
501 Self::Tight => "step-tight",
502 Self::Snug => "step-snug",
503 Self::Base => "step-base",
504 Self::Roomy => "step-roomy",
505 Self::Wide => "step-wide",
506 Self::Loose => "step-loose",
507 Self::Broad => "step-broad",
508 Self::Vast => "step-vast",
509 Self::Colossal => "step-colossal",
510 }
511 }
512
513 /// Every step, smallest first.
514 #[must_use]
515 pub const fn all() -> [Self; 10] {
516 [
517 Self::Hair,
518 Self::Tight,
519 Self::Snug,
520 Self::Base,
521 Self::Roomy,
522 Self::Wide,
523 Self::Loose,
524 Self::Broad,
525 Self::Vast,
526 Self::Colossal,
527 ]
528 }
529}
530
531impl Gap {
532 /// The step this relationship resolves to at a given density.
533 ///
534 /// [`Density::Pointer`]'s values are the HIG's own. [`Density::Touch`]
535 /// opens the three gaps that separate distinct tap targets and holds the
536 /// rest, per the crate-level "Density presets" section.
537 #[must_use]
538 pub const fn step_at(self, density: Density) -> Step {
539 match self {
540 // Binding is not a separation, so it does not open up on touch
541 // either: separating these would say they are two objects.
542 Self::Bound => Step::Tight,
543
544 // The three that carry mis-tap cost. Peer is the one that matters
545 // most (stacked rows, adjacent chips) and moves furthest; Group
546 // and Section follow only far enough to stay distinct from it.
547 Self::Peer => match density {
548 Density::Pointer => Step::Snug,
549 Density::Touch => Step::Roomy,
550 },
551 Self::Group => match density {
552 Density::Pointer => Step::Roomy,
553 Density::Touch => Step::Wide,
554 },
555 Self::Section => match density {
556 Density::Pointer => Step::Wide,
557 Density::Touch => Step::Loose,
558 },
559
560 // Shells. Not tap targets, so the contact patch has no opinion,
561 // and screen budget is a different axis than this one.
562 Self::Pane => Step::Broad,
563 Self::Page => Step::Vast,
564 }
565 }
566
567 /// The step this relationship resolves to at the default density.
568 #[must_use]
569 pub const fn step(self) -> Step {
570 self.step_at(Density::Pointer)
571 }
572
573 /// Size in CSS pixels at the default base, at a given density.
574 #[must_use]
575 pub const fn px_at(self, density: Density) -> u16 {
576 self.step_at(density).px()
577 }
578
579 /// Size in CSS pixels at the default base and density.
580 #[must_use]
581 pub const fn px(self) -> u16 {
582 self.step().px()
583 }
584
585 /// The CSS custom-property name, without the leading `--`.
586 #[must_use]
587 pub const fn token(self) -> &'static str {
588 match self {
589 Self::Bound => "gap-bound",
590 Self::Peer => "gap-peer",
591 Self::Group => "gap-group",
592 Self::Section => "gap-section",
593 Self::Pane => "gap-pane",
594 Self::Page => "gap-page",
595 }
596 }
597
598 /// Every relationship, tightest first.
599 #[must_use]
600 pub const fn all() -> [Self; 6] {
601 [
602 Self::Bound,
603 Self::Peer,
604 Self::Group,
605 Self::Section,
606 Self::Pane,
607 Self::Page,
608 ]
609 }
610}
611
612/// Emit the base unit and the raw scale as CSS declarations, no selector.
613///
614/// Density-invariant: the steps are the vocabulary, and only which step a
615/// relationship picks changes between presets.
616#[must_use]
617pub fn scale_css_declarations() -> String {
618 let mut out = String::new();
619 let _ = writeln!(
620 out,
621 " /* Every size below is a ratio of this. Scale it and the whole\n \
622 layout scales with it, including for a user who has asked for\n \
623 larger text. */\n --{BASE_TOKEN}: 1rem;\n"
624 );
625 out.push_str(" /* Raw scale. Prefer a --gap-* below; reach here only when\n");
626 out.push_str(" no relationship describes the distance. */\n");
627 for step in Step::all() {
628 let _ = writeln!(out, " --{}: {};", step.token(), step.ratio().css());
629 }
630 out
631}
632
633/// Emit the relational layer for one density as CSS declarations, no selector.
634///
635/// Gaps reference their step rather than repeating a value, so the scale has
636/// exactly one definition and a reader can see which relationship maps where.
637#[must_use]
638pub fn gap_css_declarations(density: Density) -> String {
639 let mut out = String::new();
640 for gap in Gap::all() {
641 let _ = writeln!(
642 out,
643 " --{}: var(--{});",
644 gap.token(),
645 gap.step_at(density).token()
646 );
647 }
648 out
649}
650
651/// Emit the whole geometry layer as a `:root { … }` block at one density.
652///
653/// Mirrors `makeover::intent_css_vars`. Unlike the colour layer this is
654/// constant, so a web consumer should bake it in at build time rather than
655/// apply it from JS on every load.
656#[must_use]
657pub fn geometry_css_vars(density: Density) -> String {
658 format!(
659 ":root {{\n{}\n{}}}\n",
660 scale_css_declarations(),
661 gap_css_declarations(density)
662 )
663}
664
665/// The whole spacing layer with the canonical density selection, as CSS.
666///
667/// **Density is a capability, not a device and not a width.** A narrow window
668/// on a desktop still has a pointer in it and a tablet at full width still has
669/// a finger, so the touch preset hangs off `(hover: none), (pointer: coarse)`
670/// rather than off a breakpoint or a user-agent string. That is the question
671/// the platform actually answers, and it is the one [`Density`] is asking.
672///
673/// `explicit_touch` names a selector an app sets when the *user* has chosen.
674/// It is emitted last and therefore wins at equal specificity, because
675/// detection is a default rather than a verdict: a touchscreen laptop and
676/// someone who simply wants roomier targets are both real, and neither is
677/// visible to a media query.
678///
679/// Settles a policy three consumers previously answered three ways. GoingsOn
680/// sniffed the user agent behind a mode class, Balanced Breakfast used
681/// `(hover: none)` alone, and audiofiles had no switch at all; the first of
682/// those asked what device this is as a proxy for a capability already
683/// reported.
684#[must_use]
685pub fn density_css(explicit_touch: Option<&str>) -> String {
686 let mut css = geometry_css_vars(Density::Pointer);
687 css.push_str("\n/* Touch: targets separate, shells hold. */\n");
688 css.push_str("@media (hover: none), (pointer: coarse) {\n");
689 for line in gap_css_overrides(":root", Density::Touch).lines() {
690 css.push_str(" ");
691 css.push_str(line);
692 css.push('\n');
693 }
694 css.push_str("}\n");
695 if let Some(selector) = explicit_touch {
696 css.push_str("\n/* An explicit user choice, last so it wins over detection. */\n");
697 css.push_str(&gap_css_overrides(selector, Density::Touch));
698 }
699 css
700}
701
702/// Emit a density preset as a scoped override block.
703///
704/// Only the relational layer is emitted: the scale and the base do not change
705/// between presets, so an app ships [`geometry_css_vars`] at its default
706/// density and one of these per mode class it supports.
707///
708/// ```
709/// # use makeover_geometry::{Density, gap_css_overrides};
710/// let css = gap_css_overrides(".ui-mode-mobile", Density::Touch);
711/// assert!(css.starts_with(".ui-mode-mobile {\n"));
712/// ```
713#[must_use]
714pub fn gap_css_overrides(selector: &str, density: Density) -> String {
715 format!("{selector} {{\n{}}}\n", gap_css_declarations(density))
716}
717
718#[cfg(test)]
719mod tests {
720 use super::*;
721
722 #[test]
723 fn density_is_selected_by_capability_not_by_width_or_agent() {
724 let css = density_css(None);
725 assert!(css.contains("@media (hover: none), (pointer: coarse)"));
726 // The three things density must never be selected by.
727 assert!(!css.contains("max-width"), "a breakpoint crept in");
728 assert!(!css.contains("min-width"), "a breakpoint crept in");
729 assert!(!css.contains("ui-mode"), "a device mode crept in");
730 }
731
732 #[test]
733 fn an_explicit_choice_is_emitted_after_the_detection() {
734 let css = density_css(Some(".ui-mode-mobile"));
735 let media = css.find("@media").expect("media query");
736 let explicit = css.find(".ui-mode-mobile").expect("explicit selector");
737 // Equal specificity, so order is the whole mechanism: the user's
738 // choice has to come last or detection quietly overrides it.
739 assert!(explicit > media, "the explicit selector must come last");
740 }
741
742 #[test]
743 fn without_an_explicit_selector_there_are_exactly_two_presets() {
744 assert_eq!(density_css(None).matches("--gap-peer").count(), 2);
745 }
746
747 #[test]
748 fn the_hig_relationships_land_on_the_hig_values() {
749 // Mac OS 8 HIG, Control Layout Guidelines. The ratios are ours, but at
750 // the default base they must resolve to the numbers the HIG specifies,
751 // or the departure has cost us the thing it was translating.
752 assert_eq!(Gap::Bound.px(), 4);
753 assert_eq!(Gap::Peer.px(), 6);
754 assert_eq!(Gap::Group.px(), 10);
755 assert_eq!(Gap::Section.px(), 12);
756 }
757
758 #[test]
759 fn every_ratio_divides_the_default_base_exactly() {
760 for step in Step::all() {
761 let r = step.ratio();
762 assert_eq!(
763 u32::from(DEFAULT_BASE_PX) * u32::from(r.numerator) % u32::from(r.denominator),
764 0,
765 "{step:?} is fractional at the default base"
766 );
767 }
768 }
769
770 #[test]
771 fn ratios_scale_linearly() {
772 for step in Step::all() {
773 assert_eq!(
774 step.ratio().px_at(DEFAULT_BASE_PX * 2),
775 step.px() * 2,
776 "{step:?} does not double with the base"
777 );
778 }
779 }
780
781 #[test]
782 fn steps_ascend_and_never_repeat() {
783 let px: Vec<u16> = Step::all().iter().map(|s| s.px()).collect();
784 let mut sorted = px.clone();
785 sorted.sort_unstable();
786 sorted.dedup();
787 assert_eq!(px, sorted, "steps must be strictly ascending");
788 }
789
790 #[test]
791 fn gaps_ascend_with_their_relationships_at_every_density() {
792 for density in [Density::Pointer, Density::Touch] {
793 let px: Vec<u16> = Gap::all().iter().map(|g| g.px_at(density)).collect();
794 let mut sorted = px.clone();
795 sorted.sort_unstable();
796 assert_eq!(px, sorted, "{density:?}: a looser relationship is tighter");
797 }
798 }
799
800 #[test]
801 fn touch_separates_targets_and_holds_the_shells() {
802 // The derivation, asserted so that changing it has to come here and say
803 // so. Touch is a claim about the contact patch: the gaps between
804 // distinct tap targets open, and the gaps that are not tap targets do
805 // not move.
806 for gap in [Gap::Peer, Gap::Group, Gap::Section] {
807 assert!(
808 gap.px_at(Density::Touch) > gap.px_at(Density::Pointer),
809 "{gap:?} separates tap targets and must open on touch"
810 );
811 }
812 for gap in [Gap::Bound, Gap::Pane, Gap::Page] {
813 assert_eq!(
814 gap.px_at(Density::Touch),
815 gap.px_at(Density::Pointer),
816 "{gap:?} is not a tap target and must not move with the input device"
817 );
818 }
819 }
820
821 #[test]
822 fn touch_never_resolves_tighter_than_pointer() {
823 // The one cross-density rule, and its direction is the point. The
824 // preset thrown out on 2026-07-29 tightened Pane and Page on touch,
825 // which combined with an opened Section to make any Pointer Pane at or
826 // below 16 an inversion: a derived preset set a floor under the one
827 // quoted from the HIG, blocking the retune to pane 14 / page 16.
828 //
829 // Constraining Touch by Pointer instead cannot do that. A Pointer
830 // retune downward moves freely; only a Pointer move upward pushes
831 // Touch, which is the correct direction of authority.
832 for gap in Gap::all() {
833 assert!(
834 gap.px_at(Density::Touch) >= gap.px_at(Density::Pointer),
835 "{gap:?}: Touch resolved tighter than Pointer"
836 );
837 }
838 }
839
840 #[test]
841 fn the_pointer_retune_is_not_blocked_by_touch() {
842 // Guards the specific regression above rather than trusting the general
843 // rule to imply it. Touch's own ordering must hold using Touch values
844 // only, so that a Pointer Pane at or below Touch's Section is legal.
845 assert!(
846 Gap::Section.px_at(Density::Touch) <= Gap::Pane.px_at(Density::Touch),
847 "Touch inverted internally, which is what set the old floor"
848 );
849 // The retune wants Pointer pane 14 / page 16, both under Touch's
850 // Section of 16. Nothing in this crate may object to that.
851 assert!(Gap::Section.px_at(Density::Touch) >= 16);
852 }
853
854 #[test]
855 fn size_classes_partition_every_width_exactly_once() {
856 // Mutually exclusive and exhaustive, or a rule lands in two classes and
857 // whichever is emitted last silently wins. Checked at every width up to
858 // well past the top boundary rather than at the boundaries alone.
859 for px in 0..=4000u16 {
860 let hits: Vec<SizeClass> = SizeClass::all()
861 .into_iter()
862 .filter(|c| {
863 let lo = c.min_px();
864 let hi = match c {
865 SizeClass::Compact => SizeClass::Medium.min_px() - 1,
866 SizeClass::Medium => SizeClass::Expanded.min_px() - 1,
867 SizeClass::Expanded => u16::MAX,
868 };
869 px >= lo && px <= hi
870 })
871 .collect();
872 assert_eq!(hits.len(), 1, "{px}px matched {hits:?}");
873 assert_eq!(hits[0], SizeClass::at_width(px), "{px}px disagrees");
874 }
875 }
876
877 #[test]
878 fn the_quoted_boundaries_are_the_ones_material_publishes() {
879 // Quoted, not derived. Changing these means departing from the source,
880 // which is a decision to record rather than a value to nudge.
881 assert_eq!(SizeClass::Compact.min_px(), 0);
882 assert_eq!(SizeClass::Medium.min_px(), 600);
883 assert_eq!(SizeClass::Expanded.min_px(), 840);
884 }
885
886 #[test]
887 fn the_media_conditions_do_not_overlap_at_the_boundary() {
888 // The off-by-one that makes CSS width ranges overlap: max-width is
889 // inclusive, so it must be one below the next class's min-width.
890 assert_eq!(
891 SizeClass::Compact.media_condition(),
892 "(max-width: 599px)",
893 "Compact must stop one pixel below Medium"
894 );
895 assert_eq!(
896 SizeClass::Medium.media_condition(),
897 "(min-width: 600px) and (max-width: 839px)"
898 );
899 assert_eq!(SizeClass::Expanded.media_condition(), "(min-width: 840px)");
900 }
901
902 #[test]
903 fn size_class_does_not_reach_the_gap_scale() {
904 // Deliberately absent, asserted so that wiring it in has to come here
905 // and say so. Whether a compact window tightens its shells is a look
906 // call; deriving it is what went wrong with Touch on 2026-07-29.
907 //
908 // This test does not check a value. It checks that the whole spacing
909 // layer is reachable without naming a size class at all.
910 let _ = geometry_css_vars(Density::Pointer);
911 let _ = Gap::Page.px_at(Density::Touch);
912 assert_eq!(SizeClass::all().len(), 3);
913 }
914
915 #[test]
916 fn a_terminal_resolves_the_vocabulary_to_whole_cells() {
917 let t = Surface::terminal();
918 let cells: Vec<u32> = Gap::all()
919 .iter()
920 .map(|g| t.gap(*g, Density::Pointer))
921 .collect();
922 // bound, peer | group, section | pane, page
923 assert_eq!(cells, vec![0, 0, 1, 1, 2, 2]);
924 }
925
926 #[test]
927 fn collapsing_is_allowed_but_inverting_is_not() {
928 // A coarse surface has fewer distinctions, so neighbouring gaps may
929 // land on the same quantum. What must never happen is a looser
930 // relationship coming out tighter than a closer one.
931 for quantum in [0.5_f32, 1.0, 2.0, 3.0, 7.0] {
932 for density in [Density::Pointer, Density::Touch] {
933 let s = Surface {
934 base: 16.0,
935 quantum,
936 };
937 let v: Vec<u32> = Gap::all().iter().map(|g| s.gap(*g, density)).collect();
938 let mut sorted = v.clone();
939 sorted.sort_unstable();
940 assert_eq!(v, sorted, "quantum {quantum} {density:?} inverted: {v:?}");
941 }
942 }
943 }
944
945 #[test]
946 fn the_web_surface_agrees_with_the_pixel_helper() {
947 let w = Surface::web();
948 for step in Step::all() {
949 assert_eq!(
950 w.resolve(step.ratio()) as u16,
951 step.px(),
952 "{step:?} disagrees between surface and px_at"
953 );
954 }
955 }
956
957 #[test]
958 fn quantising_is_monotonic_in_the_ratio() {
959 let (base, quantum) = (16.0, 1.0);
960 let mut previous = 0;
961 for step in Step::all() {
962 let q = step.ratio().quanta(base, quantum);
963 assert!(q >= previous, "{step:?} went backwards");
964 previous = q;
965 }
966 }
967
968 #[test]
969 fn a_degenerate_quantum_yields_nothing_rather_than_panicking() {
970 let r = Step::Loose.ratio();
971 for bad in [0.0_f32, -1.0, f32::NAN] {
972 assert_eq!(r.quanta(16.0, bad), 0);
973 assert!(r.quantize(16.0, bad).abs() < f32::EPSILON);
974 }
975 assert_eq!(r.quanta(f32::INFINITY, 1.0), 0);
976 }
977
978 #[test]
979 fn px_at_rounds_rather_than_truncating() {
980 // Eighths divide 16 exactly, so the rounding only shows on a base
981 // that does not: 3/8 of 15 is 5.625, which is 6px, not 5.
982 assert_eq!(Step::Snug.ratio().px_at(15), 6);
983 assert_eq!(Step::Snug.ratio().px_at(DEFAULT_BASE_PX), 6);
984 }
985
986 #[test]
987 fn tokens_are_unique() {
988 let mut names: Vec<&str> = Step::all().iter().map(|s| s.token()).collect();
989 names.extend(Gap::all().iter().map(|g| g.token()));
990 let count = names.len();
991 names.sort_unstable();
992 names.dedup();
993 assert_eq!(names.len(), count, "token names collide");
994 }
995
996 #[test]
997 fn css_is_expressed_over_the_base_never_in_pixels() {
998 let css = geometry_css_vars(Density::Pointer);
999 assert!(css.starts_with(":root {\n"));
1000 assert!(css.trim_end().ends_with('}'));
1001 assert!(css.contains("--geometry-base: 1rem;"));
1002 for step in Step::all() {
1003 let line = format!("--{}: {}", step.token(), step.ratio().css());
1004 assert!(css.contains(&line), "missing or wrong: {line}");
1005 }
1006 // A hard pixel count anywhere in the scale defeats the point.
1007 let scale = scale_css_declarations();
1008 assert!(
1009 !scale.contains("px;"),
1010 "the scale must not emit pixel literals:\n{scale}"
1011 );
1012 }
1013
1014 #[test]
1015 fn ratio_css_drops_redundant_arithmetic() {
1016 assert_eq!(Step::Loose.ratio().css(), "var(--geometry-base)");
1017 assert_eq!(Step::Vast.ratio().css(), "calc(var(--geometry-base) * 2)");
1018 assert_eq!(
1019 Step::Snug.ratio().css(),
1020 "calc(var(--geometry-base) * 3 / 8)"
1021 );
1022 }
1023
1024 #[test]
1025 fn gaps_reference_steps_rather_than_repeating_values() {
1026 let css = geometry_css_vars(Density::Pointer);
1027 assert!(css.contains("--gap-peer: var(--step-snug);"));
1028 assert!(!css.contains("--gap-peer: calc"));
1029 }
1030
1031 #[test]
1032 fn a_density_override_emits_only_the_relational_layer() {
1033 let css = gap_css_overrides(".ui-mode-mobile", Density::Touch);
1034 // Which step Peer lands on is the preset's business, asserted in
1035 // touch_separates_targets_and_holds_the_shells. This says only that the
1036 // gap is emitted and references a step.
1037 assert!(css.contains("--gap-peer: var(--step-"));
1038 // Referencing a step is the point; re-declaring one would fork the
1039 // scale, so the check is on declarations, not on mentions.
1040 let declared: Vec<&str> = css
1041 .lines()
1042 .filter_map(|l| l.trim().strip_prefix("--"))
1043 .filter_map(|l| l.split(':').next())
1044 .collect();
1045 assert!(
1046 declared.iter().all(|t| t.starts_with("gap-")),
1047 "only the relational layer may be overridden, got {declared:?}"
1048 );
1049 }
1050}