Re-ask a dirty widget at its offer locally instead of deferring to its parent

A local redraw refused any widget whose given box was not as long as its
offer and marked its parent instead. Under the frame/extent protocol that
is nearly every widget beneath a self-sized container: a span hands its
children its own placement across itself, which is `FULL` while the span
is measured and its answer once it is placed, so the children's offer and
given frames differ on every such axis. A `many` frame at seed 13, depth
8 escalated 43 marks along chains up to seven levels and redrew 508 of
583 active widgets where e44dea3 redraws 159.

Retain the offer's frame beside the given one and ask the offer question
locally: the offer frame composed where the given one is, at the offer's
lengths and placement, then place at the given box where the two differ.
Seed 13 `many` goes from 4.73 ms to 1.28 ms against e44dea3's 0.90, and
294 distinct widgets a frame; size, scroll and repaint are unchanged.

Not sound yet: the suite, the debug oracle and the shrinker at 400 trees
of depth 5 pass, but the oracle at 1000 seeds of depth 6 diverges on seed
532 under reorder and seed 398 under every-size. Both reduce to a
self-sized container whose answer changes under a local redraw; the
reduced plans are in docs/HANDOFF.md of ai-app-2.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

TODO

@@ -14,13 +14,3 @@ WidgetRef<W> or smth instead of Id
 vecs for each widget type?
 
 POTENTIAL BUG: closures that store IDs will not decrement the id!!! need to not increment id if moved into closure somehow??? wait no, need to decrement ID every time an event fn is added...... only if the id is used in it..??
-
-transforms on a move entry (scale + rotation)
-    an entry is a translation today; composing through one scales the rel
-    part and passes px through untouched, so fixed-size content and glyphs
-    do not follow a shortened entry
-    want a real transform per entry, resolved in resolve_move the way the
-    translation already is, so a whole subtree transforms with one buffer
-    write and no redraw
-    wanted for compose-style stretch at the end of a scroll area, and for
-    rotation generally

core/src/layout_diagnostics.rs

@@ -32,6 +32,7 @@ pub(crate) enum Counter {
     SizeReads,
     HintHits,
     HintMisses,
+    RetainedSizeHits,
     ReuseAttempts,
     ReuseExact,
     ReuseMoved,
@@ -41,6 +42,7 @@ pub(crate) enum Counter {
     ReuseOutside,
     ReuseWrongLayer,
     ReuseWrongNode,
+    PlaceRedraws,
     QueuePops,
     DepthReads,
     LocalRedraws,
@@ -52,13 +54,13 @@ pub(crate) enum Counter {
     TextShapes,
     TextBreaks,
     GlyphPlacements,
-    OutsidePinnedLen,
-    OutsideRelBase,
-    OutsideRegion,
+    OutsidePlacement,
+    OutsideFrame,
+    OutsideExtent,
 }
 
 impl Counter {
-    const COUNT: usize = Self::OutsideRegion as usize + 1;
+    const COUNT: usize = Self::OutsideExtent as usize + 1;
 
     const NAMES: [&'static str; Self::COUNT] = [
         "updates",
@@ -68,6 +70,7 @@ impl Counter {
         "draw-result size reads",
         "hint hits",
         "hint misses",
+        "retained size hits",
         "reuse attempts",
         "reuse exact",
         "reuse moved",
@@ -77,6 +80,7 @@ impl Counter {
         "reuse: outside what it holds for",
         "reuse: another layer",
         "reuse: region-node choice changed",
+        "placed by redrawing",
         "redraw queue pops",
         "depth reads",
         "local redraws",
@@ -88,9 +92,9 @@ impl Counter {
         "text shapes",
         "text line breaks",
         "glyph placements",
-        "reuse outside: the length it was pinned to",
-        "reuse outside: a rel base",
-        "reuse outside: a region length",
+        "reuse outside: the placement it was pinned to",
+        "reuse outside: a frame length",
+        "reuse outside: an extent length",
     ];
 }
 

core/src/lib.rs

@@ -9,7 +9,6 @@
 #![feature(unsize)]
 #![feature(coerce_unsized)]
 #![feature(option_into_flat_iter)]
-#![feature(const_index)]
 
 #[cfg(feature = "layout-diagnostics")]
 pub mod layout_diagnostics;

core/src/orientation/align.rs

@@ -1,4 +1,3 @@
-use crate::util::impl_axis_index;
 use crate::{Px, Rel};
 
 use super::*;
@@ -90,6 +89,20 @@ impl RegionAlign {
         x: AxisAlign::NEG,
         y: AxisAlign::NEG,
     };
+
+    pub fn axis(&self, axis: Axis) -> AxisAlign {
+        match axis {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
+
+    pub fn axis_mut(&mut self, axis: Axis) -> &mut AxisAlign {
+        match axis {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
 }
 
 impl RegionAlign {
@@ -218,5 +231,3 @@ impl RegionAlign {
         UiVec2::from(self)
     }
 }
-
-impl_axis_index!(RegionAlign => AxisAlign);

core/src/orientation/axis.rs

@@ -1,5 +1,4 @@
 use super::*;
-use crate::util::impl_axis_index;
 use crate::{Fixed, FixedVec2};
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
@@ -54,6 +53,20 @@ pub enum Sign {
 }
 
 impl<const SHIFT: u32> FixedVec2<SHIFT> {
+    pub const fn axis(&self, axis: Axis) -> Fixed<SHIFT> {
+        match axis {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
+
+    pub const fn axis_mut(&mut self, axis: Axis) -> &mut Fixed<SHIFT> {
+        match axis {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
+
     pub const fn from_axis(axis: Axis, aligned: Fixed<SHIFT>, ortho: Fixed<SHIFT>) -> Self {
         match axis {
             Axis::X => Self::new(aligned, ortho),
@@ -63,6 +76,20 @@ impl<const SHIFT: u32> FixedVec2<SHIFT> {
 }
 
 impl Vec2 {
+    pub fn axis(&self, axis: Axis) -> f32 {
+        match axis {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
+
+    pub fn axis_mut(&mut self, axis: Axis) -> &mut f32 {
+        match axis {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
+
     pub const fn from_axis(axis: Axis, aligned: f32, ortho: f32) -> Self {
         Self {
             x: match axis {
@@ -121,6 +148,3 @@ impl<T> BothAxis<T> {
         }
     }
 }
-
-impl_axis_index!({const SHIFT: u32} FixedVec2<SHIFT> => Fixed<SHIFT>);
-impl_axis_index!(Vec2 => f32);

core/src/orientation/len.rs

@@ -1,5 +1,4 @@
 use super::*;
-use crate::util::impl_axis_index;
 use crate::{Px, PxVec2, Rel, UiNum, Weight, util::impl_op};
 
 #[derive(Debug, Default, Clone, Copy, PartialEq)]
@@ -119,6 +118,20 @@ impl Size {
             },
         }
     }
+
+    pub fn axis(&self, axis: Axis) -> LayoutLen {
+        match axis {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
+
+    pub fn axis_mut(&mut self, axis: Axis) -> &mut LayoutLen {
+        match axis {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
 }
 
 impl LayoutLen {
@@ -145,39 +158,11 @@ impl LayoutLen {
         Len::from_parts(self.rel.add(share), self.px)
     }
 
-    /// Only pixels: the same number of them whatever box it lands in, and
-    /// whatever anyone else in the row asks for. A length that is any part
-    /// of a box or of what is left over is not one.
-    pub fn is_px(self) -> bool {
-        self.rel == Rel::ZERO && self.leftover == Weight::ZERO
-    }
-
-    /// Nothing but a claim on what is left over, so there is no length here
-    /// at all where nothing is.
-    pub fn is_only_leftover(self) -> bool {
-        self.leftover > Weight::ZERO && self.without_leftover() == Len::ZERO
-    }
-
-    /// This as a length of a box, where it is one. `leftover` is not: a
-    /// share of what is left over is a length only to whoever divides one,
-    /// so it passes up in the reported size instead and is resolved there.
-    pub fn declared(self) -> Option<Len> {
-        (self.leftover == Weight::ZERO).then(|| self.without_leftover())
-    }
-
-    /// What this takes whatever is left over: the reading of a length for
-    /// anyone not dividing a box between siblings, where a share is a claim
-    /// on someone else's room rather than a length of its own.
-    /// [`Self::apply_leftover`] is the opposite reading of the same value.
-    pub const fn without_leftover(self) -> Len {
-        Len::from_parts(self.rel, self.px)
-    }
-
     /// This length, given as a part of a box `len` long, as a part of the
     /// box `len` is itself a part of. The share is untouched: it is a claim
     /// on whoever divides the room, not a fraction of anything.
     pub const fn within_len(self, len: Len) -> Self {
-        let part = self.without_leftover().within_len(len);
+        let part = Len::from_parts(self.rel, self.px).within_len(len);
         Self {
             px: part.px,
             rel: part.rel,
@@ -251,5 +236,3 @@ impl std::fmt::Display for LayoutLen {
         Ok(())
     }
 }
-
-impl_axis_index!(Size => LayoutLen);

core/src/orientation/pos.rs

@@ -1,4 +1,3 @@
-use crate::util::impl_axis_index;
 use std::{fmt::Display, marker::Destruct};
 
 use super::*;
@@ -62,6 +61,20 @@ impl UiVec2 {
         }
     }
 
+    pub fn axis_mut(&mut self, axis: Axis) -> &mut Len {
+        match axis {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
+
+    pub fn axis(&self, axis: Axis) -> Len {
+        match axis {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
+
     /// Resolved against a box of `size`, which is where a fraction stops
     /// being one and becomes a place.
     pub fn to_px(&self, size: PxVec2) -> PxVec2 {
@@ -281,15 +294,6 @@ impl UiSpan {
         }
     }
 
-    /// A box `len` long inside this one, on the side `align` says. Both must
-    /// be lengths of the same rel base: it subtracts one from the other
-    /// rather than composing it in, which is what keeps a fraction the same
-    /// fraction however long this box turns out to be.
-    pub const fn place(self, len: Len, align: AxisAlign) -> Self {
-        let start = self.start + (self.len() - len).scale(align.rel());
-        Self::new(start, start + len)
-    }
-
     pub const fn len(&self) -> Len {
         self.end - self.start
     }
@@ -344,6 +348,20 @@ impl UiRegion {
             y: self.y.within(&parent.y),
         }
     }
+    pub const fn axis(&self, axis: Axis) -> &UiSpan {
+        match axis {
+            Axis::X => &self.x,
+            Axis::Y => &self.y,
+        }
+    }
+
+    pub const fn axis_mut(&mut self, axis: Axis) -> &mut UiSpan {
+        match axis {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
+
     pub const fn flip(&mut self, axis: Axis) {
         match axis {
             Axis::X => self.x.flip(),
@@ -444,6 +462,3 @@ impl Display for PixelRegion {
         write!(f, "{} -> {}", self.top_left, self.bot_right)
     }
 }
-
-impl_axis_index!(UiVec2 => Len);
-impl_axis_index!(UiRegion => UiSpan);

core/src/ui/active.rs

@@ -1,5 +1,5 @@
 use crate::{
-    Declared, LayerId, LayoutHolds, MaskIdx, MoveIdx, PlaceDesc, RegionAlign, RetainedPrimitive,
+    DrawRegion, LayerId, LayoutHolds, LayoutLen, MaskIdx, MoveIdx, RegionAlign, RetainedPrimitive,
     Size, TextureHandle, UiRegion, UiVec2, WidgetId,
 };
 
@@ -9,34 +9,31 @@ use crate::{
 #[derive(Debug)]
 pub struct ActiveData {
     pub id: WidgetId,
-    /// Where its drawing goes, in its region node's coordinates.
-    pub placement: UiRegion,
-    /// What a fraction declared or reported under this widget is a fraction
-    /// of, as a length of the window.
-    pub rel_base: UiVec2,
-    /// Where its drawing was put, and where it was asked. The two differ
-    /// where a container asks in one place and puts the answer in another --
-    /// a row measures from its cursor and puts the child in its slot. Each
-    /// carries the rel base that ask stated, so asking again from either is
-    /// the same question it was.
-    pub placed: PlaceDesc,
-    pub asked: PlaceDesc,
-    /// The box it was asked in, in the parent's region-node coordinates: the
-    /// box its drawing was made in and the one its contract is about. Its
-    /// drawing is placed elsewhere by re-expression, never by asking again.
+    /// The box its parent gave it, in `parent_move`'s coordinates: what it
+    /// was asked about, and what a fraction under it is a fraction of. A
+    /// local redraw asks here.
     pub region: UiRegion,
+    /// Where its drawing sits inside that box, in the box's own coordinates.
+    pub placement: UiRegion,
+    /// The original frame in its parent widget's coordinates. Recomposition
+    /// and pixel-length evaluation both follow this chain.
+    pub given_region: UiRegion,
+    /// The frame it was first asked in, in the same coordinates: the offer's
+    /// frame, which its parent's placing draw may since have narrowed.
+    pub offer_region: UiRegion,
+    /// The lengths of the box its parent first asked about it in, as
+    /// lengths of the box the parent was itself offered. Any later box it
+    /// was given was decided knowing its answer, so this is the question
+    /// asked again -- and a chain of fractions has no frame in it, which is
+    /// why a region node between two widgets cannot break it.
+    pub offer_len: UiVec2,
+    pub offer_placement: [Option<crate::UiSpan>; 2],
     /// The measured answer and its dependencies. A hint-only dependency or
     /// a widget first encountered during placement has no measurement yet.
     pub answer: Option<(Size, LayoutHolds)>,
-    /// Asked more than once in its parent's last draw -- measured in one box
-    /// and then asked in the one the parent decided. The parent's layout
-    /// rests on the first answer and its drawing on the last, so only the
-    /// parent can ask either again.
-    pub re_asked: bool,
-    /// What the widget reported, in window-unit lengths.
+    /// What the widget said it used of its box, the last time it drew.
     pub size: Size,
-    /// The window and region reads that this drawing holds for, and the
-    /// rel base and region it pinned.
+    /// The frame, extent and explicit placement reads that this drawing holds for.
     pub holds: LayoutHolds,
     pub drawn: bool,
     pub parent: Option<WidgetId>,
@@ -45,26 +42,30 @@ pub struct ActiveData {
     /// widget a frame visits and cannot drift while one is being drawn.
     pub depth: usize,
     pub textures: Vec<TextureHandle>,
-    /// Its primitives, each keeping the box it was written in -- in this
-    /// widget's placement coordinates, which is what a move recomposes from.
     pub primitives: Vec<RetainedPrimitive>,
-    /// An owned mask holds one reference independently of its primitives.
-    pub mask_region: Option<UiRegion>,
+    pub mask_region: Option<DrawRegion>,
+    /// The children whose box is a part of this widget's extent rather than
+    /// of its frame, and which part each was given. Moving the extent
+    /// re-places them through that part, so the drawing need not depend on
+    /// where it sits.
+    pub(crate) extent_children: Vec<(WidgetId, ExtentPlacement)>,
     pub children: Vec<WidgetId>,
     /// The children whose size this widget read while drawing.
     pub size_deps: Vec<WidgetId>,
     /// The movable region its primitives are positioned through: its own when
     /// opted in, otherwise the nearest ancestor's.
     pub move_idx: MoveIdx,
-    /// The declared lengths whoever drew this widget resolved into its rel base.
+    /// The declared lengths whoever drew this widget resolved into its box.
     /// A change to one moves a box this widget cannot fix by drawing again,
     /// and comparing them is what says so.
-    pub declared: Declared,
+    pub declared: [Option<LayoutLen>; 2],
+    /// The axes along which its parent chose its box from its own answer,
+    /// so a local redraw asks the question its parent asked.
+    pub decided: [bool; 2],
     /// Its alignment when it was last drawn, which a change to the property
     /// is found against.
     pub own_align: RegionAlign,
-    /// The movable region whose coordinates its placement is in when this
-    /// widget does not own a region node.
+    /// The movable region whose coordinates `region` uses.
     pub parent_move: MoveIdx,
     /// The mask its drawing is clipped to: one it set itself, or the one it
     /// inherited from whoever drew it.
@@ -78,10 +79,37 @@ pub struct ActiveData {
 }
 
 impl ActiveData {
-    /// What it answered when its parent asked, where it has been asked at
-    /// all. Not `size`, which is what its last drawing reported: a drawing
-    /// re-expressed in the box that answer chose is not a second answer.
-    pub fn measured(&self) -> Option<Size> {
-        self.answer.map(|(size, _)| size)
+    /// Whether what it answered still stands for a box of these pixel
+    /// lengths -- the box it was asked in, where `holds` is about the box its
+    /// answer then chose.
+    pub fn answers_at(&self, px: crate::PxVec2) -> bool {
+        self.answer.is_some_and(|(_, holds)| {
+            holds.contains(
+                px,
+                UiRegion {
+                    x: self.offer_placement[0].unwrap_or(crate::UiSpan::FULL),
+                    y: self.offer_placement[1].unwrap_or(crate::UiSpan::FULL),
+                },
+            )
+        })
+    }
+}
+
+/// What of a container's extent a child was given: the whole of it, for a
+/// wrapper whose box is its child's, or a part of it.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub(crate) enum ExtentPlacement {
+    Inherit,
+    Within(UiRegion),
+}
+
+impl ExtentPlacement {
+    /// The child's frame in the container's frame coordinates, and the slot
+    /// the container chose within it.
+    pub fn resolve(self, extent: UiRegion) -> (UiRegion, [Option<crate::UiSpan>; 2]) {
+        match self {
+            Self::Inherit => (UiRegion::FULL, [Some(extent.x), Some(extent.y)]),
+            Self::Within(part) => (part.within(&extent), [None; 2]),
+        }
     }
 }

core/src/ui/draw_region.rs

@@ -0,0 +1,36 @@
+use crate::{PrimitiveHandle, UiRegion};
+
+/// Retains which box geometry follows when only the extent changes.
+#[derive(Clone, Copy, Debug)]
+pub enum DrawRegion {
+    Frame(UiRegion),
+    Extent(UiRegion),
+}
+
+impl DrawRegion {
+    pub(crate) fn resolve(self, frame: UiRegion, extent: UiRegion) -> UiRegion {
+        match self {
+            Self::Frame(local) => local.within(&frame),
+            Self::Extent(local) => local.within(&extent).within(&frame),
+        }
+    }
+
+    pub(crate) fn map(self, f: impl FnOnce(UiRegion) -> UiRegion) -> Self {
+        match self {
+            Self::Frame(local) => Self::Frame(f(local)),
+            Self::Extent(local) => Self::Extent(f(local)),
+        }
+    }
+}
+
+impl From<UiRegion> for DrawRegion {
+    fn from(region: UiRegion) -> Self {
+        Self::Frame(region)
+    }
+}
+
+#[derive(Debug)]
+pub struct RetainedPrimitive {
+    pub handle: PrimitiveHandle,
+    pub region: DrawRegion,
+}

core/src/ui/holds.rs

@@ -33,12 +33,6 @@ impl Holds {
         len.raw() >= self.lo.raw() && len.raw() <= self.hi.raw()
     }
 
-    /// Every length `other` holds for is one this holds for, so a drawing
-    /// made under this range is still good wherever `other` is.
-    pub const fn covers(self, other: Self) -> bool {
-        self.lo.raw() <= other.lo.raw() && self.hi.raw() >= other.hi.raw()
-    }
-
     pub const fn and(self, other: Self) -> Self {
         Self {
             lo: self.lo.max(other.lo),

core/src/ui/layout_holds.rs

@@ -1,109 +1,63 @@
-use crate::util::impl_axis_index;
-use crate::{Axis, Holds, Len, Px, PxVec2, UiRegion, UiVec2};
+use crate::{Axis, Holds, PxVec2, UiRegion};
 
-const AXES: [Axis; 2] = [Axis::X, Axis::Y];
-
-/// What one evaluation of a widget depends on along one axis: the window
-/// lengths its reads hold for, the pixel lengths of its own box, and the
-/// symbolic lengths of that box and of its rel base where either one is what
-/// it was expressed in.
-///
-/// The symbolic lengths are pins rather than ranges: a container places its
-/// children as lengths of its rel base measured from where its own box starts,
-/// so what it draws turns on that box's length and on nothing about where it
-/// is. A box pin reaches the parent only where the box it pinned is the
-/// parent's own; anywhere else the parent chose that length itself, and a
-/// widget pinned this way is checked when it is re-placed.
-///
-/// A rel base pin says the answer or the drawing is a fraction of the rel base,
-/// which is a different length wherever the rel base is a different one -- at
-/// the same window size, so no range of window pixels can say it. A length
-/// of the rel base that is only pixels is not one: it is that many pixels
-/// whatever the rel base turns out to be.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct AxisHolds {
-    pub window: Holds,
-    pub rel_base: Option<Len>,
-    pub region: Holds,
-    pub region_len: Option<Len>,
-}
-
-impl AxisHolds {
-    pub const ANY: Self = Self {
-        window: Holds::ANY,
-        rel_base: None,
-        region: Holds::ANY,
-        region_len: None,
-    };
-
-    pub fn and(self, other: Self) -> Self {
-        // Two pins of the same length disagreeing would mean one drawing was
-        // a fraction of two different lengths at once.
-        debug_assert!(
-            self.region_len.is_none()
-                || other.region_len.is_none()
-                || self.region_len == other.region_len
-        );
-        debug_assert!(
-            self.rel_base.is_none() || other.rel_base.is_none() || self.rel_base == other.rel_base
-        );
-        Self {
-            window: self.window.and(other.window),
-            rel_base: self.rel_base.or(other.rel_base),
-            region: self.region.and(other.region),
-            region_len: self.region_len.or(other.region_len),
-        }
-    }
-
-    pub fn covers(self, other: Self) -> bool {
-        self.window.covers(other.window)
-            && self.region.covers(other.region)
-            && self
-                .region_len
-                .is_none_or(|len| other.region_len == Some(len))
-            && self.rel_base.is_none_or(|len| other.rel_base == Some(len))
-    }
-
-    /// Whether a widget in a box `len` long, with that rel base, in that
-    /// window, is one this drawing holds for.
-    pub fn contains(self, window: Px, rel_base: Len, len: Len) -> bool {
-        self.window.contains(window)
-            && self.rel_base.is_none_or(|pinned| pinned == rel_base)
-            && self.region.contains(len.to_px(window))
-            && self.region_len.is_none_or(|pinned| pinned == len)
-    }
-}
-
-/// [`AxisHolds`] on both axes. Every question asked of it is asked of one
-/// axis at a time, since a widget that read one length holds for any length
-/// of the other.
+/// Dependencies of one evaluation, before the frame and extent are composed.
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct LayoutHolds {
-    pub x: AxisHolds,
-    pub y: AxisHolds,
+    pub frame: [Holds; 2],
+    pub extent: [Holds; 2],
+    pub placement: Option<UiRegion>,
 }
 
 impl LayoutHolds {
     pub const ANY: Self = Self {
-        x: AxisHolds::ANY,
-        y: AxisHolds::ANY,
+        frame: [Holds::ANY; 2],
+        extent: [Holds::ANY; 2],
+        placement: None,
     };
 
     pub fn and(self, other: Self) -> Self {
+        debug_assert!(
+            self.placement.is_none()
+                || other.placement.is_none()
+                || self.placement == other.placement
+        );
         Self {
-            x: self.x.and(other.x),
-            y: self.y.and(other.y),
+            frame: [
+                self.frame[0].and(other.frame[0]),
+                self.frame[1].and(other.frame[1]),
+            ],
+            extent: [
+                self.extent[0].and(other.extent[0]),
+                self.extent[1].and(other.extent[1]),
+            ],
+            placement: self.placement.or(other.placement),
         }
     }
 
     pub fn covers(self, other: Self) -> bool {
-        self.x.covers(other.x) && self.y.covers(other.y)
+        self.placement
+            .is_none_or(|placement| other.placement == Some(placement))
+            && [0, 1].into_iter().all(|n| {
+                self.frame[n].lo <= other.frame[n].lo
+                    && self.frame[n].hi >= other.frame[n].hi
+                    && self.extent[n].lo <= other.extent[n].lo
+                    && self.extent[n].hi >= other.extent[n].hi
+            })
     }
 
-    pub fn contains(self, window: PxVec2, rel_base: UiVec2, region: UiRegion) -> bool {
-        AXES.into_iter()
-            .all(|axis| self[axis].contains(window[axis], rel_base[axis], region[axis].len()))
+    pub fn contains(self, px: PxVec2, placement: UiRegion) -> bool {
+        self.placement.is_none_or(|old| old == placement)
+            && [Axis::X, Axis::Y].into_iter().all(|axis| {
+                self.frame[axis as usize].contains(px.axis(axis))
+                    && self.extent[axis as usize]
+                        .contains(placement.axis(axis).len().to_px(px.axis(axis)))
+            })
+    }
+
+    pub fn in_frame(self, placement: UiRegion) -> [Holds; 2] {
+        [Axis::X, Axis::Y].map(|axis| {
+            self.frame[axis as usize]
+                .and(self.extent[axis as usize].through(placement.axis(axis).len()))
+        })
     }
 }
-
-impl_axis_index!(LayoutHolds => AxisHolds);

core/src/ui/mod.rs

@@ -10,17 +10,17 @@ use crate::{
 pub const CHAIN_LIMIT: u32 = 64;
 
 mod active;
+mod draw_region;
 mod holds;
 mod layout_holds;
 mod painter;
-mod place;
 mod render_state;
 
 pub use active::*;
+pub use draw_region::*;
 pub use holds::*;
 pub use layout_holds::*;
 pub use painter::{Painter, PrimitiveLike};
-pub use place::*;
 pub use render_state::*;
 
 #[derive(Default)]

core/src/ui/place.rs

@@ -1,252 +0,0 @@
-use crate::util::impl_axis_index;
-use crate::{Axis, AxisAlign, Len, PrimitiveHandle, RegionAlign, UiRegion, UiSpan};
-
-/// How a child's region along one axis comes from the region of the widget
-/// asking, and what its fractions are of.
-///
-/// The three ways of saying a region are the three the geometry already has:
-/// a span composed into the caller's box, a span shifted to where that box
-/// starts, and a length placed in it by alignment. Which one is meant cannot
-/// be read off the numbers, since two of them take the same span and apply
-/// it differently, so it is said here.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct PlaceDescAxis {
-    span: PlaceSpan,
-    fills: bool,
-    rel_base: RelBase,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-enum PlaceSpan {
-    Within(UiSpan),
-    Shifted(UiSpan),
-    Sized(Len),
-}
-
-/// What a child's fractions are of, where the caller has not named a length.
-#[derive(Clone, Copy, Debug, PartialEq)]
-enum RelBase {
-    /// The caller's own, unchanged.
-    Inherit,
-    /// The caller's own, narrowed the way the region is.
-    WithRegion,
-    /// This length of the window.
-    Len(Len),
-}
-
-impl PlaceDescAxis {
-    /// The whole of the caller's box.
-    pub const WHOLE: Self = UiSpan::FULL.within_desc();
-
-    /// This region is the child's placement: its answer is not placed inside
-    /// it again. A container uses it where it hands back exactly what the
-    /// child asked for -- a row placing a child at the length it reported.
-    pub const fn fills(mut self) -> Self {
-        self.fills = true;
-        self
-    }
-
-    /// This along `axis`, and the whole of the caller's box across it: what
-    /// a container dividing one axis says, since nothing divides the other.
-    /// [`PlaceDesc::from_axis`] says the across one where it is not the
-    /// whole.
-    pub const fn axis(self, axis: Axis) -> PlaceDesc {
-        PlaceDesc::from_axis(axis, self, Self::WHOLE)
-    }
-
-    /// What the child's fractions are of, as a length of the window: a
-    /// resolved share, or a box a sibling's answer decided.
-    pub const fn rel_base(mut self, len: Len) -> Self {
-        self.rel_base = RelBase::Len(len);
-        self
-    }
-
-    /// Whether the region is the placement outright, rather than a box the
-    /// answer is placed inside.
-    pub(crate) const fn does_fill(self) -> bool {
-        self.fills
-    }
-
-    /// Where it lands in the coordinates `own` is in.
-    pub(crate) fn of(self, own: UiSpan, align: AxisAlign) -> UiSpan {
-        match self.span {
-            PlaceSpan::Within(span) => span.within(&own),
-            PlaceSpan::Shifted(mut span) => {
-                span.shift(own.start);
-                span
-            }
-            PlaceSpan::Sized(len) => own.place(len, align),
-        }
-    }
-
-    /// The child's rel base, where this says one outright. `None` forwards
-    /// the caller's own, and [`RelBase::WithRegion`] is resolved by whoever
-    /// can read that rel base, so it does not reach here.
-    pub(crate) const fn stated_rel_base(self) -> Option<Len> {
-        match self.rel_base {
-            RelBase::Len(len) => Some(len),
-            _ => None,
-        }
-    }
-
-    /// The length this narrows the caller's rel base by, where it does.
-    /// `None` leaves that rel base alone, and reading it is then a
-    /// dependency the caller does not take.
-    pub(crate) const fn narrows_rel_base(self) -> Option<UiSpan> {
-        match (self.rel_base, self.span) {
-            (RelBase::WithRegion, PlaceSpan::Within(span)) => Some(span),
-            _ => None,
-        }
-    }
-
-    /// The span it composes into the caller's box, where that is what it
-    /// does: the one case whose validity maps back through the part.
-    pub(crate) const fn within_span(self) -> Option<UiSpan> {
-        match self.span {
-            PlaceSpan::Within(span) => Some(span),
-            _ => None,
-        }
-    }
-
-    /// Whether the caller decided this length rather than a place along its
-    /// own box, which is what stops its length reaching the child at all.
-    pub(crate) const fn is_sized(self) -> bool {
-        matches!(self.span, PlaceSpan::Sized(_))
-    }
-
-    /// The same, with its rel base stated outright.
-    pub(crate) const fn with_rel_base(mut self, len: Option<Len>) -> Self {
-        self.rel_base = match len {
-            Some(len) => RelBase::Len(len),
-            None => RelBase::Inherit,
-        };
-        self
-    }
-}
-
-/// Where a child is asked, on both axes. A [`UiRegion`] converts into the
-/// common case: that box of the caller's own, the answer placed inside it.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct PlaceDesc {
-    pub x: PlaceDescAxis,
-    pub y: PlaceDescAxis,
-}
-
-impl PlaceDesc {
-    /// The whole of the caller's box, on both axes.
-    pub const WHOLE: Self = Self::splat(PlaceDescAxis::WHOLE);
-
-    pub const fn new(x: PlaceDescAxis, y: PlaceDescAxis) -> Self {
-        Self { x, y }
-    }
-
-    /// The same on both axes.
-    pub const fn splat(place: PlaceDescAxis) -> Self {
-        Self { x: place, y: place }
-    }
-
-    /// A description per axis, where the two differ and neither is the
-    /// axis a container divides.
-    pub fn per_axis(f: impl Fn(Axis) -> PlaceDescAxis) -> Self {
-        Self::new(f(Axis::X), f(Axis::Y))
-    }
-
-    /// `aligned` on `axis` and `ortho` on the other, which is how a
-    /// container that divides one axis says what it is doing.
-    pub const fn from_axis(axis: Axis, aligned: PlaceDescAxis, ortho: PlaceDescAxis) -> Self {
-        match axis {
-            Axis::X => Self::new(aligned, ortho),
-            Axis::Y => Self::new(ortho, aligned),
-        }
-    }
-
-    /// Both regions are the child's placement. See [`PlaceDescAxis::fills`].
-    pub const fn fills(self) -> Self {
-        Self::new(self.x.fills(), self.y.fills())
-    }
-
-    /// The child's rel base on one axis. See [`PlaceDescAxis::rel_base`].
-    pub const fn rel_base(mut self, axis: Axis, len: Len) -> Self {
-        self[axis] = self[axis].rel_base(len);
-        self
-    }
-
-    /// The box each axis names, in the coordinates `own` is in.
-    pub(crate) fn of(self, own: UiRegion, align: RegionAlign) -> UiRegion {
-        UiRegion::new(self.x.of(own.x, align.x), self.y.of(own.y, align.y))
-    }
-}
-
-impl UiSpan {
-    /// This span composed into the caller's own box, so it moves and scales
-    /// with it: [`UiSpan::within`], which is what a container that insets
-    /// one speaks. Taking eleven pixels off the end needs no length, where
-    /// saying the same thing in window lengths would make the container read
-    /// its own box -- and a box chosen from its own answer then feeds back
-    /// into the answer.
-    ///
-    /// The child's rel base is narrowed the same way, so padding takes its
-    /// pixels off both and `rel(1)` under it fills the caller rather than
-    /// overflowing it.
-    pub const fn within_desc(self) -> PlaceDescAxis {
-        PlaceDescAxis {
-            span: PlaceSpan::Within(self),
-            fills: false,
-            rel_base: RelBase::WithRegion,
-        }
-    }
-
-    /// This span shifted to where the caller's own box starts: window
-    /// lengths along a cursor, which is what a container dividing room among
-    /// its children speaks. A child's report is a window length, so the
-    /// cursor that sums those reports is one too, and a moved box re-places
-    /// every child by re-adding its start, exactly.
-    ///
-    /// The child's rel base passes through: how far along the cursor a child
-    /// sits says nothing about what a fraction under it is of. The same span
-    /// says [`Self::within_desc`] as a part of that box instead, and which is
-    /// meant cannot be read off the numbers.
-    pub const fn shifted_desc(self) -> PlaceDescAxis {
-        PlaceDescAxis {
-            span: PlaceSpan::Shifted(self),
-            fills: false,
-            rel_base: RelBase::Inherit,
-        }
-    }
-}
-
-impl Len {
-    /// A box this long, placed in the caller's own by the child's alignment:
-    /// the rule that places an answer, with the length given from above
-    /// rather than reported. What a stack's sizing child decides for the
-    /// rest. It is the child's rel base too.
-    pub const fn as_desc(self) -> PlaceDescAxis {
-        PlaceDescAxis {
-            span: PlaceSpan::Sized(self),
-            fills: false,
-            rel_base: RelBase::Len(self),
-        }
-    }
-}
-
-impl From<UiRegion> for PlaceDesc {
-    fn from(region: UiRegion) -> Self {
-        Self::new(region.x.within_desc(), region.y.within_desc())
-    }
-}
-
-impl From<PlaceDescAxis> for PlaceDesc {
-    fn from(place: PlaceDescAxis) -> Self {
-        Self::splat(place)
-    }
-}
-
-/// A primitive as it was written: its box in the widget's own box's
-/// coordinates, which is what a move of that box re-composes from.
-#[derive(Debug)]
-pub struct RetainedPrimitive {
-    pub handle: PrimitiveHandle,
-    pub region: UiRegion,
-}
-
-impl_axis_index!(PlaceDesc => PlaceDescAxis);

core/src/util/math.rs

@@ -93,31 +93,3 @@ macro_rules! impl_op {
 }
 
 pub(crate) use impl_op;
-
-/// `Index<Axis>` for a pair, which is how every pair here is read by axis.
-/// The generics clause is given in braces where the type has one.
-macro_rules! impl_axis_index {
-    ($({$($gen:tt)*})? $T:ty => $Out:ty) => {
-        const impl $(<$($gen)*>)? std::ops::Index<crate::Axis> for $T {
-            type Output = $Out;
-
-            fn index(&self, axis: crate::Axis) -> &$Out {
-                match axis {
-                    crate::Axis::X => &self.x,
-                    crate::Axis::Y => &self.y,
-                }
-            }
-        }
-
-        const impl $(<$($gen)*>)? std::ops::IndexMut<crate::Axis> for $T {
-            fn index_mut(&mut self, axis: crate::Axis) -> &mut $Out {
-                match axis {
-                    crate::Axis::X => &mut self.x,
-                    crate::Axis::Y => &mut self.y,
-                }
-            }
-        }
-    };
-}
-
-pub(crate) use impl_axis_index;

core/src/widget/size_rule.rs

@@ -1,5 +1,4 @@
-use crate::util::impl_axis_index;
-use crate::{Axis, LayoutLen, Len};
+use crate::{Axis, LayoutLen, Weight};
 
 /// What a widget's length on one axis is, as a rule its parent applies where
 /// it draws it rather than an answer the widget gives about itself.
@@ -20,9 +19,14 @@ pub enum SizeRule {
 
 impl SizeRule {
     /// The length this rule gives without the widget being drawn, if it can
-    /// give one.
-    pub fn declared(&self) -> Option<Len> {
-        self.exact().and_then(LayoutLen::declared)
+    /// give one. `leftover` is never among them: a share is a length only to
+    /// whoever divides one, so it passes up in the reported size instead and
+    /// is resolved there.
+    pub fn declared(&self) -> Option<LayoutLen> {
+        match self {
+            Self::Exact(len) if len.leftover == Weight::ZERO => Some(*len),
+            _ => None,
+        }
     }
 
     /// The length this rule gives outright, whatever the widget reports --
@@ -66,29 +70,18 @@ pub struct SizeRules {
     pub y: SizeRule,
 }
 
-impl_axis_index!(SizeRules => SizeRule);
+impl SizeRules {
+    pub fn axis(&self, axis: Axis) -> SizeRule {
+        match axis {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
 
-/// What a widget's box is on each axis where something says so outright,
-/// before it is drawn: a rule beside it, or a hint it gives about itself.
-/// Whoever draws the widget resolves these against its rel base.
-///
-/// A [`Len`] rather than a [`LayoutLen`], because a share can never be one
-/// -- see [`LayoutLen::declared`].
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Declared {
-    pub x: Option<Len>,
-    pub y: Option<Len>,
-}
-
-impl Declared {
-    pub const NONE: Self = Self { x: None, y: None };
-
-    pub fn per_axis(f: impl Fn(Axis) -> Option<Len>) -> Self {
-        Self {
-            x: f(Axis::X),
-            y: f(Axis::Y),
+    pub fn axis_mut(&mut self, axis: Axis) -> &mut SizeRule {
+        match axis {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
         }
     }
 }
-
-impl_axis_index!(Declared => Option<Len>);

core/src/widget/widgets.rs

@@ -130,10 +130,10 @@ impl Widgets {
     pub fn set_size_rule(&mut self, id: impl IdLike, axis: Axis, rule: SizeRule) {
         let id = id.id();
         let data = self.data_mut(id).unwrap();
-        if data.size[axis] == rule {
+        if *data.size.axis_mut(axis) == rule {
             return;
         }
-        data.size[axis] = rule;
+        *data.size.axis_mut(axis) = rule;
         self.needs_redraw.insert(id);
     }
 
@@ -147,10 +147,10 @@ impl Widgets {
     pub fn set_alignment(&mut self, id: impl IdLike, axis: Axis, align: AxisAlign) {
         let id = id.id();
         let data = self.data_mut(id).unwrap();
-        if data.align[axis] == align {
+        if *data.align.axis_mut(axis) == align {
             return;
         }
-        data.align[axis] = align;
+        *data.align.axis_mut(axis) = align;
         self.needs_redraw.insert(id);
     }
 

src/random.rs

@@ -117,35 +117,19 @@ pub struct Branch {
 
 impl Widget for Branch {
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        let cut = Len::from_parts(Rel::ZERO, Px::from_int(40));
-        let top = UiSpan::new(Len::ZERO, cut).shifted_desc();
-        let measured = painter
-            .widget_at(&self.probe, top.axis(Axis::Y))
-            .len(Axis::X);
-        let len = measured.apply_leftover();
-        let px = painter.to_px(len, Axis::X);
-        // The range it actually branched on, said the way a container says
-        // one: pinning the window instead would redraw this widget on every
-        // resize, which is a fixture that never exercises reuse.
-        let threshold = Px::from_f32(self.threshold);
-        let holds = match px > threshold {
-            true => Holds::from(threshold + Px::STEP..=Px::MAX),
-            false => Holds::from(Px::MIN..=threshold),
-        };
-        painter.window_holds(Axis::X, holds.through(len));
+        let mut top = UiRegion::FULL;
+        top.y.end = top.y.start.offset(Px::from_int(40));
+        let measured = painter.widget_within(&self.probe, top).len(Axis::X);
+        let px = measured.apply_leftover().to_px(painter.px_len(Axis::X));
 
-        let below = UiSpan::new(cut, painter.region_len(Axis::Y)).shifted_desc();
-        let place = below.axis(Axis::Y);
-        match px > threshold {
-            true => painter.widget_at(&self.wide, place),
-            false => painter.widget_at(&self.narrow, place),
+        let mut below = UiRegion::FULL;
+        below.y.start = below.y.start.offset(Px::from_int(40));
+        match px > Px::from_f32(self.threshold) {
+            true => painter.widget_within(&self.wide, below),
+            false => painter.widget_within(&self.narrow, below),
         };
         Size::LEFTOVER
     }
-
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
-        Some(LayoutLen::LEFTOVER)
-    }
 }
 
 pub struct Spanned {

src/widget/image.rs

@@ -12,7 +12,7 @@ impl Widget for Image {
     }
 
     fn size_hint(&self, axis: Axis) -> Option<LayoutLen> {
-        Some(LayoutLen::px(self.handle.size()[axis]))
+        Some(LayoutLen::px(self.handle.size().axis(axis)))
     }
 }
 

src/widget/mask.rs

@@ -6,7 +6,7 @@ pub struct Masked {
 
 impl Widget for Masked {
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter.set_mask(UiRegion::FULL);
+        painter.set_mask(DrawRegion::Extent(UiRegion::FULL));
         painter.widget(&self.inner);
         // What it occupies is its box, on both axes, for the reason `Scroll`
         // reports the same: it clips what is inside to that box, so it can
@@ -15,8 +15,4 @@ impl Widget for Masked {
         // draw, and the framework would place the drawing it clipped away.
         Size::LEFTOVER
     }
-
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
-        Some(LayoutLen::LEFTOVER)
-    }
 }

src/widget/position/offset.rs

@@ -7,8 +7,7 @@ pub struct Offset {
 
 impl Widget for Offset {
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter
-            .widget_at(&self.inner, UiRegion::FULL.offset(self.amt))
-            .size()
+        let region = UiRegion::FULL.offset(self.amt);
+        painter.widget_within(&self.inner, region).size()
     }
 }

src/widget/position/pad.rs

@@ -13,13 +13,8 @@ impl Widget for Pad {
         // it; where the box is bigger -- a share of a row, a rule over this
         // widget -- the slack is the inner's to sit in, and forcing the near
         // edge pinned it to a corner it had not asked for.
-        //
-        // Padding is an inset of both: it comes off the rel base, so `rel(1)`
-        // under it fills this widget rather than overflowing it by the
-        // padding, and it comes off the box, so what is drawn sits inside.
-        // The two stay distinct -- the box can be narrower still, where a row
-        // asked this widget in the room left, and a text wraps at that.
-        let inner = painter.widget_at(&self.inner, self.padding.region()).size();
+        let inside = DrawRegion::Extent(self.padding.region());
+        let inner = painter.widget_within(&self.inner, inside).size();
         Size {
             x: LayoutLen {
                 px: inner.x.px + self.padding.left + self.padding.right,

src/widget/position/scroll.rs

@@ -12,28 +12,30 @@ pub struct Scroll {
 impl Widget for Scroll {
     fn draw(&mut self, painter: &mut Painter) -> Size {
         let container_len = painter.px_len(self.axis);
-        // Asked in the whole viewport, then put at the scrolled offset.
-        let answer_len = painter
-            .widget_at(&self.inner, PlaceDesc::WHOLE.fills())
-            .len(self.axis);
-        let fixed = painter.to_px(answer_len.without_leftover(), self.axis);
+        // Draw in the whole container only when its scrolling-axis length is
+        // not already known, then draw it at the scrolled offset.
+        let whole = UiRegion::FULL;
+        let own = painter.placement();
+        let answer_len =
+            painter.measure_len(&self.inner, self.axis, whole, [Some(own.x), Some(own.y)]);
+        let content = answer_len.apply_leftover();
         self.container_len = container_len;
-        self.content_len = fixed.max(container_len);
+        self.content_len = content.to_px(container_len);
 
         if self.snap_end {
             self.amt = self.content_len - self.container_len;
         }
         self.update_amt();
-        let align = painter.alignment()[self.axis];
+        let align = painter.alignment().axis(self.axis);
         // Content of a fixed length that fits sits at the start of any box it
         // fits in -- but only anchored there. Anywhere else it is a part of
         // the room left over, so it moves with every length the box takes and
         // the drawing holds for that length alone. One scrolled part way sits
         // where it is until the box shrinks past what is left of it. Kept to
         // the end, it moves with every length.
-        let fixed_len = answer_len.is_px();
+        let fixed_len = content.rel == Rel::ZERO;
         if fixed_len && self.content_len <= self.container_len && align == AxisAlign::NEG {
-            painter.holds(self.axis, fixed..=Px::MAX);
+            painter.holds(self.axis, self.content_len..=Px::MAX);
         } else if fixed_len && !self.snap_end {
             let left = self.content_len - self.amt;
             painter.holds(self.axis, Px::MIN..=left);
@@ -44,6 +46,7 @@ impl Widget for Scroll {
         // have placed the whole scroll in a box longer than it.
         let slack = (self.container_len - self.content_len).max(Px::ZERO);
         let anchor = slack.mul(align.rel());
+        let mut region = UiRegion::FULL;
         // Content that fills the viewport and has not been scrolled is the
         // viewport, and is handed back as it came. Writing the same box as
         // its own length in pixels is the same box in another form, and the
@@ -51,28 +54,26 @@ impl Widget for Scroll {
         // one centred in `px 900`, since halving a difference is not halving
         // each part of it.
         let moved = anchor != Px::ZERO || self.amt != Px::ZERO;
-        let content = match moved || self.content_len != self.container_len {
-            true => {
-                let start = Len::from_parts(Rel::ZERO, anchor - self.amt);
-                UiSpan::new(start, start.offset(self.content_len)).shifted_desc()
-            }
-            false => PlaceDescAxis::WHOLE,
-        };
-        // The viewport is the inner's rel base, so a fraction it declares or
+        if moved || self.content_len != self.container_len {
+            let offset = UiVec2::from_axis(
+                self.axis,
+                Len::from_parts(Rel::ZERO, anchor - self.amt),
+                Len::ZERO,
+            );
+            region = region.offset(offset);
+            region.axis_mut(self.axis).end = region.axis(self.axis).start.offset(self.content_len);
+        }
+        // The viewport is the inner's region, so a fraction it declares or
         // reports is a fraction of what is on screen rather than of the
-        // content box its own answer decided. Where it goes is the content
-        // box, scrolled: its drawing moved there, not made again there.
-        painter.place_at(&self.inner, content.axis(self.axis).fills());
+        // content box its own answer decided. Where it is put is the content
+        // box, scrolled.
+        painter.widget_at(&self.inner, whole, [Some(region.x), Some(region.y)]);
         // What it occupies is its box, on both axes: it clips its content to
         // that box, so it can neither take less of one nor honestly ask for
         // more. The content's length is what it scrolls through, not what it
         // is.
         Size::LEFTOVER
     }
-
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
-        Some(LayoutLen::LEFTOVER)
-    }
 }
 
 impl Scroll {

src/widget/position/span.rs

@@ -10,33 +10,34 @@ pub struct Span {
 impl Widget for Span {
     fn draw(&mut self, painter: &mut Painter) -> Size {
         let axis = self.dir.axis;
-        // The row: this span's own box, as a length of the rel base its children
-        // are laid out against. Its start is nothing's business -- a slot is
-        // a length from it -- so what this reads is the length alone.
-        let far = painter.region_len(axis);
+        // The row: this span's own box, as a span of the region it was given.
+        // Its children are laid out along it, and what they declare or report
+        // is a fraction of the region -- the area this span was told it has,
+        // which it passes on unchanged.
+        let own = painter.placement();
+        let row = *own.axis(axis);
+        // Across itself the span's own box is the child's region: a span is
+        // what contains its children there, and nothing divides that axis.
+        // Along it the whole region is, so a fraction means the same thing
+        // for every child however much of the row is left when it is asked.
+        let region = UiRegion::from_axis(axis, UiSpan::FULL, *own.axis(!axis));
         let along = |from: Len, to: Len| match self.dir.sign {
-            Sign::Pos => UiSpan::new(from, to),
-            Sign::Neg => UiSpan::new(far - to, far - from),
+            Sign::Pos => UiSpan::new(row.start + from, row.start + to),
+            Sign::Neg => UiSpan::new(row.end - to, row.end - from),
         };
-        // A length for every child before their final slots are chosen: from
-        // a hint where one says, and from drawing otherwise. The rel base passes
-        // through unchanged, so `rel(0.5)` is half the area this span was
-        // given whatever else is in it and wherever this child sits among
-        // them; what a drawn child is asked in is the room left from the
-        // cursor, because a text has to wrap at the width actually there.
+        let far = row.len();
+        // A length for every child before their final boxes are chosen: from
+        // a hint where one exists, and from drawing otherwise.
         let mut cursor = Len::rel_min();
         let mut lens = Vec::with_capacity(self.children.len());
         for child in &self.children {
-            let len = match painter.size_hint(child, axis) {
-                Some(len) => len,
-                None => {
-                    // Across itself the child sits where its own alignment
-                    // says, in the whole of the row: a span is what contains
-                    // its children there, and nothing divides that axis.
-                    let room = along(cursor, far).shifted_desc().axis(axis);
-                    painter.widget_at(child, room).len(axis)
-                }
-            };
+            // The whole region is the child's, so `rel(0.5)` is half the area
+            // this span was given whatever else is in it and wherever this
+            // child sits among them. What it is placed in is the room left
+            // from the cursor, because a text has to wrap at the width
+            // actually there.
+            let room = axis.pair(Some(along(cursor, far)), None);
+            let len = painter.measure_len(child, axis, region, room);
             cursor.px += len.px + self.gap;
             cursor.rel += len.rel;
             lens.push(len);
@@ -54,8 +55,8 @@ impl Widget for Span {
         );
 
         // What is left for the shares to divide: the row less everything
-        // fixed, as a length of the rel base rather than a number of pixels.
-        let room = far - total.without_leftover();
+        // fixed, as a length of the region rather than a number of pixels.
+        let room = far - Len::from_parts(total.rel, total.px);
         // Whether anything is left over is a question in pixels: `rel(0.5)`
         // beside 300 px is full at 600 and overfull at 400. Asked of `room`
         // itself, and answered back through the same expression, so the
@@ -67,12 +68,12 @@ impl Widget for Span {
         // exist at all turns on this.
         let mut shares = false;
         if total.leftover > Weight::ZERO {
-            shares = painter.to_px(room, axis) > Px::ZERO;
+            shares = room.to_px(painter.region_px_len(axis)) > Px::ZERO;
             let holds = match shares {
                 true => Holds::from(Px::STEP..=Px::MAX),
                 false => Holds::from(Px::MIN..=Px::ZERO),
             };
-            painter.window_holds(axis, holds.through(room));
+            painter.region_holds(axis, holds.through(room));
         }
 
         // Across itself a span is as long as its longest child -- unless a
@@ -91,52 +92,43 @@ impl Widget for Span {
         let mut taken = Weight::ZERO;
         let mut start = Len::rel_min();
         let mut ortho = LayoutLen::ZERO;
-        let shared = |fixed: Len, taken: Weight| match taken == Weight::ZERO {
-            true => fixed,
-            false => fixed + room.scale(Rel::ratio(taken, total.leftover)),
-        };
-        for (child, &len) in self.children.iter().zip(&lens) {
+        for (child, len) in self.children.iter().zip(&lens) {
             // A child asking for nothing but a part of what is left over,
             // when nothing is, is not drawn at all. One that also asked for
             // pixels or a fraction keeps those and overflows.
-            if len.is_only_leftover() && !shares {
+            if len.leftover > Weight::ZERO && len.px == Px::ZERO && len.rel == Rel::ZERO && !shares
+            {
                 painter.undraw(child);
                 fixed.px += self.gap;
-                start = shared(fixed, taken);
                 continue;
             }
             let from = start;
             if len.leftover > Weight::ZERO && shares {
                 taken += len.leftover;
             }
-            fixed += len.without_leftover();
-            start = shared(fixed, taken);
-            // Along the row the span says where the child goes, and that slot
-            // is the child's box outright rather than something to place an
-            // answer inside again. A share is decided here and nowhere
-            // else: its slot narrows its rel base, and the child is asked in
-            // it, since a text wraps at the width it is actually given. A
-            // fixed child's slot is its own answer, so a drawing made in the
-            // room is put there as it is, and one not made yet is made here.
-            let slot = along(from, start);
-            let mut place = slot.shifted_desc().fills().axis(axis);
-            if len.leftover > Weight::ZERO && shares {
-                place = place.rel_base(axis, slot.len());
-            }
-            let used = painter.place_at(child, place).len(!axis);
+            fixed.px += len.px;
+            fixed.rel += len.rel;
+            start = shared(fixed, taken, total.leftover, room);
+            // Along the row the span says where the child goes; across it the
+            // child sits where its own alignment says. Its region is the
+            // whole of what this span was given either way, which is what its
+            // fractions are of.
+            let placed =
+                painter.widget_at(child, region, axis.pair(Some(along(from, start)), None));
             if shrinks {
+                let used = placed.len(!axis);
                 // Choosing between a fixed and a relative length from the
                 // span's own eventual width admits multiple fixed points.
                 // A scalable child therefore makes Children scalable too;
                 // only fixed children are compared with one another.
-                if !used.is_px() {
+                if used.rel != Rel::ZERO || used.leftover != Weight::ZERO {
                     ortho = LayoutLen::LEFTOVER;
                 } else if ortho.leftover == Weight::ZERO {
                     ortho.px = ortho.px.max(used.px);
                 }
             }
             fixed.px += self.gap;
-            start = shared(fixed, taken);
+            start = shared(fixed, taken, total.leftover, room);
         }
 
         // Carried whole rather than collapsed to one share: a span that sizes
@@ -155,6 +147,16 @@ impl Widget for Span {
     }
 }
 
+/// Where a row has reached: everything fixed before this point, which is a
+/// sum and exact, plus the share of the room the weights so far are worth,
+/// which is one rounding wherever it is asked for.
+fn shared(fixed: Len, taken: Weight, weight: Weight, room: Len) -> Len {
+    if taken == Weight::ZERO {
+        return fixed;
+    }
+    fixed + room.scale(Rel::ratio(taken, weight))
+}
+
 impl Span {
     pub fn empty(dir: Dir) -> Self {
         Self {

src/widget/position/stack.rs

@@ -13,49 +13,32 @@ impl Widget for Stack {
             StackSize::Default => None,
             StackSize::Child(i) => Some(i),
         };
-        // Whichever child sizes the stack is given the stack's whole box --
-        // the stack is the length that child asked for, so placing that
-        // answer inside the box it decided would apply it twice.
+        // Whichever child sizes the stack keeps the stack's whole region as
+        // its own -- the stack is the length that child asked for, so taking
+        // the fraction of the stack's box again would take it twice -- and is
+        // put where the stack itself is put.
         let size = match sizing.and_then(|i| self.children.get(i).map(|c| (i, c))) {
             // On the layer that child ends up on, so the ask below is a reuse
             // rather than a second drawing of it somewhere else: a retained
             // drawing belongs to the layer it was made on.
             Some((i, child)) => {
                 painter.child_layer_at(i);
-                painter.widget_at(child, PlaceDesc::WHOLE.fills()).size()
+                painter.widget(child).size()
             }
             None => Size::LEFTOVER,
         };
-        // Every other child gets the box the sizing child decided: the
-        // stack is that length, so that is the box they are asked in, and a
-        // fraction under them is a fraction of it. A share leaves the axis
-        // to whoever gave the stack its box. Where a child sits in a box
-        // bigger than itself is its own business.
-        let place = PlaceDesc::per_axis(|axis| {
-            let len = size[axis];
-            match len.leftover == Weight::ZERO {
-                true => len.without_leftover().as_desc().fills(),
-                false => PlaceDescAxis::WHOLE,
-            }
-        });
         for (i, child) in self.children.iter().enumerate() {
             if sizing == Some(i) {
                 continue;
             }
             painter.child_layer_at(i);
-            painter.widget_at(child, place);
+            // Every other child has the stack's own box for its region, since
+            // the stack is what contains it, and where it sits in one bigger
+            // than itself is its own business.
+            painter.widget_within(child, DrawRegion::Extent(UiRegion::FULL));
         }
         size
     }
-
-    /// Without a sizing child a stack is whatever box it is given, which it
-    /// can say without drawing anything.
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
-        match self.size {
-            StackSize::Default => Some(LayoutLen::LEFTOVER),
-            StackSize::Child(_) => None,
-        }
-    }
 }
 
 #[derive(Default, Debug)]

src/widget/text/mod.rs

@@ -80,7 +80,7 @@ impl TextView {
         // hair under that line, and the break made in it is not the break a
         // cold layout makes there.
         let size = Size::from_px(PxVec2::ceil_from_f32(tex.size));
-        painter.glyphs(tex, region);
+        painter.glyphs(tex, DrawRegion::Extent(region));
         (region, size)
     }
 

tests/cases/determinism.rs

@@ -21,18 +21,16 @@ struct BranchesOnMeasurement {
 
 impl Widget for BranchesOnMeasurement {
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        let cut = Len::from_parts(Rel::ZERO, Px::from_int(40));
-        let top = UiSpan::new(Len::ZERO, cut).shifted_desc();
-        let measured = painter
-            .widget_at(&self.probe, top.axis(Axis::Y))
-            .len(Axis::X);
-        let px = painter.to_px(measured.apply_leftover(), Axis::X);
+        let mut top = UiRegion::FULL;
+        top.y.end = top.y.start.offset(Px::from_int(40));
+        let measured = painter.widget_within(&self.probe, top).len(Axis::X);
+        let px = measured.apply_leftover().to_px(painter.px_len(Axis::X));
 
-        let below = UiSpan::new(cut, painter.region_len(Axis::Y)).shifted_desc();
-        let place = below.axis(Axis::Y);
+        let mut below = UiRegion::FULL;
+        below.y.start = below.y.start.offset(Px::from_int(40));
         match px > Px::from_f32(self.threshold) {
-            true => painter.widget_at(&self.wide, place),
-            false => painter.widget_at(&self.narrow, place),
+            true => painter.widget_within(&self.wide, below),
+            false => painter.widget_within(&self.narrow, below),
         };
         Size::LEFTOVER
     }

tests/cases/layout.rs

@@ -83,10 +83,11 @@ fn a_text_in_a_span_wraps_at_the_room_left_rather_than_the_whole_row() {
     assert!(crowded > whole_row, "{crowded} against {whole_row}");
 }
 
-/// Padding is an inset: it narrows the frame a fraction resolves against and
-/// adds itself back to the padded widget's reported length.
+/// The same reading through a pad: its inset is the whole box less the
+/// padding, so half of the inset plus the padding is half the box plus one
+/// padding, not two.
 #[test]
-fn a_pad_puts_its_padding_around_a_fraction_of_the_whole_box() {
+fn a_pad_reports_a_fraction_of_its_inset_as_a_fraction_of_its_box() {
     let mut h = Harness::new((400, 100));
     let inner = rect(Color::GREEN).width(rel(0.5)).add(&mut h.rsc);
     let padded = (inner,).span(Dir::RIGHT).pad(10).add(&mut h.rsc);
@@ -95,85 +96,10 @@ fn a_pad_puts_its_padding_around_a_fraction_of_the_whole_box() {
     // placed inside it by its own alignment, which is not what is under test.
     h.set_root((padded, tail).span(Dir::RIGHT).width(rel(1.0)));
 
-    assert_corners!(h, inner, (10, 10), (200, 90));
     assert_corners!(h, padded, (0, 0), (210, 100));
     assert_corners!(h, tail, (210, 0), (310, 100));
 }
 
-const PARAGRAPH: &str = "Wrapping shapes one source into as many lines as the box \
-    leaves room for, so a paragraph's height is an answer and not a setting.";
-
-/// The worked example of what padding insets: in a 900 px row after a 24 px
-/// icon, a `rel(1.0)` inside `pad(16)` is 900 - 32 and overflows the row by
-/// the icon's width, while a wrapping text beside it is asked in the room
-/// left, 900 - 24 - 32, and wraps there.
-#[test]
-fn padding_keeps_the_rel_base_distinct_from_the_room_left_in_a_row() {
-    let mut h = Harness::new((900, 200));
-    let icon = rect(Color::RED).width(24).add(&mut h.rsc);
-    let fill = rect(Color::GREEN).width(rel(1.0)).add(&mut h.rsc);
-    let padded = fill.pad(16).add(&mut h.rsc);
-    h.set_root((icon, padded).span(Dir::RIGHT).width(rel(1.0)));
-    let fill_width = h.region(&fill).unwrap().size().x;
-    assert_eq!(fill_width, Px::from_int(868));
-
-    let mut h = Harness::new((900, 200));
-    let icon = rect(Color::RED).width(24).add(&mut h.rsc);
-    let text = wtext(PARAGRAPH).size(16).wrap(true).add(&mut h.rsc);
-    let padded = text.pad(16).add(&mut h.rsc);
-    h.set_root((icon, padded).span(Dir::RIGHT).width(rel(1.0)));
-    let active = &h.render.active[&text.id()];
-    let window = h.render.output_size().x;
-    let asked = active.region.x.len().to_px(window);
-    assert_eq!(active.rel_base.x.to_px(window), Px::from_int(868));
-    assert_eq!(asked, Px::from_int(844));
-}
-
-/// The other way round: a share inside padding. A slot is a length of the
-/// row, which is already the padded width, so what the span decided reaches
-/// the child as it stands -- taking the padding off a second time would make
-/// `rel(1.0)` in the slot shorter than the slot.
-#[test]
-fn a_share_inside_padding_fills_the_slot_it_was_given() {
-    let mut h = Harness::new((900, 200));
-    let fill = rect(Color::GREEN).width(rel(1.0)).add(&mut h.rsc);
-    let first = Span {
-        children: vec![fill.add_strong(&mut h.rsc)],
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }
-    .width(leftover(1))
-    .add(&mut h.rsc);
-    let second = rect(Color::BLUE).width(leftover(1)).add(&mut h.rsc);
-    let row = (first, second).span(Dir::RIGHT).add(&mut h.rsc);
-    h.set_root(row.pad(16));
-
-    assert_eq!(h.region(&first).unwrap().size().x, Px::from_int(434));
-    assert_eq!(h.region(&fill).unwrap().size().x, Px::from_int(434));
-}
-
-/// The same padding in a share instead: the slot is 450, so both the
-/// fraction and the wrap are the slot less the padding, and the two agree.
-#[test]
-fn padding_narrows_both_rel_base_and_box_inside_a_share() {
-    let mut h = Harness::new((900, 200));
-    let fill = rect(Color::GREEN).width(rel(1.0)).add(&mut h.rsc);
-    let padded = fill.pad(16).width(leftover(1)).add(&mut h.rsc);
-    let other = rect(Color::BLUE).width(leftover(1)).add(&mut h.rsc);
-    h.set_root((padded, other).span(Dir::RIGHT).width(rel(1.0)));
-    assert_eq!(h.region(&fill).unwrap().size().x, Px::from_int(418));
-
-    let mut h = Harness::new((900, 200));
-    let text = wtext(PARAGRAPH).size(16).wrap(true).add(&mut h.rsc);
-    let padded = text.pad(16).width(leftover(1)).add(&mut h.rsc);
-    let other = rect(Color::BLUE).width(leftover(1)).add(&mut h.rsc);
-    h.set_root((padded, other).span(Dir::RIGHT).width(rel(1.0)));
-    let active = &h.render.active[&text.id()];
-    let window = h.render.output_size().x;
-    assert_eq!(active.rel_base.x.to_px(window), Px::from_int(418));
-    assert_eq!(active.region.x.len().to_px(window), Px::from_int(418));
-}
-
 #[test]
 fn a_span_ruled_across_itself_does_not_measure_its_children_there() {
     let mut h = Harness::new((400, 200));
@@ -500,11 +426,11 @@ fn a_row_of_equal_shares_fills_it_exactly() {
 /// a step of. Kept in step with `snap_floor` in `prelude.wgsl`.
 fn drawn_edges(h: &Harness, id: WidgetId, axis: Axis) -> (f32, f32) {
     let active = &h.render.active[&id];
-    let region = h.render.moves.resolve(active.move_idx, active.placement);
-    let dim = h.size()[axis];
+    let region = h.render.moves.resolve(active.parent_move, active.region);
+    let dim = h.size().axis(axis);
     let snap = |v: f32| (v + Px::STEP.to_f32() * 0.5).floor();
     let edge = |s: Len| snap(s.rel.to_f32() * dim + s.px.to_f32());
-    let span = region[axis];
+    let span = region.axis(axis);
     (edge(span.start), edge(span.end))
 }
 
@@ -811,50 +737,3 @@ fn a_fixed_child_is_centered_in_its_wrappers_share() {
     assert_corners!(h, wrapper, (200, 0), (900, 400));
     assert_corners!(h, leaf, (500, 150), (600, 250));
 }
-
-/// The root's frame is the window and its rule is a fraction of that, which
-/// is one resolution and not two: nothing above it narrowed anything.
-#[test]
-fn a_root_with_a_fraction_rule_is_that_fraction_of_the_window() {
-    let mut h = Harness::new((900, 200));
-    let root = rect(Color::RED).width(rel(0.5)).add(&mut h.rsc);
-    h.set_root(root);
-    assert_eq!(h.region(&root).unwrap().size().x, Px::from_int(450));
-}
-
-#[test]
-fn a_collapsed_share_keeps_the_gaps_before_the_next_slot() {
-    for dir in [Dir::RIGHT, Dir::LEFT, Dir::DOWN, Dir::UP] {
-        for collapsed in [1, 2] {
-            let mut h = Harness::new((400, 400));
-            let head = rect(Color::RED).add(&mut h.rsc);
-            h.set_len(head, dir.axis, 200);
-            let tail = rect(Color::BLUE).add(&mut h.rsc);
-            let tail_len = 200 - 10 * (collapsed + 1);
-            h.set_len(tail, dir.axis, tail_len);
-            let mut children: Vec<StrongWidget> = vec![head.add_strong(&mut h.rsc)];
-            let mut shares = Vec::new();
-            for _ in 0..collapsed {
-                let share = rect(Color::GREEN).add(&mut h.rsc);
-                shares.push(share);
-                children.push(share.add_strong(&mut h.rsc));
-            }
-            children.push(tail.add_strong(&mut h.rsc));
-            h.set_root(Span {
-                children,
-                dir,
-                gap: Px::from_int(10),
-            });
-            for share in shares {
-                assert!(h.region(&share).is_none());
-            }
-            let region = h.region(&tail).unwrap();
-            let (from, to) = match dir.sign {
-                Sign::Pos => (400 - tail_len, 400),
-                Sign::Neg => (0, tail_len),
-            };
-            assert_eq!(region.top_left[dir.axis], Px::from_int(from));
-            assert_eq!(region.bot_right[dir.axis], Px::from_int(to));
-        }
-    }
-}

tests/cases/retained.rs

@@ -156,9 +156,9 @@ fn a_span_child_that_declares_its_length_is_drawn_once() {
     h.set_root((hinted, asked).span(Dir::RIGHT));
 
     assert_eq!(told_draws.get(), 1);
-    // Asked once, from the cursor; its slot is its answer and the drawing is
-    // moved there.
-    assert_eq!(asked_draws.get(), 1);
+    // Only the available length changes: positioning the final slot does
+    // not invalidate a numeric size read.
+    assert_eq!(asked_draws.get(), 2);
 }
 
 #[test]
@@ -213,8 +213,9 @@ struct FromHint {
 impl Widget for FromHint {
     fn draw(&mut self, painter: &mut Painter) -> Size {
         let len = painter.size_hint(&self.inner, Axis::Y).unwrap();
-        let top = UiSpan::new(Len::ZERO, Len::from_parts(Rel::ZERO, len.px));
-        painter.widget_at(&self.inner, top.shifted_desc().axis(Axis::Y));
+        let mut region = UiRegion::FULL;
+        region.y.end = region.y.start.offset(len.px);
+        painter.widget_within(&self.inner, region);
         Size::LEFTOVER
     }
 }
@@ -251,9 +252,10 @@ impl Widget for ReadsBox {
 /// Reads its box across one axis only, so its drawing holds for a taller
 /// box on its own and only a wider one is worth a draw.
 ///
-/// Both of these report a quarter of what they read. The quarter-sized box
-/// the answer places them in is not a question: the drawing is moved there,
-/// so each length they are asked at costs one draw.
+/// Both of these report a quarter of what they read, without saying that the
+/// drawing holds there too, so each length they are asked at costs two draws:
+/// one to answer, and one in the quarter-sized box that answer places them
+/// in. The counts below are in those pairs.
 struct ReadsWidth {
     draws: Rc<Cell<usize>>,
 }
@@ -303,51 +305,6 @@ fn a_span_ruled_across_itself_moves_its_child_without_redrawing_it() {
     assert_eq!(h.render.active[&span.id()].size.y, LayoutLen::rel(1.0));
 }
 
-/// A row places its children as lengths from where its own box starts, so a
-/// child that grew moves the ones after it and nothing else: each of them is
-/// the same box in a new place, which the retained drawing follows without
-/// being made again. Both kinds of length: one the row resolves from a rule,
-/// and one it takes from what the child reported.
-#[test]
-fn a_row_moves_what_follows_a_child_that_grew_rather_than_drawing_it() {
-    for declared in [false, true] {
-        let mut h = Harness::new((400, 200));
-        let first = rect(Color::RED).width(50).add(&mut h.rsc);
-        let ruled = Rc::new(Cell::new(0));
-        let second = Counted {
-            draws: ruled.clone(),
-            size: Size::LEFTOVER,
-            reads_box: false,
-        };
-        let second = match declared {
-            true => second.width(rel(0.25)).add(&mut h.rsc),
-            false => second.width(60).add(&mut h.rsc),
-        };
-        let (third, reported) = counted(&mut h, Size::from((70, 20)), false);
-        h.set_root((first, second, third).span(Dir::RIGHT).width(rel(1.0)));
-        let (was_ruled, was_reported) = (ruled.get(), reported.get());
-        // A quarter of the row is a quarter of the row, wherever it sits in
-        // it and whatever the first child takes.
-        let width = match declared {
-            true => 100,
-            false => 60,
-        };
-        assert_corners!(h, second, (50, 0), (50 + width, 200));
-
-        h.set_len(first, Axis::X, 80);
-        h.frame();
-
-        assert_eq!(ruled.get(), was_ruled, "the ruled child was drawn again");
-        assert_eq!(
-            reported.get(),
-            was_reported,
-            "the reported child was drawn again"
-        );
-        assert_corners!(h, second, (80, 0), (80 + width, 200));
-        assert_corners!(h, third, (80 + width, 90), (150 + width, 110));
-    }
-}
-
 /// The output is the root of the box chain, so a resize is a box that changed
 /// length like any other -- there is not a second rule for the window. A
 /// drawing that holds for one length is drawn again whichever box moved.
@@ -379,7 +336,7 @@ fn a_resize_redraws_what_read_its_box() {
     h.resize((800, 100));
     h.frame();
 
-    assert_eq!(draws.get(), settled + 1);
+    assert_eq!(draws.get(), settled + 2);
 }
 
 #[test]
@@ -399,7 +356,7 @@ fn a_resize_only_redraws_read_axes() {
 
     h.resize((800, 300));
     h.frame();
-    assert_eq!(draws.get(), settled + 1, "width changes its answer");
+    assert_eq!(draws.get(), settled + 2, "width changes its answer");
 }
 
 /// A window is measured onto the grid like everything else, so a resize too
@@ -426,7 +383,7 @@ fn a_resize_within_one_step_is_not_a_resize() {
 
     h.resize((400.0 + step, 200.0));
     h.frame();
-    assert_eq!(draws.get(), settled + 1);
+    assert_eq!(draws.get(), settled + 2);
 }
 
 /// The same for a box that changes because a sibling did: what is compared
@@ -793,7 +750,37 @@ fn primitive_bounds(h: &Harness, id: WidgetId) -> Vec<PixelRegion> {
 }
 
 #[test]
-fn changing_an_inherited_region_keeps_the_original_measurement_offer() {
+fn frame_geometry_and_extent_geometry_keep_their_references() {
+    struct Both(Rc<Cell<usize>>);
+    impl Widget for Both {
+        fn draw(&mut self, painter: &mut Painter) -> Size {
+            self.0.set(self.0.get() + 1);
+            painter.primitive_within(RectPrimitive::color(Color::RED), UiRegion::FULL);
+            painter.primitive(RectPrimitive::color(Color::BLUE));
+            Size::LEFTOVER
+        }
+    }
+    for node in [false, true] {
+        let mut h = Harness::new((400, 200));
+        let first = rect(Color::GREEN).width(100).add(&mut h.rsc);
+        let draws = Rc::new(Cell::new(0));
+        let both = Both(draws.clone()).add(&mut h.rsc);
+        h.rsc.widgets_mut().set_region_node(both, node);
+        h.set_root((first, both).span(Dir::RIGHT));
+        let count = draws.get();
+        h.set_len(first, Axis::X, 200);
+        h.frame();
+        assert_eq!(draws.get(), count);
+        let bounds = primitive_bounds(&h, both.id());
+        assert_eq!(bounds[0].top_left.x, Px::ZERO);
+        assert_eq!(bounds[0].bot_right.x, Px::from_int(400));
+        assert_eq!(bounds[1].top_left.x, Px::from_int(200));
+        assert_eq!(bounds[1].bot_right.x, Px::from_int(400));
+    }
+}
+
+#[test]
+fn changing_an_inherited_extent_keeps_the_original_measurement_offer() {
     fn build(h: &mut Harness, width: i32, text: &str) -> (WeakWidget<Text>, WeakWidget<Rect>) {
         let first = rect(Color::RED).width(width).add(&mut h.rsc);
         let words = wtext(text).size(20).wrap(true).add(&mut h.rsc);
@@ -871,10 +858,7 @@ fn resizing_a_fixed_frame_recomposes_its_contents_without_drawing_them() {
     }
     impl Widget for Frame {
         fn draw(&mut self, painter: &mut Painter) -> Size {
-            painter.widget_at(
-                &self.child,
-                PlaceDesc::new(self.region.x.shifted_desc(), self.region.y.shifted_desc()),
-            );
+            painter.widget_within(&self.child, self.region);
             Size::LEFTOVER
         }
     }
@@ -882,7 +866,7 @@ fn resizing_a_fixed_frame_recomposes_its_contents_without_drawing_them() {
     impl Widget for Painted {
         fn draw(&mut self, painter: &mut Painter) -> Size {
             self.0.set(self.0.get() + 1);
-            painter.set_mask(UiRegion::FULL);
+            painter.set_mask(DrawRegion::Extent(UiRegion::FULL));
             painter.primitive(RectPrimitive::color(Color::BLUE));
             Size::LEFTOVER
         }
@@ -931,6 +915,43 @@ fn resizing_a_fixed_frame_recomposes_its_contents_without_drawing_them() {
     }
 }
 
+#[test]
+fn a_span_does_not_place_its_measurement_before_assigning_the_childs_slot() {
+    struct MeasuredBox(Rc<Cell<usize>>);
+
+    impl Widget for MeasuredBox {
+        fn draw(&mut self, painter: &mut Painter) -> Size {
+            self.0.set(self.0.get() + 1);
+            painter.px_size();
+            painter.primitive(RectPrimitive::color(Color::BLUE));
+            Size::from((100, 50))
+        }
+    }
+
+    let mut h = Harness::new((400, 200));
+    let draws = Rc::new(Cell::new(0));
+    let leaf = MeasuredBox(draws.clone()).add(&mut h.rsc);
+    h.set_root((leaf,).span(Dir::RIGHT).width(rel(1.0)).height(rel(1.0)));
+
+    assert_eq!(draws.get(), 3);
+    assert_corners!(h, leaf, (0, 75), (100, 125));
+    assert_eq!(
+        primitive_bounds(&h, leaf.id()),
+        vec![h.region(&leaf.id()).unwrap()]
+    );
+    h.frame();
+    assert_eq!(draws.get(), 3);
+
+    h.resize((600, 300));
+    h.frame();
+    assert_eq!(draws.get(), 6);
+    assert_corners!(h, leaf, (0, 125), (100, 175));
+    assert_eq!(
+        primitive_bounds(&h, leaf.id()),
+        vec![h.region(&leaf.id()).unwrap()]
+    );
+}
+
 #[test]
 fn glyph_origins_compose_identically_when_drawn_and_when_retained() {
     struct Glyphs {
@@ -945,24 +966,22 @@ fn glyph_origins_compose_identically_when_drawn_and_when_retained() {
                 UiSpan::new(Len::rel(0.23) + Len::px(-7.125), Len::FULL),
                 UiSpan::new(Len::rel(0.37) + Len::px(3.25), Len::FULL),
             );
-            painter.glyphs(text, origin);
+            painter.glyphs(text, DrawRegion::Frame(origin));
+            painter.glyphs(text, DrawRegion::Extent(origin));
             Size::LEFTOVER
         }
     }
     struct Frame {
         child: StrongWidget,
-        frame: UiRegion,
         region: UiRegion,
+        extent: UiRegion,
     }
     impl Widget for Frame {
         fn draw(&mut self, painter: &mut Painter) -> Size {
             painter.widget_at(
                 &self.child,
-                PlaceDesc::new(
-                    self.region.x.shifted_desc().fills(),
-                    self.region.y.shifted_desc().fills(),
-                )
-                .rel_base(Axis::X, self.frame.x.len()),
+                self.region,
+                [Some(self.extent.x), Some(self.extent.y)],
             );
             Size::LEFTOVER
         }
@@ -978,15 +997,15 @@ fn glyph_origins_compose_identically_when_drawn_and_when_retained() {
         h.rsc.widgets_mut().set_region_node(text, node);
         let root = Frame {
             child: text.add_strong(&mut h.rsc),
-            frame: UiRegion::FULL,
             region: UiRegion::FULL,
+            extent: UiRegion::FULL,
         }
         .add(&mut h.rsc);
         h.set_root(root);
         for (start, end) in [(0.13, 0.83), (-0.17, 1.23), (0.31, 0.67)] {
             let before = draws.get();
-            h.rsc[root].frame.x = UiSpan::new(Len::px(13.125), Len::px(287.375));
-            h.rsc[root].region = UiRegion::new(
+            h.rsc[root].region.x = UiSpan::new(Len::px(13.125), Len::px(287.375));
+            h.rsc[root].extent = UiRegion::new(
                 UiSpan::new(Len::rel(start), Len::rel(end)),
                 UiSpan::new(Len::px(7.25), Len::rel(end)),
             );
@@ -1109,7 +1128,7 @@ fn widening_and_restoring_a_contract_does_not_invalidate_its_reader() {
     assert_eq!(leaf_draws.get(), settled + 1);
 }
 #[test]
-fn padding_and_stack_boxes_follow_the_region_without_drawing_again() {
+fn padding_and_stack_frames_follow_the_extent_without_drawing_again() {
     struct Observed<W> {
         widget: W,
         draws: Rc<Cell<usize>>,
@@ -1122,22 +1141,20 @@ fn padding_and_stack_boxes_follow_the_region_without_drawing_again() {
     }
     struct Frame {
         child: StrongWidget,
-        region: UiRegion,
+        extent: UiRegion,
     }
     impl Widget for Frame {
         fn draw(&mut self, painter: &mut Painter) -> Size {
             painter.widget_at(
                 &self.child,
-                PlaceDesc::new(
-                    self.region.x.shifted_desc().fills(),
-                    self.region.y.shifted_desc().fills(),
-                ),
+                UiRegion::FULL,
+                [Some(self.extent.x), Some(self.extent.y)],
             );
             Size::LEFTOVER
         }
     }
     for node in [false, true] {
-        let plant = |h: &mut Harness, region| {
+        let plant = |h: &mut Harness, extent| {
             let draws = Rc::new(Cell::new(0));
             let leaf = rect(Color::BLUE).masked().add(&mut h.rsc);
             h.rsc.widgets_mut().set_region_node(leaf, node);
@@ -1158,28 +1175,23 @@ fn padding_and_stack_boxes_follow_the_region_without_drawing_again() {
                 draws: draws.clone(),
             }
             .add_strong(&mut h.rsc);
-            let root = Frame { child: pad, region }.add(&mut h.rsc);
+            let root = Frame { child: pad, extent }.add(&mut h.rsc);
             h.set_root(root);
             (root, leaf, fixed, draws)
         };
-        // The same box in three places. A pad places its child as lengths of
-        // its own box measured from where that box starts, so moving it is
-        // nothing to the pad -- where changing its length is a different
-        // question, and does draw it again.
-        let at = |start: f32| {
-            let span = |start: Len| UiSpan::new(start, start + Len::rel(0.4));
-            UiRegion::new(span(Len::rel(start) + Len::px(3.125)), span(Len::px(11.25)))
-        };
         let mut warm = Harness::new((403, 211));
-        let (root, leaf, fixed, draws) = plant(&mut warm, at(0.13));
-        for start in [0.13, -0.17, 0.31] {
-            let region = at(start);
+        let (root, leaf, fixed, draws) = plant(&mut warm, UiRegion::FULL);
+        for (start, end) in [(0.13, 0.83), (-0.17, 1.23), (0.31, 0.67)] {
+            let extent = UiRegion::new(
+                UiSpan::new(Len::rel(start) + Len::px(3.125), Len::rel(end)),
+                UiSpan::new(Len::px(11.25), Len::rel(end)),
+            );
             let before = draws.get();
-            warm.rsc[root].region = region;
+            warm.rsc[root].extent = extent;
             warm.frame();
             assert_eq!(draws.get(), before);
             let mut cold = Harness::new((403, 211));
-            let (_, other, other_fixed, _) = plant(&mut cold, region);
+            let (_, other, other_fixed, _) = plant(&mut cold, extent);
             for (a, b) in [(leaf.id(), other.id()), (fixed.id(), other_fixed.id())] {
                 assert_eq!(warm.region(&a), cold.region(&b));
                 assert_eq!(primitive_bounds(&warm, a), primitive_bounds(&cold, b));
@@ -1198,7 +1210,7 @@ fn padding_and_stack_boxes_follow_the_region_without_drawing_again() {
 }
 
 #[test]
-fn moving_a_childs_region_preserves_the_slot_chosen_from_its_measurement() {
+fn moving_an_extent_child_preserves_the_slot_chosen_from_its_measurement() {
     struct Measured;
     impl Widget for Measured {
         fn draw(&mut self, painter: &mut Painter) -> Size {
@@ -1215,12 +1227,14 @@ fn moving_a_childs_region_preserves_the_slot_chosen_from_its_measurement() {
         fn draw(&mut self, painter: &mut Painter) -> Size {
             painter.widget_at(
                 &self.child,
-                PlaceDesc::new(
-                    UiSpan::new(Len::px(self.start), Len::px(self.start + 200.0))
-                        .shifted_desc()
-                        .fills(),
-                    UiSpan::FULL.shifted_desc().fills(),
-                ),
+                UiRegion::FULL,
+                [
+                    Some(UiSpan::new(
+                        Len::px(self.start),
+                        Len::px(self.start + 200.0),
+                    )),
+                    Some(UiSpan::FULL),
+                ],
             );
             Size::LEFTOVER
         }
@@ -1245,7 +1259,7 @@ fn moving_a_childs_region_preserves_the_slot_chosen_from_its_measurement() {
 }
 
 #[test]
-fn changing_regions_keep_fractional_reports_and_numeric_dependencies_valid() {
+fn extent_frames_keep_fractional_reports_and_numeric_dependencies_valid() {
     struct Container {
         child: StrongWidget,
         region: UiRegion,
@@ -1253,16 +1267,13 @@ fn changing_regions_keep_fractional_reports_and_numeric_dependencies_valid() {
     impl Widget for Container {
         fn draw(&mut self, painter: &mut Painter) -> Size {
             painter
-                .widget_at(
-                    &self.child,
-                    PlaceDesc::new(self.region.x.shifted_desc(), self.region.y.shifted_desc()),
-                )
+                .widget_within(&self.child, DrawRegion::Extent(self.region))
                 .size()
         }
     }
     struct Frame {
         child: StrongWidget,
-        region: UiRegion,
+        extent: UiRegion,
         answer: Rc<Cell<Size>>,
     }
     impl Widget for Frame {
@@ -1271,10 +1282,8 @@ fn changing_regions_keep_fractional_reports_and_numeric_dependencies_valid() {
                 painter
                     .widget_at(
                         &self.child,
-                        PlaceDesc::new(
-                            self.region.x.shifted_desc().fills(),
-                            self.region.y.shifted_desc().fills(),
-                        ),
+                        UiRegion::FULL,
+                        [Some(self.extent.x), Some(self.extent.y)],
                     )
                     .size(),
             );
@@ -1286,7 +1295,7 @@ fn changing_regions_keep_fractional_reports_and_numeric_dependencies_valid() {
             UiRegion::FULL,
             UiRegion::new(UiSpan::new(Len::rel(0.13), Len::rel(0.79)), UiSpan::FULL),
         ] {
-            let plant = |h: &mut Harness, outer| {
+            let plant = |h: &mut Harness, extent| {
                 let size = if fractional {
                     Size {
                         x: rel(0.5),
@@ -1304,7 +1313,7 @@ fn changing_regions_keep_fractional_reports_and_numeric_dependencies_valid() {
                 let answer = Rc::new(Cell::new(Size::ZERO));
                 let root = Frame {
                     child,
-                    region: outer,
+                    extent,
                     answer: answer.clone(),
                 }
                 .add(&mut h.rsc);
@@ -1314,166 +1323,15 @@ fn changing_regions_keep_fractional_reports_and_numeric_dependencies_valid() {
             let mut warm = Harness::new((403, 211));
             let (root, leaf, answer) = plant(&mut warm, UiRegion::FULL);
             for width in [191.125, 297.25, 83.75] {
-                let region =
+                let extent =
                     UiRegion::new(UiSpan::new(Len::px(13.125), Len::px(width)), UiSpan::FULL);
-                warm.rsc[root].region = region;
+                warm.rsc[root].extent = extent;
                 warm.frame();
                 let mut cold = Harness::new((403, 211));
-                let (_, other, other_answer) = plant(&mut cold, region);
+                let (_, other, other_answer) = plant(&mut cold, extent);
                 assert_eq!(answer.get(), other_answer.get());
                 assert_eq!(warm.region(&leaf), cold.region(&other));
             }
         }
     }
 }
-
-struct OptionalMask {
-    inner: StrongWidget,
-    enabled: bool,
-}
-
-impl Widget for OptionalMask {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        if self.enabled {
-            painter.set_mask(UiRegion::FULL);
-        }
-        painter.widget(&self.inner);
-        Size::LEFTOVER
-    }
-}
-
-fn primitive_masks(h: &Harness, id: WidgetId) -> Vec<MaskIdx> {
-    h.render.active[&id]
-        .primitives
-        .iter()
-        .map(|primitive| {
-            let handle = &primitive.handle;
-            h.render.layers[handle.layer].primitives()[handle.kind as usize]
-                .as_ref()
-                .unwrap()
-                .instances()[handle.inst_idx]
-                .mask_idx
-        })
-        .collect()
-}
-
-#[test]
-fn a_redrawn_mask_keeps_reused_primitives_clipped_when_it_moves() {
-    for node in [false, true] {
-        let mut h = Harness::new((400, 200));
-        let first = rect(Color::RED).height(50).add(&mut h.rsc);
-        let inner = rect(Color::BLUE).add(&mut h.rsc);
-        let draws = Rc::new(Cell::new(0));
-        let child = Stretchy {
-            inner: inner.add_strong(&mut h.rsc),
-            draws: draws.clone(),
-        }
-        .add(&mut h.rsc);
-        let masked = child.masked().add(&mut h.rsc);
-        h.rsc.widgets_mut().set_region_node(masked, node);
-        h.set_root((first, masked).span(Dir::DOWN));
-        let mask = h.render.active[&masked.id()].mask;
-        let settled = draws.get();
-        h.rsc.widgets_mut().get_dyn_mut(masked.id());
-        h.frame();
-        assert_eq!(primitive_masks(&h, inner.id()), vec![mask]);
-        assert_eq!(draws.get(), settled, "a mask repaint must reuse its child");
-        assert_eq!(h.render.active[&masked.id()].mask, mask);
-        h.set_len(first, Axis::Y, 10);
-        h.frame();
-        let clip = h.rsc.ui().masks[mask.idx()];
-        let clip = h
-            .render
-            .moves
-            .resolve(clip.move_idx, clip.region)
-            .to_px(h.render.output_size());
-        assert_eq!(clip, h.region(&masked).unwrap());
-        assert_corners!(h, inner, (0, 10), (400, 200));
-    }
-}
-
-#[test]
-fn adding_and_removing_a_mask_updates_existing_primitives() {
-    let mut h = Harness::new((400, 200));
-    let inner = rect(Color::BLUE).add(&mut h.rsc);
-    let masked = OptionalMask {
-        inner: inner.add_strong(&mut h.rsc),
-        enabled: false,
-    }
-    .add(&mut h.rsc);
-    h.set_root(masked);
-    for enabled in [true, false, true, false] {
-        h.rsc[masked].enabled = enabled;
-        h.frame();
-        let mask = h.render.active[&masked.id()].mask;
-        assert_eq!(mask == MaskIdx::NONE, !enabled);
-        assert_eq!(primitive_masks(&h, inner.id()), vec![mask]);
-    }
-    assert_eq!(h.rsc.ui().masks.len(), 1, "retired slots must be reusable");
-}
-
-#[test]
-fn an_empty_masks_slot_is_released_when_the_mask_is_removed_or_undrawn() {
-    let mut h = Harness::new((400, 200));
-    let (inner, _) = counted(&mut h, Size::LEFTOVER, false);
-    let masked = OptionalMask {
-        inner: inner.add_strong(&mut h.rsc),
-        enabled: true,
-    }
-    .add(&mut h.rsc);
-    let row = (masked,).span(Dir::DOWN).add(&mut h.rsc);
-    h.set_root(row);
-    for _ in 0..3 {
-        h.rsc[masked].enabled = false;
-        h.frame();
-        h.rsc[masked].enabled = true;
-        h.frame();
-        let child = h.rsc[row].pop().unwrap();
-        h.frame();
-        h.rsc[row].push(child);
-        h.frame();
-    }
-    assert_eq!(h.rsc.ui().masks.len(), 1);
-}
-
-struct SharedChild(Rc<StrongWidget>);
-
-impl Widget for SharedChild {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter.widget(self.0.as_ref()).size()
-    }
-}
-
-struct SwitchParent {
-    choices: [StrongWidget; 2],
-    choice: usize,
-}
-
-impl Widget for SwitchParent {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter.widget(&self.choices[self.choice]).size()
-    }
-}
-
-#[test]
-fn a_redrawn_subtree_is_not_undrawn_by_the_parent_it_left() {
-    for node in [false, true] {
-        let mut h = Harness::new((400, 200));
-        let leaf = rect(Color::RED).width(40).add(&mut h.rsc);
-        let held: StrongWidget = leaf.add_strong(&mut h.rsc);
-        let shared = Rc::new(held);
-        let first = SharedChild(shared.clone()).add_strong(&mut h.rsc);
-        let second = SharedChild(shared).add_strong(&mut h.rsc);
-        h.rsc.widgets_mut().set_region_node(&second, node);
-        let root = SwitchParent {
-            choices: [first, second],
-            choice: 0,
-        }
-        .add(&mut h.rsc);
-        h.set_root(root);
-        let before = h.region(&leaf);
-        h.rsc[root].choice = 1;
-        h.frame();
-        assert_eq!(h.region(&leaf), before);
-    }
-}

tests/cases/scroll.rs

@@ -60,69 +60,6 @@ fn a_wheel_scrolls_the_content_and_stops_at_its_end() {
     assert_corners!(h, top, (0, 0), (400, 200));
 }
 
-#[test]
-fn fixed_content_and_a_share_fill_one_viewport() {
-    let mut h = Harness::new((900, 100));
-    let content = rect(Color::RED)
-        .width(LayoutLen {
-            px: Px::from_int(600),
-            rel: Rel::ZERO,
-            leftover: Weight::ONE,
-        })
-        .add(&mut h.rsc);
-    let scroll = Scroll::new(content.add_strong(&mut h.rsc), Axis::X);
-    h.set_root(scroll);
-
-    assert_corners!(h, content, (0, 0), (900, 100));
-}
-
-#[test]
-fn fixed_content_wider_than_the_viewport_still_scrolls() {
-    let mut h = Harness::new((900, 100));
-    let content = rect(Color::RED).width(1200).add(&mut h.rsc);
-    let scroll = Scroll::new(content.add_strong(&mut h.rsc), Axis::X);
-    h.set_root(scroll);
-
-    assert_corners!(h, content, (-300, 0), (900, 100));
-}
-
-#[test]
-fn a_lone_share_fills_without_scrolling() {
-    let mut h = Harness::new((900, 100));
-    let content = rect(Color::RED).width(LayoutLen::LEFTOVER).add(&mut h.rsc);
-    let scroll = Scroll::new(content.add_strong(&mut h.rsc), Axis::X);
-    h.set_root(scroll);
-
-    assert_corners!(h, content, (0, 0), (900, 100));
-}
-
-#[test]
-fn wrapping_content_beside_a_fixed_length_is_stable_warm_and_cold() {
-    fn plant(h: &mut Harness) -> (WidgetId, WidgetId) {
-        let fixed = rect(Color::RED).width(600).add(&mut h.rsc);
-        let text = wtext("Wrapping shapes one source into as many lines as the box leaves room for, so a paragraph's height is an answer and not a setting.")
-            .size(16)
-            .wrap(true)
-            .width(LayoutLen::LEFTOVER)
-            .add(&mut h.rsc);
-        let content = (fixed, text).span(Dir::RIGHT).add(&mut h.rsc);
-        let scroll = Scroll::new(content.add_strong(&mut h.rsc), Axis::X);
-        h.set_root(scroll);
-        (text.id(), content.id())
-    }
-
-    let mut warm = Harness::new((900, 300));
-    let (text, content) = plant(&mut warm);
-    warm.rsc.widgets_mut().get_dyn_mut(text);
-    warm.frame();
-
-    let mut cold = Harness::new((900, 300));
-    let (cold_text, cold_content) = plant(&mut cold);
-
-    assert_eq!(warm.region(&text), cold.region(&cold_text));
-    assert_eq!(warm.region(&content), cold.region(&cold_content));
-}
-
 /// A widget that clips to its box may not report more than the box: its
 /// parent would place the part it cut off, and the framework would put a
 /// drawing longer than its box somewhere. `Masked` is the second of these
@@ -134,7 +71,7 @@ fn a_clipping_widget_reporting_more_than_its_box_is_caught() {
 
     impl Widget for Clipper {
         fn draw(&mut self, painter: &mut Painter) -> Size {
-            painter.set_mask(UiRegion::FULL);
+            painter.set_mask(painter.region());
             painter.widget(&self.0).size()
         }
     }
@@ -145,19 +82,3 @@ fn a_clipping_widget_reporting_more_than_its_box_is_caught() {
     h.set_root(clipper);
     h.frame();
 }
-
-/// Content that fits sits in the viewport, not in a box of the window's
-/// length anchored at the viewport's start. `Part::From` takes window
-/// lengths, so a `rel(1.0)` span in one is the window, and only a scroll
-/// filling the window would land right.
-#[test]
-fn content_that_fits_is_placed_in_the_viewport_and_not_in_the_window() {
-    let mut h = Harness::new((400, 400));
-    let head = rect(Color::RED).height(100).add(&mut h.rsc);
-    let inner = rect(Color::BLUE).height(50).add(&mut h.rsc);
-    let scroll = Scroll::new(inner.add_strong(&mut h.rsc), Axis::Y).add(&mut h.rsc);
-    h.set_root((head, scroll).span(Dir::DOWN));
-
-    assert_corners!(h, scroll, (0, 100), (400, 400));
-    assert_corners!(h, inner, (0, 225), (400, 275));
-}

tests/cases/unsettled.rs

@@ -14,180 +14,6 @@ use iris::harness::Harness;
 use iris::prelude::*;
 use iris::random::Branch;
 
-fn assert_same_regions(
-    warm: &Harness,
-    warm_ids: &[WidgetId],
-    cold: &Harness,
-    cold_ids: &[WidgetId],
-) {
-    let mut wrong = Vec::new();
-    for (i, (&w, &c)) in warm_ids.iter().zip(cold_ids).enumerate() {
-        let (got, want) = (warm.region(&w), cold.region(&c));
-        if got != want {
-            wrong.push(format!("widget {i}: warm {got:?} cold {want:?}"));
-        }
-    }
-    assert!(wrong.is_empty(), "{}", wrong.join("\n"));
-}
-
-/// Ten widgets, shrunk from seed 2 at depth 5. The stack is as tall as its
-/// first child, so its other children belong in that one-line box. A cold
-/// layout used to keep the span's answer from the larger measuring box while
-/// a repaint asked it in the stack's final box.
-fn plant_stack_in_its_sizing_childs_box(h: &mut Harness) -> Vec<WidgetId> {
-    let sizing = wtext("one line, overflowing whatever it is given")
-        .size(16)
-        .wrap(false)
-        .add(&mut h.rsc);
-    let filler = rect(Color::CYAN.alpha(252)).add(&mut h.rsc);
-    let plain = wtext("one line, overflowing whatever it is given")
-        .size(16)
-        .wrap(false)
-        .add(&mut h.rsc);
-    let span = (filler, plain).span(Dir::DOWN).add(&mut h.rsc);
-    let pad = Pad {
-        padding: Padding::ZERO,
-        inner: span.add_strong(&mut h.rsc),
-    }
-    .add(&mut h.rsc);
-    let probe = rect(Color::RED).add(&mut h.rsc);
-    let wide = rect(Color::YELLOW.alpha(252)).add(&mut h.rsc);
-    let narrow = rect(Color::RED).add(&mut h.rsc);
-    let branch = Branch {
-        probe: probe.add_strong(&mut h.rsc),
-        wide: wide.add_strong(&mut h.rsc),
-        narrow: narrow.add_strong(&mut h.rsc),
-        threshold: 55.0,
-    }
-    .add(&mut h.rsc);
-    let stack = Stack {
-        children: vec![
-            sizing.add_strong(&mut h.rsc),
-            pad.add_strong(&mut h.rsc),
-            branch.add_strong(&mut h.rsc),
-        ],
-        size: StackSize::Child(0),
-    }
-    .add(&mut h.rsc);
-    h.rsc
-        .widgets_mut()
-        .set_size_rules(stack.id(), Some(LayoutLen::LEFTOVER), None);
-    h.set_root(stack);
-    vec![
-        sizing.id(),
-        filler.id(),
-        plain.id(),
-        span.id(),
-        pad.id(),
-        probe.id(),
-        wide.id(),
-        narrow.id(),
-        branch.id(),
-        stack.id(),
-    ]
-}
-
-#[test]
-fn repainting_a_stack_uses_the_box_its_sizing_child_decided() {
-    let mut warm = Harness::new((900, 1200));
-    let ids = plant_stack_in_its_sizing_childs_box(&mut warm);
-    for &id in &ids {
-        warm.rsc.widgets_mut().get_dyn_mut(id);
-    }
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let cold_ids = plant_stack_in_its_sizing_childs_box(&mut cold);
-
-    assert_same_regions(&warm, &ids, &cold, &cold_ids);
-}
-
-/// Ten widgets, shrunk from seed 108 at depth 5. The nested reverse spans
-/// evaluate the branch in successively narrower boxes. The answer from the
-/// final, decided box must be the one retained after every span is reordered.
-fn plant_branch_in_nested_reverse_spans(
-    h: &mut Harness,
-    reordered: bool,
-) -> (Vec<WidgetId>, [WeakWidget<Span>; 3]) {
-    let pair = |first: StrongWidget, second: StrongWidget| match reordered {
-        true => vec![second, first],
-        false => vec![first, second],
-    };
-    let probe = rect(Color::RED.alpha(63)).add(&mut h.rsc);
-    let wide = rect(Color::RED).add(&mut h.rsc);
-    let narrow = wtext(PARAGRAPH).size(16).wrap(true).add(&mut h.rsc);
-    let branch = Branch {
-        probe: probe.add_strong(&mut h.rsc),
-        wide: wide.add_strong(&mut h.rsc),
-        narrow: narrow.add_strong(&mut h.rsc),
-        threshold: 483.0,
-    }
-    .add(&mut h.rsc);
-    let wrapped = wtext(PARAGRAPH).size(16).wrap(true).add(&mut h.rsc);
-    let down = Span {
-        children: pair(
-            branch.add_strong(&mut h.rsc),
-            wrapped.add_strong(&mut h.rsc),
-        ),
-        dir: Dir::DOWN,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    let inner_filler = rect(Color::CYAN.alpha(63)).add(&mut h.rsc);
-    let inner = Span {
-        children: pair(
-            down.add_strong(&mut h.rsc),
-            inner_filler.add_strong(&mut h.rsc),
-        ),
-        dir: Dir::LEFT,
-        gap: Px::ZERO,
-    }
-    .height(LayoutLen::rel(1.0))
-    .add(&mut h.rsc);
-    let outer_filler = rect(Color::GREEN.alpha(63)).add(&mut h.rsc);
-    let outer = Span {
-        children: pair(
-            inner.add_strong(&mut h.rsc),
-            outer_filler.add_strong(&mut h.rsc),
-        ),
-        dir: Dir::LEFT,
-        gap: Px::ZERO,
-    }
-    .height(LayoutLen::rel(1.0))
-    .add(&mut h.rsc);
-    h.set_root(outer);
-    (
-        vec![
-            probe.id(),
-            wide.id(),
-            narrow.id(),
-            branch.id(),
-            wrapped.id(),
-            down.id(),
-            inner_filler.id(),
-            inner.id(),
-            outer_filler.id(),
-            outer.id(),
-        ],
-        [down, inner, outer],
-    )
-}
-
-#[test]
-fn reordering_nested_spans_keeps_the_answer_from_the_decided_box() {
-    let mut warm = Harness::new((900, 1200));
-    let (ids, spans) = plant_branch_in_nested_reverse_spans(&mut warm, false);
-    for span in spans {
-        warm.rsc[span].children.rotate_left(1);
-    }
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let (cold_ids, _) = plant_branch_in_nested_reverse_spans(&mut cold, true);
-
-    assert_same_regions(&warm, &ids, &cold, &cold_ids);
-}
-
 /// Six widgets, shrunk from a 402-widget tree the fuzzer found. Nothing about
 /// the tree changes -- every widget is marked for redraw and the frame is
 /// taken again -- so no box may move, and a warm frame has to land where a
@@ -733,51 +559,6 @@ fn a_widget_under_a_region_node_is_asked_in_the_box_that_node_was_offered() {
 const PARAGRAPH: &str = "Wrapping shapes one source into as many lines as the \
     box leaves room for, so a paragraph's height is an answer and not a setting.";
 
-fn plant_stack_resized_from_free(h: &mut Harness, fixed: bool) -> (Vec<WidgetId>, WidgetId) {
-    let sizing = rect(Color::CYAN.alpha(126)).add(&mut h.rsc);
-    h.rsc.widgets_mut().set_size_rules(sizing.id(), None, None);
-    if fixed {
-        h.rsc.widgets_mut().set_size_rules(
-            sizing.id(),
-            Some(LayoutLen::px(112)),
-            Some(LayoutLen::px(101)),
-        );
-    }
-    let text = wtext(PARAGRAPH).size(16).wrap(true).add(&mut h.rsc);
-    let pad = Pad {
-        padding: Padding::ZERO,
-        inner: text.add_strong(&mut h.rsc),
-    }
-    .add(&mut h.rsc);
-    let stack = Stack {
-        children: vec![sizing.add_strong(&mut h.rsc), pad.add_strong(&mut h.rsc)],
-        size: StackSize::Child(0),
-    }
-    .add(&mut h.rsc);
-    h.set_root(stack);
-    (
-        vec![sizing.id(), text.id(), pad.id(), stack.id()],
-        sizing.id(),
-    )
-}
-
-#[test]
-fn fixing_a_stacks_sizing_child_repositions_its_overlay() {
-    let mut warm = Harness::new((900, 1200));
-    let (ids, sizing) = plant_stack_resized_from_free(&mut warm, false);
-    warm.frame();
-    warm.rsc.widgets_mut().set_size_rules(
-        sizing,
-        Some(LayoutLen::px(112)),
-        Some(LayoutLen::px(101)),
-    );
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let (cold_ids, _) = plant_stack_resized_from_free(&mut cold, true);
-    assert_same_regions(&warm, &ids, &cold, &cold_ids);
-}
-
 /// Eight widgets, shrunk from a 118-widget tree (seed 1121, depth 4,
 /// `shuffle-swap-for-three`). The stack takes its size from the span above,
 /// the span takes its width from the longest line of the texts in it, and
@@ -891,179 +672,3 @@ fn adding_text_to_a_reverse_row_keeps_its_shared_height() {
     let (_, other, _) = build(&mut cold, true);
     assert_eq!(warm.region(&shared), cold.region(&other));
 }
-
-/// Nine widgets, shrunk from seed 946 at depth 6. The column is a share of
-/// the row while its rect has room to draw and a fixed width once it has
-/// not, so the row asks it twice: in the room, where it answers a share,
-/// and in its slot, where it answers its text's width. Emptying the column
-/// changes only the first answer. A local redraw that asked only the second
-/// question kept the row as it was; the column has to defer to the row.
-fn plant_column_that_is_a_share_only_while_its_rect_fits(
-    h: &mut Harness,
-    emptied: bool,
-) -> (Vec<WidgetId>, WeakWidget<Span>, Vec<StrongWidget>) {
-    let first = wtext(PARAGRAPH).size(16).wrap(true).add(&mut h.rsc);
-    let filler = rect(Color::CYAN.alpha(126)).add(&mut h.rsc);
-    let second = wtext(PARAGRAPH).size(16).wrap(true).add(&mut h.rsc);
-    let mut spare: Vec<StrongWidget> =
-        vec![filler.add_strong(&mut h.rsc), second.add_strong(&mut h.rsc)];
-    let mut children: Vec<StrongWidget> = vec![first.add_strong(&mut h.rsc)];
-    if !emptied {
-        children.append(&mut spare);
-    }
-    let column = Span {
-        children,
-        dir: Dir::DOWN,
-        gap: Px::ZERO,
-    }
-    .height(159)
-    .add(&mut h.rsc);
-    let left = rect(Color::MAGENTA.alpha(189)).add(&mut h.rsc);
-    let right = rect(Color::BLUE.alpha(0)).add(&mut h.rsc);
-    let row = Span {
-        children: vec![
-            left.add_strong(&mut h.rsc),
-            column.add_strong(&mut h.rsc),
-            right.add_strong(&mut h.rsc),
-        ],
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    let end = rect(Color::MAGENTA.alpha(189)).add(&mut h.rsc);
-    let root = Span {
-        children: vec![end.add_strong(&mut h.rsc), row.add_strong(&mut h.rsc)],
-        dir: Dir::LEFT,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    h.set_root(root);
-    (
-        vec![
-            first.id(),
-            filler.id(),
-            second.id(),
-            column.id(),
-            left.id(),
-            right.id(),
-            row.id(),
-            end.id(),
-            root.id(),
-        ],
-        column,
-        spare,
-    )
-}
-
-#[test]
-fn emptying_a_column_the_row_asked_twice_asks_the_row_again() {
-    let mut warm = Harness::new((900, 1200));
-    let (ids, column, _spare) =
-        plant_column_that_is_a_share_only_while_its_rect_fits(&mut warm, false);
-    warm.frame();
-    // Kept alive: dropping the last share of a widget frees its id.
-    let _removed: Vec<StrongWidget> = warm.rsc[column].children.drain(1..).collect();
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let (cold_ids, _, _spare) =
-        plant_column_that_is_a_share_only_while_its_rect_fits(&mut cold, true);
-    cold.frame();
-
-    assert_same_regions(&warm, &ids, &cold, &cold_ids);
-}
-
-/// Six widgets, shrunk from seed 59 at depth 5 (`resize-size`). The column
-/// divides the box it is given between two shares, so its drawing holds for
-/// that box's length alone, and the pads above it pass that dependency up:
-/// each one's box is a part of the box it was asked in. Padding narrowing
-/// the frame it hands down does not change that, and while it was taken to,
-/// changing the rule over the pads relocated the column's drawing into the
-/// new box instead of dividing it again.
-fn plant_two_shares_under_two_pads(h: &mut Harness, height: f32) -> Vec<WidgetId> {
-    let top = rect(Color::CYAN.alpha(126)).add(&mut h.rsc);
-    let bottom = rect(Color::RED).add(&mut h.rsc);
-    let column = (top, bottom).span(Dir::DOWN).add(&mut h.rsc);
-    let inner = Pad {
-        padding: Padding::ZERO,
-        inner: column.add_strong(&mut h.rsc),
-    }
-    .add(&mut h.rsc);
-    let outer = Pad {
-        padding: Padding::ZERO,
-        inner: inner.add_strong(&mut h.rsc),
-    }
-    .height(height)
-    .add(&mut h.rsc);
-    let beside = rect(Color::BLUE).add(&mut h.rsc);
-    h.set_root((outer, beside).span(Dir::RIGHT));
-    vec![
-        top.id(),
-        bottom.id(),
-        column.id(),
-        inner.id(),
-        outer.id(),
-        beside.id(),
-    ]
-}
-
-#[test]
-fn changing_a_rule_over_two_pads_divides_the_column_again() {
-    let mut warm = Harness::new((900, 1200));
-    let ids = plant_two_shares_under_two_pads(&mut warm, 88.0);
-    warm.frame();
-    warm.rsc
-        .widgets_mut()
-        .set_size_rules(ids[4], None, Some(LayoutLen::px(105)));
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let cold_ids = plant_two_shares_under_two_pads(&mut cold, 105.0);
-    cold.frame();
-
-    assert_same_regions(&warm, &ids, &cold, &cold_ids);
-}
-
-/// Six widgets, shrunk from seed 942 at depth 6 (`resize`). A `Branch` asks
-/// its probe in the top 40 px of its box and forwards the frame, so the
-/// scroll's own box is 40 px tall whatever the window is -- but its content
-/// is as tall as the frame, which is the window, and a scroll kept to its
-/// end has to be told when that changes. Resolving a length against the
-/// window is what reads it, so that is where the dependency is taken.
-fn plant_a_window_tall_column_in_a_short_scroll(h: &mut Harness) -> Vec<WidgetId> {
-    let leaf = rect(Color::RED).add(&mut h.rsc);
-    let column = Span {
-        children: vec![leaf.add_strong(&mut h.rsc)],
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }
-    .height(rel(1.0))
-    .add(&mut h.rsc);
-    let scroll = Scroll::new(column.add_strong(&mut h.rsc), Axis::Y).add(&mut h.rsc);
-    let wide = rect(Color::BLUE).add(&mut h.rsc);
-    let narrow = rect(Color::GREEN).add(&mut h.rsc);
-    let root = Branch {
-        probe: scroll.add_strong(&mut h.rsc),
-        wide: wide.add_strong(&mut h.rsc),
-        narrow: narrow.add_strong(&mut h.rsc),
-        threshold: 55.0,
-    }
-    .add(&mut h.rsc);
-    h.set_root(root);
-    vec![leaf.id(), column.id(), scroll.id(), root.id()]
-}
-
-#[test]
-fn resizing_under_a_short_scroll_snaps_its_window_tall_content_again() {
-    let mut warm = Harness::new((1920, 1200));
-    let ids = plant_a_window_tall_column_in_a_short_scroll(&mut warm);
-    warm.frame();
-    warm.resize((640, 900));
-    warm.frame();
-
-    let mut cold = Harness::new((640, 900));
-    let cold_ids = plant_a_window_tall_column_in_a_short_scroll(&mut cold);
-    cold.frame();
-
-    assert_same_regions(&warm, &ids, &cold, &cold_ids);
-}

tests/generated.rs

@@ -14,7 +14,7 @@
 #[path = "scenario/mod.rs"]
 mod scenario;
 
-use iris::random::{Edits, Plan, plan};
+use iris::random::{Edits, plan};
 use scenario::{ALL, Case, diverges, env, over_seeds};
 
 /// How deep the generator branches. The generator widens two to four ways per
@@ -32,11 +32,8 @@ fn depth() -> usize {
 const SEEDS: [u64; 10] = [1, 2, 3, 5, 8, 10, 13, 20, 86, 98];
 
 fn check(seed: u64, depth: usize, case: Case) {
-    check_plan(&plan(seed, depth, &Edits::default()), seed, depth, case);
-}
-
-fn check_plan(grown: &Plan, seed: u64, depth: usize, case: Case) {
-    if let Some(how) = diverges(grown, case, seed) {
+    let grown = plan(seed, depth, &Edits::default());
+    if let Some(how) = diverges(&grown, case, seed) {
         panic!(
             "seed {seed} at depth {depth} differs after {}: {how}\n\
              reduce it with SHRINK_SEED={seed} SHRINK_DEPTH={depth} \
@@ -122,9 +119,8 @@ fn a_long_run_of_seeds_agrees() {
         None => (1..=env("IRIS_GENERATED_SEEDS", 100_u64)).collect(),
     };
     over_seeds(seeds, |seed| {
-        let grown = plan(seed, depth, &Edits::default());
         for case in ALL {
-            check_plan(&grown, seed, depth, case);
+            check(seed, depth, case);
         }
     });
 }

tests/layout_dump.rs

@@ -1,42 +0,0 @@
-//! Prints where a cold layout puts every widget of many grown trees, so two
-//! commits can be compared on cold layout alone. The warm/cold oracle cannot
-//! see a change that moves cold layout, since both of its sides move; this
-//! can, by diffing its output across the change:
-//!
-//!     IRIS_DUMP_SEEDS=400 IRIS_DUMP_DEPTH=5 cargo test --release \
-//!       --test layout_dump -- --ignored --nocapture > /tmp/before.txt
-//!
-//! then the same after, and `diff` the two. A line is one widget: the seed,
-//! its index in creation order, and its box in window pixels, or `-` where
-//! it is not drawn.
-
-use iris::harness::Harness;
-use iris::random::{Edits, grow};
-
-fn env<T: std::str::FromStr>(name: &str, fallback: T) -> T {
-    std::env::var(name)
-        .ok()
-        .and_then(|value| value.parse().ok())
-        .unwrap_or(fallback)
-}
-
-#[test]
-#[ignore = "a dump to diff across commits, not a check"]
-fn every_cold_layout_is_printed() {
-    let seeds = env("IRIS_DUMP_SEEDS", 400_u64);
-    let depth = env("IRIS_DUMP_DEPTH", 5_usize);
-    let mut out = String::new();
-    for seed in 1..=seeds {
-        let mut harness = Harness::new((1920.0, 1200.0));
-        let (root, tree) = grow(&mut harness.rsc, seed, depth, &Edits::default());
-        harness.state.root = Some(root);
-        harness.frame();
-        for (index, id) in tree.ids.iter().enumerate() {
-            match harness.region(id) {
-                Some(region) => out.push_str(&format!("{seed} {index} {region:?}\n")),
-                None => out.push_str(&format!("{seed} {index} -\n")),
-            }
-        }
-    }
-    print!("{out}");
-}

tests/scenario/mod.rs

@@ -103,11 +103,6 @@ pub enum Case {
     /// A resize and then a size change, so a retained answer is asked to
     /// survive two different kinds of invalidation in a row.
     ResizeSize,
-    /// A size change and then a resize, which is the other order and not the
-    /// same test: a length answered as a fraction of one box and kept as a
-    /// fraction of another agrees at the size it was changed at and parts
-    /// from it at every other one.
-    SizeResize,
     /// A few declared sizes.
     Size,
     /// Every declared size at once, so every reader of a size has a changed
@@ -124,13 +119,12 @@ pub enum Case {
     Shuffle(Shuffle),
 }
 
-pub const ALL: [Case; 16] = [
+pub const ALL: [Case; 15] = [
     Case::Repaint,
     Case::RepaintSome,
     Case::Resize,
     Case::ResizeRepaint,
     Case::ResizeSize,
-    Case::SizeResize,
     Case::Size,
     Case::EverySize,
     Case::Align,
@@ -152,7 +146,6 @@ impl Case {
             Self::Resize => "resize",
             Self::ResizeRepaint => "resize-repaint",
             Self::ResizeSize => "resize-size",
-            Self::SizeResize => "size-resize",
             Self::Size => "size",
             Self::EverySize => "every-size",
             Self::Align => "align",
@@ -177,15 +170,6 @@ impl Case {
             _ => (STILL, STILL),
         }
     }
-
-    /// The window the warm tree is taken to after the change, where the case
-    /// is about what the change left behind rather than about the change.
-    fn then_resize(self) -> Option<(f32, f32)> {
-        match self {
-            Self::SizeResize => Some(INNER),
-            _ => None,
-        }
-    }
 }
 
 fn mark(warm: &mut Harness, tree: &Tree, step: usize) {
@@ -300,7 +284,7 @@ fn change(case: Case, warm: &mut Harness, tree: &mut Tree, plan: &Plan, rng: &mu
             warm.frame();
             return out;
         }
-        Case::Size | Case::ResizeSize | Case::SizeResize => Edits {
+        Case::Size | Case::ResizeSize => Edits {
             sizes: some_sizes(warm, tree, rng),
             ..Default::default()
         },
@@ -400,17 +384,6 @@ fn describe_widget(id: WidgetId, h: &Harness) -> String {
     label
 }
 
-/// One widget's layout as it stands: the frame its fractions resolved
-/// against, the box it was asked in, the box its drawing went in, and what
-/// it reported. In window units, which is what both trees are in.
-fn record(id: WidgetId, h: &Harness) -> String {
-    let active = &h.render.active[&id];
-    format!(
-        "rel_base {} region {} placement {} size {}",
-        active.rel_base, active.region, active.placement, active.size,
-    )
-}
-
 /// Runs `case` on the tree `plan` describes, warm and cold, and says where
 /// the two disagree. `seed` chooses only the values a case picks at random,
 /// so one plan under one case is one comparison however it was reached.
@@ -427,17 +400,6 @@ pub fn diverges(plan: &Plan, case: Case, seed: u64) -> Option<String> {
         warm.frame();
     }
     let cold_plan = change(case, &mut warm, &mut tree, plan, &mut Rng::new(seed));
-    // Whatever the change left, seen at another window: an answer kept as a
-    // fraction of the wrong length is the same number of pixels where it was
-    // made and a different one everywhere else.
-    let end = match case.then_resize() {
-        Some(after) => {
-            warm.resize(after);
-            warm.frame();
-            after
-        }
-        None => end,
-    };
 
     let mut cold = Harness::new(end);
     let (root, cold_tree) = build(&mut cold.rsc, &cold_plan);
@@ -451,16 +413,9 @@ pub fn diverges(plan: &Plan, case: Case, seed: u64) -> Option<String> {
         if got == want {
             continue;
         }
-        let places: HashMap<WidgetId, usize> = tree
-            .ids
-            .iter()
-            .enumerate()
-            .map(|(i, &id)| (id, i))
-            .collect();
         // Where two trees disagree is rarely where the cause is, so the
         // ancestry comes with it, marking the widgets that own a region.
         let mut chain = Vec::new();
-        let mut records = Vec::new();
         let mut at = Some(w);
         while let Some(id) = at {
             let active = &warm.render.active[&id];
@@ -469,22 +424,11 @@ pub fn diverges(plan: &Plan, case: Case, seed: u64) -> Option<String> {
                 false => "*",
             };
             chain.push(format!("{}{node}", describe(id, &warm)));
-            // What each level was asked in on both sides, since the level
-            // where the two stop agreeing is the one to look at rather than
-            // the leaf that reported the difference.
-            let cold_id = places.get(&id).and_then(|&i| cold_tree.ids.get(i));
-            records.push(format!(
-                "    {}\n      warm {}\n      cold {}",
-                describe(id, &warm),
-                record(id, &warm),
-                cold_id.map_or("-".into(), |&id| record(id, &cold)),
-            ));
             at = active.parent;
         }
         return Some(format!(
-            "widget {i}\n  warm {got:?}\n  cold {want:?}\n  {}\n{}",
-            chain.join(" < "),
-            records.join("\n"),
+            "widget {i}\n  warm {got:?}\n  cold {want:?}\n  {}",
+            chain.join(" < ")
         ));
     }
     match drawn {

tests/shrink.rs

@@ -70,14 +70,10 @@ fn no_grown_tree_lays_out_differently_warm_than_cold() {
     over_seeds(seeds, |seed| {
         let grown = plan(seed, depth, &Edits::default());
         for &case in &cases {
-            if diverges(&grown, case, seed).is_none() {
+            let Some(how) = diverges(&grown, case, seed) else {
                 continue;
-            }
+            };
             let small = shrink(grown.clone(), case, seed);
-            // Described from the shrunk tree: the grown tree's chain names
-            // widgets that are no longer there, and the ancestry of the
-            // failure is what a test is written from.
-            let how = diverges(&small, case, seed).unwrap_or_default();
             println!(
                 "seed {seed} case {}: {how}\ngrown {} widgets, shrank to {}\n{small:#?}",
                 case.name(),