Merge remote-tracking branch 'upstream/main' into split/17-headless-rig

The comments described the machine the rig was written on -- "this
machine has no display", "there is a real GPU here", an Android
emulator's GLX quirk -- which says nothing to anyone reading it from a
different checkout. What the reader needs is what the script supplies
and why, which is now all they get.

`sway`, `swaymsg` and, when `--shot` is passed, `grim` are checked up
front and named in the failure, rather than surfacing as a compositor
that would not start.

The `# shellcheck disable=SC2086 -- prose` directive did not parse, so
the suppression was not in effect; the prose moves to its own line.
Clean under shellcheck now.

Cargo.toml

@@ -3,9 +3,6 @@ name = "iris"
 version.workspace = true
 edition.workspace = true
 
-[features]
-layout-diagnostics = ["iris-core/layout-diagnostics"]
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
@@ -25,18 +22,6 @@ tokio = { workspace = true, features = ["sync", "rt", "rt-multi-thread", "time"]
 [workspace]
 members = ["core", "macro", "rig-input"]
 
-# Full debug info was the bulk of what the linker wrote here and almost none of
-# what anything read. `dev` keeps line tables and scopes, which is what stepping
-# through an example wants; the tests keep the line tables alone, which is what
-# a backtrace reads. Measured when the tests became one target: relinking them
-# went from 9.8 s to 7.7 s with these, and target/ from 45 GB to 13 GB with the
-# two changes together.
-[profile.dev]
-debug = 1
-
-[profile.test]
-debug = "line-tables-only"
-
 [workspace.package]
 version = "0.1.0"
 edition = "2024"

TODO

@@ -14,27 +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
-
-a prepare stage on Event, so Data has no placeholder field
-    run_sensors builds one CursorData per widget and has to put something in
-    `sense` before anything knows which sense matched, so it writes
-    CursorSense::Hovering and says in place that it means nothing;
-    should_run then clones the whole thing to overwrite that one field
-    the state is representable only because the type lets the caller say it:
-    what the caller supplies and what matching adds are two different things
-    wearing one struct
-    the awkward part is doing it without the generics getting annoying --
-    Data<'a> is already a GAT with a default, and splitting it in two adds
-    another associated type to every Event impl for the sake of one field
-    (Bryan, 2026-09-20; low priority, he wants a good answer rather than a
-    quick one)

core/Cargo.toml

@@ -3,9 +3,6 @@ name = "iris-core"
 version.workspace = true
 edition.workspace = true
 
-[features]
-layout-diagnostics = []
-
 [dependencies]
 wgpu = { workspace = true }
 bytemuck ={ workspace = true }

core/src/fixed.rs

@@ -1,547 +0,0 @@
-use crate::{UiNum, util::Vec2};
-use std::{
-    fmt::{Debug, Display, Formatter},
-    ops::{Add, AddAssign, Div, Mul, Neg, Sub, SubAssign},
-};
-
-/// A number held as a whole count of `1 / 2^SHIFT`.
-///
-/// Layout reaches one place by more than one route -- a box composed down the
-/// chain, and the same box summed from what its children asked for -- and has
-/// to decide whether the two are the same place. In floats they land a few
-/// bits apart, which is a defect wherever the answer changes what is drawn
-/// rather than where. Here adding and subtracting are exact, a multiply
-/// drops to the step below, and a conversion between grids takes the nearest
-/// one, so two routes to one place land on one number and everything
-/// downstream compares for equality instead of for nearness.
-///
-/// `SHIFT` is the number of fractional bits, which is what makes the steps
-/// divide a whole number: a power of two also converts to `f32` without
-/// rounding while the value fits in its mantissa.
-///
-/// Arithmetic wraps at the ends of the range, the way the `i32` underneath
-/// does. Saturating instead was measured at a twelfth of layout's
-/// instructions -- five per add against one -- to keep the ordering of
-/// coordinates two million pixels out, where nothing draws anyway. A value
-/// off the end is a defect either way; wrapping makes it an obvious one.
-/// Only [`Self::from_f32`] clamps, since a float has further to come from.
-#[repr(transparent)]
-#[derive(
-    Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Default, bytemuck::Pod, bytemuck::Zeroable,
-)]
-pub struct Fixed<const SHIFT: u32>(i32);
-
-/// A length or a coordinate in pixels, in steps of `1/1024`. Finer than
-/// anything a display can show, and exact in `f32` up to 16,384 px, which is
-/// what lets the same number reach the GPU.
-pub type Px = Fixed<PX_SHIFT>;
-
-/// How many bits of a pixel a [`Px`] keeps. One place, because [`PxVec2`]
-/// and the shader's own decoding are the same grid or nothing lines up.
-pub const PX_SHIFT: u32 = 10;
-
-/// A share of what a box has left over, which is a weight beside its
-/// siblings rather than a fraction of anything: a list divides its room by
-/// the total of these, so the range has to hold a whole list's worth and the
-/// precision only has to tell two weights apart.
-pub type Weight = Fixed<16>;
-
-/// A fraction of a box. Twenty-four bits of it, which matches `f32` around a
-/// half and beats it above one -- where anchors actually sit -- and leaves
-/// +/-128 of range, enough to sum a hundred children each asking for a whole
-/// box. A `leftover` weight is not one of these: it is a share of what is
-/// left rather than a fraction of anything, and it sums over a whole list.
-pub type Rel = Fixed<REL_SHIFT>;
-
-/// How many bits of a box a [`Rel`] keeps, beside [`PX_SHIFT`] and for the
-/// same reason.
-pub const REL_SHIFT: u32 = 24;
-
-impl<const SHIFT: u32> Fixed<SHIFT> {
-    pub const ZERO: Self = Self(0);
-    pub const ONE: Self = Self::one();
-    /// The gap between neighbouring values, which is also how far apart two
-    /// numbers can be and still mean the same place.
-    pub const STEP: Self = Self(1);
-    /// Also what stands in for an unbounded end: compared against, never
-    /// added to, since arithmetic wraps past it.
-    pub const MIN: Self = Self(i32::MIN);
-    pub const MAX: Self = Self(i32::MAX);
-
-    const fn one() -> Self {
-        assert!(SHIFT < 31, "a Fixed needs a bit for the whole part");
-        Self(1 << SHIFT)
-    }
-
-    pub const fn from_raw(raw: i32) -> Self {
-        Self(raw)
-    }
-
-    /// The count of steps, for a caller that needs the representation rather
-    /// than the number.
-    pub const fn raw(self) -> i32 {
-        self.0
-    }
-
-    pub const fn from_int(v: i32) -> Self {
-        Self(v.wrapping_mul(Self::one().0))
-    }
-
-    /// Rounds to the nearest step, and clamps to the ends of the grid rather
-    /// than wrapping: this is where a number from outside arrives, and a float
-    /// has the range to be anywhere. A NaN has no nearest step and becomes
-    /// zero, which is a caller's mistake rather than a value worth carrying.
-    ///
-    /// Half-away is written out rather than called through `f32::round`,
-    /// which is not `const`: a layout constant has to stay a constant.
-    pub const fn from_f32(v: f32) -> Self {
-        debug_assert!(!v.is_nan(), "a NaN has no place on the grid");
-        let scaled = v * Self::one().0 as f32;
-        // Above 2^23 an `f32` has no fractional part left to round, and
-        // adding a half there rounds the number itself up instead. The cast
-        // saturates at both ends and sends NaN to zero, which is the
-        // behaviour wanted at both.
-        const WHOLE: f32 = (1 << 23) as f32;
-        Self(match (scaled >= WHOLE, scaled <= -WHOLE, scaled < 0.0) {
-            (true, _, _) | (_, true, _) => scaled as i32,
-            (_, _, true) => (scaled - 0.5) as i32,
-            _ => (scaled + 0.5) as i32,
-        })
-    }
-
-    /// The first step at or above `v`, where [`Self::from_f32`] takes the
-    /// nearest one and is below it half the time. For a bound that has to
-    /// admit the value it came from: a measurement rounded down is a bound
-    /// that leaves out the thing it was measured from.
-    pub const fn ceil_from_f32(v: f32) -> Self {
-        let nearest = Self::from_f32(v);
-        match nearest.to_f32() < v {
-            true => nearest.next_up(),
-            false => nearest,
-        }
-    }
-
-    /// From a number as it is written in source -- `16`, `1.5` -- which is
-    /// the other place a value enters the grid.
-    pub fn from_num(v: impl UiNum) -> Self {
-        Self::from_f32(v.to_f32())
-    }
-
-    pub const fn to_f32(self) -> f32 {
-        self.0 as f32 / Self::one().0 as f32
-    }
-
-    pub const fn add(self, rhs: Self) -> Self {
-        Self(self.0.wrapping_add(rhs.0))
-    }
-
-    pub const fn sub(self, rhs: Self) -> Self {
-        Self(self.0.wrapping_sub(rhs.0))
-    }
-
-    pub const fn neg(self) -> Self {
-        Self(self.0.wrapping_neg())
-    }
-
-    /// Scaled by a number on any grid, which is how a length takes a fraction
-    /// of itself and keeps being a length: the product is measured in the
-    /// receiver's steps.
-    ///
-    /// Dropped to the step below rather than taken to the nearest one
-    /// (Bryan, 2026-09-16), which costs a share a thousandth of a pixel of
-    /// its row -- less than an even number of pixels draws. Toward negative
-    /// infinity on both sides of zero, since that is a shift and nothing
-    /// else: a value and its negation therefore land different distances
-    /// from where they came, so a flipped span can sit a step from its
-    /// mirror image.
-    pub const fn mul<const BY: u32>(self, by: Fixed<BY>) -> Self {
-        Self(((self.0 as i64 * by.0 as i64) >> BY) as i32)
-    }
-
-    /// Repeated a whole number of times, which no grid rounds.
-    pub const fn mul_int(self, by: i32) -> Self {
-        Self(self.0.wrapping_mul(by))
-    }
-
-    /// Divided into a whole number of parts, rounded to the nearest step.
-    pub const fn div_int(self, by: i32) -> Self {
-        debug_assert!(by != 0, "no part of nothing");
-        if by == 0 {
-            return Self::ZERO;
-        }
-        Self(div_round(self.0 as i64, by as i64) as i32)
-    }
-
-    /// Divided by a number on any grid. A zero divisor is a caller bug -- a
-    /// box of no length has no fraction of itself -- and answers with the end
-    /// of the range so that a release build lays out something absurd rather
-    /// than dying.
-    pub const fn div<const BY: u32>(self, by: Fixed<BY>) -> Self {
-        debug_assert!(by.0 != 0, "dividing by a length of zero");
-        if by.0 == 0 {
-            return match self.0 < 0 {
-                true => Self::MIN,
-                false => Self::MAX,
-            };
-        }
-        Self(div_round((self.0 as i64) << BY, by.0 as i64) as i32)
-    }
-
-    /// `num / den` on *this* grid rather than on theirs, for weights coarser
-    /// than the share they divide.
-    pub const fn ratio<const OF: u32>(num: Fixed<OF>, den: Fixed<OF>) -> Self {
-        debug_assert!(den.0 != 0, "no part of a whole of nothing");
-        if den.0 == 0 {
-            return Self::ZERO;
-        }
-        Self(div_round((num.0 as i64) << SHIFT, den.0 as i64) as i32)
-    }
-
-    /// `from` and `to` a fraction of the way apart, the fraction being the
-    /// receiver -- the argument order [`crate::util::LerpUtil`] already uses.
-    pub const fn lerp<const OF: u32>(self, from: Fixed<OF>, to: Fixed<OF>) -> Fixed<OF> {
-        from.add(to.sub(from).mul(self))
-    }
-
-    pub const fn min(self, other: Self) -> Self {
-        match self.0 < other.0 {
-            true => self,
-            false => other,
-        }
-    }
-
-    pub const fn max(self, other: Self) -> Self {
-        match self.0 > other.0 {
-            true => self,
-            false => other,
-        }
-    }
-
-    pub const fn abs(self) -> Self {
-        Self(self.0.wrapping_abs())
-    }
-
-    pub const fn clamp(self, lo: Self, hi: Self) -> Self {
-        debug_assert!(lo.0 <= hi.0, "an empty clamp has no answer");
-        self.max(lo).min(hi)
-    }
-
-    /// The next value along, for an interval that must not admit its own
-    /// boundary. The step is the whole gap, so there is nothing to exclude
-    /// between this and the boundary itself.
-    pub const fn next_up(self) -> Self {
-        Self(self.0.wrapping_add(1))
-    }
-
-    pub const fn next_down(self) -> Self {
-        Self(self.0.wrapping_sub(1))
-    }
-}
-
-const fn div_round(num: i64, den: i64) -> i64 {
-    let (q, rem) = (num / den, num % den);
-    match rem.unsigned_abs() * 2 >= den.unsigned_abs() {
-        true => match (num < 0) == (den < 0) {
-            true => q + 1,
-            false => q - 1,
-        },
-        false => q,
-    }
-}
-
-/// Toward positive infinity when `up`, toward negative infinity otherwise.
-pub(crate) const fn div_toward(num: i64, den: i64, up: bool) -> i64 {
-    let (q, rem) = (num / den, num % den);
-    if rem == 0 {
-        return q;
-    }
-    match (rem < 0) == (den < 0) {
-        true => q + up as i64,
-        false => q - !up as i64,
-    }
-}
-
-/// Clamped to the ends, unlike a [`Fixed`]'s own arithmetic: a range of box
-/// lengths that runs past `i32` really is unbounded.
-pub(crate) const fn narrow(v: i64) -> i32 {
-    if v > i32::MAX as i64 {
-        return i32::MAX;
-    }
-    if v < i32::MIN as i64 {
-        return i32::MIN;
-    }
-    v as i32
-}
-
-const impl<const SHIFT: u32> Add for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self {
-        Fixed::add(self, rhs)
-    }
-}
-
-const impl<const SHIFT: u32> Sub for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn sub(self, rhs: Self) -> Self {
-        Fixed::sub(self, rhs)
-    }
-}
-
-const impl<const SHIFT: u32> Neg for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn neg(self) -> Self {
-        Fixed::neg(self)
-    }
-}
-
-const impl<const SHIFT: u32> AddAssign for Fixed<SHIFT> {
-    fn add_assign(&mut self, rhs: Self) {
-        *self = Fixed::add(*self, rhs);
-    }
-}
-
-const impl<const SHIFT: u32> SubAssign for Fixed<SHIFT> {
-    fn sub_assign(&mut self, rhs: Self) {
-        *self = Fixed::sub(*self, rhs);
-    }
-}
-
-const impl<const SHIFT: u32, const BY: u32> Mul<Fixed<BY>> for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn mul(self, rhs: Fixed<BY>) -> Self {
-        Fixed::mul(self, rhs)
-    }
-}
-
-const impl<const SHIFT: u32, const BY: u32> Div<Fixed<BY>> for Fixed<SHIFT> {
-    type Output = Self;
-
-    fn div(self, rhs: Fixed<BY>) -> Self {
-        Fixed::div(self, rhs)
-    }
-}
-
-impl<const SHIFT: u32> Display for Fixed<SHIFT> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        Display::fmt(&self.to_f32(), f)
-    }
-}
-
-/// Prints the number rather than the count of steps: a failing layout test
-/// reports boxes, and `1126` is not a height anybody can read.
-impl<const SHIFT: u32> Debug for Fixed<SHIFT> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        Display::fmt(&self.to_f32(), f)
-    }
-}
-
-/// Two of them, for the places a size or a position needs both axes: a
-/// window, a box in pixels, a pointer. Held apart from [`crate::util::Vec2`]
-/// because that one is what the GPU and the platform speak.
-#[repr(C)]
-#[derive(Clone, Copy, PartialEq, Eq, Hash, Default)]
-pub struct FixedVec2<const SHIFT: u32> {
-    pub x: Fixed<SHIFT>,
-    pub y: Fixed<SHIFT>,
-}
-
-pub type PxVec2 = FixedVec2<PX_SHIFT>;
-
-impl<const SHIFT: u32> FixedVec2<SHIFT> {
-    pub const ZERO: Self = Self::splat(Fixed::ZERO);
-
-    pub const fn new(x: Fixed<SHIFT>, y: Fixed<SHIFT>) -> Self {
-        Self { x, y }
-    }
-
-    pub const fn splat(v: Fixed<SHIFT>) -> Self {
-        Self { x: v, y: v }
-    }
-
-    pub fn from_f32(v: Vec2) -> Self {
-        Self::new(Fixed::from_f32(v.x), Fixed::from_f32(v.y))
-    }
-
-    /// The first step at or above each part, for a measurement reported as a
-    /// box: what it occupies is not less than what was measured.
-    pub fn ceil_from_f32(v: Vec2) -> Self {
-        Self::new(Fixed::ceil_from_f32(v.x), Fixed::ceil_from_f32(v.y))
-    }
-
-    pub fn to_f32(self) -> Vec2 {
-        Vec2::new(self.x.to_f32(), self.y.to_f32())
-    }
-
-    pub const fn div_int(self, by: i32) -> Self {
-        Self::new(self.x.div_int(by), self.y.div_int(by))
-    }
-
-    pub const fn min(self, other: Self) -> Self {
-        Self::new(self.x.min(other.x), self.y.min(other.y))
-    }
-
-    pub const fn max(self, other: Self) -> Self {
-        Self::new(self.x.max(other.x), self.y.max(other.y))
-    }
-}
-
-// `impl_op!` names one concrete type, and this one is generic.
-const impl<const SHIFT: u32> Add for FixedVec2<SHIFT> {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self {
-        Self::new(self.x.add(rhs.x), self.y.add(rhs.y))
-    }
-}
-
-const impl<const SHIFT: u32> Sub for FixedVec2<SHIFT> {
-    type Output = Self;
-
-    fn sub(self, rhs: Self) -> Self {
-        Self::new(self.x.sub(rhs.x), self.y.sub(rhs.y))
-    }
-}
-
-const impl<const SHIFT: u32> AddAssign for FixedVec2<SHIFT> {
-    fn add_assign(&mut self, rhs: Self) {
-        *self = Add::add(*self, rhs);
-    }
-}
-
-const impl<const SHIFT: u32> SubAssign for FixedVec2<SHIFT> {
-    fn sub_assign(&mut self, rhs: Self) {
-        *self = Sub::sub(*self, rhs);
-    }
-}
-
-impl<const SHIFT: u32> Debug for FixedVec2<SHIFT> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "({}, {})", self.x, self.y)
-    }
-}
-
-impl<const SHIFT: u32> Display for FixedVec2<SHIFT> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "({}, {})", self.x, self.y)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn a_sum_of_steps_does_not_drift() {
-        let mut at = Px::ZERO;
-        for _ in 0..20_000 {
-            at += Px::from_raw(3);
-        }
-        assert_eq!(at, Px::from_raw(60_000));
-        for _ in 0..20_000 {
-            at -= Px::from_raw(3);
-        }
-        assert_eq!(at, Px::ZERO);
-    }
-
-    #[test]
-    fn a_pixel_survives_the_trip_through_f32() {
-        for raw in [0, 1, -1, 64, -1000, 16_777_215, -16_777_215] {
-            let px = Px::from_raw(raw);
-            assert_eq!(Px::from_f32(px.to_f32()), px);
-        }
-    }
-
-    #[test]
-    fn a_fraction_of_a_length_is_a_length() {
-        let half = Px::from_int(100) * Rel::from_f32(0.5);
-        assert_eq!(half, Px::from_int(50));
-        assert_eq!(Px::from_int(100) * Rel::ONE, Px::from_int(100));
-        assert_eq!(Px::from_int(100) * Rel::ZERO, Px::ZERO);
-    }
-
-    /// Toward negative infinity on both sides of zero, which is what makes
-    /// it a shift rather than a shift and a sign branch -- and what makes a
-    /// value and its negation land different distances from where they came,
-    /// so a flipped span can sit a step from its mirror image.
-    #[test]
-    fn a_multiply_drops_to_the_step_below_on_both_sides_of_zero() {
-        // A step and a half of one, which has no step of its own.
-        let step_and_a_half = Rel::from_f32(1.5).div_int(Px::ONE.raw());
-        assert_eq!(Px::ONE * step_and_a_half, Px::from_raw(1));
-        assert_eq!(Px::ONE.neg() * step_and_a_half, Px::from_raw(-2));
-    }
-
-    /// A division rounds to the nearest step, so it cannot put back the
-    /// steps a truncating multiply dropped: a round trip comes back short,
-    /// never long, and by the few steps the two operations gave up.
-    #[test]
-    fn dividing_by_a_fraction_cannot_undo_a_truncating_multiply() {
-        let third = Rel::ONE / Rel::from_int(3);
-        let len = Px::from_int(300);
-        let back = len * third / third;
-        assert!(back <= len, "{back:?} is longer than {len:?}");
-        assert!(len - back <= Px::from_raw(3), "{back:?} against {len:?}");
-        assert_eq!(Px::from_int(100) / Rel::from_f32(0.5), Px::from_int(200));
-    }
-
-    /// The bound a greedy line break needs: the width it was measured at is
-    /// not on the grid, and the narrowest box the break still holds for is
-    /// the step at or above it, never the one below.
-    #[test]
-    fn a_ceiling_never_lands_below_the_number_it_came_from() {
-        let step = 1.0 / (1 << PX_SHIFT) as f32;
-        for n in 0..64 {
-            let v = 189.0 + n as f32 * step / 3.0;
-            let up = Px::ceil_from_f32(v);
-            assert!(up.to_f32() >= v, "{up:?} is below {v}");
-            assert!(
-                up.to_f32() - v < step,
-                "{up:?} is more than a step above {v}"
-            );
-        }
-        // An exact step is its own ceiling.
-        assert_eq!(Px::ceil_from_f32(189.5), Px::from_f32(189.5));
-    }
-
-    #[test]
-    fn a_number_from_outside_is_clamped_to_the_grid() {
-        assert_eq!(Px::from_f32(1e12), Px::MAX);
-        assert_eq!(Px::from_f32(-1e12), Px::MIN);
-    }
-
-    #[test]
-    fn lerp_takes_the_fraction_as_the_receiver() {
-        let (from, to) = (Px::from_int(10), Px::from_int(20));
-        assert_eq!(Rel::ZERO.lerp(from, to), from);
-        assert_eq!(Rel::ONE.lerp(from, to), to);
-        assert_eq!(Rel::from_f32(0.5).lerp(from, to), Px::from_int(15));
-        assert_eq!(Rel::from_f32(0.5).lerp(to, from), Px::from_int(15));
-    }
-
-    #[test]
-    fn a_ratio_is_finer_than_the_weights_it_divides() {
-        let (one, three) = (Weight::ONE, Weight::from_int(3));
-        // A third, which the weights' own grid could only hold to 1/65536.
-        assert_eq!(Rel::ratio(one, three), Rel::from_raw(5592405));
-        assert_eq!(Rel::ratio(three, three), Rel::ONE);
-        assert_eq!(Rel::ratio(Weight::ZERO, three), Rel::ZERO);
-    }
-
-    #[test]
-    fn nothing_sits_between_a_value_and_the_next_one() {
-        let at = Px::from_int(3);
-        assert_eq!(at.next_up().next_down(), at);
-        assert_eq!(at.next_up().raw() - at.raw(), 1);
-        assert!(at.next_down() < at && at < at.next_up());
-    }
-
-    #[test]
-    fn it_prints_the_number_rather_than_the_steps() {
-        assert_eq!(format!("{:?}", Px::from_f32(17.59375)), "17.59375");
-        assert_eq!(format!("{}", Px::from_int(-2)), "-2");
-    }
-}

core/src/layout_diagnostics.rs

@@ -1,493 +0,0 @@
-//! Opt-in counters and coarse timers for explaining CPU layout cost.
-//!
-//! Enable the `layout-diagnostics` feature. With it disabled, none of the
-//! instrumentation is compiled into Iris. The retained rig in
-//! `tests/layout_diagnostics.rs` is the ordinary entry point.
-//!
-//! Timers are inclusive: `update total` contains `full layout` or
-//! `incremental layout`, and `text render` contains shaping and glyph
-//! placement. They locate cost within one instrumented run and must not be
-//! added together. Use an uninstrumented build under `perf` for final CPU
-//! totals; counting every primitive and distinct widget deliberately perturbs
-//! the instrumented run.
-//!
-//! Call [`trace_widget`] before a frame to retain the ordered constraint,
-//! reuse, size, placement, and text events for one suspicious widget. The
-//! selection is a set and survives [`take`] until cleared.
-
-use crate::{Axis, LayoutHolds, LayoutLen, PxVec2, Size, UiRegion, UiVec2, WidgetId};
-use std::{
-    cell::RefCell,
-    collections::{HashMap, HashSet},
-    fmt::Write,
-    time::Instant,
-};
-
-/// Declares a counter or timer kind beside the name its report prints. Two
-/// lists in the same order was one list too many: a variant inserted without
-/// its label moving with it renames every total after it, and nothing says
-/// so.
-macro_rules! labelled {
-    ($(#[$meta:meta])* $vis:vis enum $Name:ident { $($variant:ident = $label:literal,)* }) => {
-        $(#[$meta])*
-        #[derive(Clone, Copy)]
-        $vis enum $Name { $($variant,)* }
-
-        impl $Name {
-            const COUNT: usize = [$($label,)*].len();
-            const NAMES: [&'static str; Self::COUNT] = [$($label,)*];
-        }
-    };
-}
-
-labelled! {
-    pub(crate) enum Counter {
-        Updates = "updates",
-        DrawRequests = "draw requests",
-        WidgetDraws = "widget draws",
-        RegionNodeDraws = "region-node draws",
-        SizeReads = "draw-result size reads",
-        HintHits = "hint hits",
-        HintMisses = "hint misses",
-        ReuseAttempts = "reuse attempts",
-        ReuseExact = "reuse exact",
-        ReuseMoved = "reuse moved",
-        ReuseDirty = "reuse: dirty",
-        ReuseUndrawn = "reuse: nothing drawn to keep",
-        ReuseWrongParent = "reuse: wrong parent",
-        ReuseRemapped = "reuse remapped",
-        ReuseOutside = "reuse: outside what it holds for",
-        ReuseWrongLayer = "reuse: another layer",
-        ReuseWrongNode = "reuse: region-node choice changed",
-        ReuseWrongMask = "reuse: a different inherited mask",
-        QueuePops = "redraw queue pops",
-        DepthReads = "depth reads",
-        LocalRedraws = "local redraws",
-        SizeChanges = "size changes",
-        ReaderEdges = "reader edges",
-        PrimitiveWrites = "primitive writes",
-        TextRenders = "text renders",
-        TextShapeHits = "text shape hits",
-        TextShapes = "text shapes",
-        TextBreaks = "text line breaks",
-        GlyphPlacements = "glyph placements",
-        OutsidePinnedLen = "reuse outside: the length it was pinned to",
-        OutsideWindow = "reuse outside: this window",
-        OutsideRelBase = "reuse outside: a rel base",
-        OutsideRegion = "reuse outside: a region length",
-    }
-}
-
-labelled! {
-    pub(crate) enum TimerKind {
-        Update = "update total",
-        FullLayout = "full layout",
-        IncrementalLayout = "incremental layout",
-        TextRender = "text render",
-        TextShape = "text shape",
-        TextBreak = "text line break",
-        GlyphPlacement = "glyph placement",
-    }
-}
-
-#[derive(Clone)]
-pub struct Report {
-    counters: [u64; Counter::COUNT],
-    nanos: [u64; TimerKind::COUNT],
-    distinct_widgets: usize,
-    distinct_text_widgets: usize,
-    hot_widgets: Vec<Callsite>,
-    hot_text: Vec<Callsite>,
-    traces: Vec<TraceEvent>,
-}
-
-impl Default for Report {
-    fn default() -> Self {
-        Self {
-            counters: [0; Counter::COUNT],
-            nanos: [0; TimerKind::COUNT],
-            distinct_widgets: 0,
-            distinct_text_widgets: 0,
-            hot_widgets: Vec::new(),
-            hot_text: Vec::new(),
-            traces: Vec::new(),
-        }
-    }
-}
-
-impl Report {
-    pub fn counters(&self) -> impl Iterator<Item = (&'static str, u64)> + '_ {
-        Counter::NAMES.into_iter().zip(self.counters)
-    }
-
-    /// Inclusive elapsed time accumulated for each targeted operation.
-    pub fn timings_ns(&self) -> impl Iterator<Item = (&'static str, u64)> + '_ {
-        TimerKind::NAMES.into_iter().zip(self.nanos)
-    }
-
-    pub fn distinct_widgets(&self) -> usize {
-        self.distinct_widgets
-    }
-
-    pub fn distinct_text_widgets(&self) -> usize {
-        self.distinct_text_widgets
-    }
-
-    pub fn hot_widgets(&self) -> &[Callsite] {
-        &self.hot_widgets
-    }
-
-    pub fn hot_text(&self) -> &[Callsite] {
-        &self.hot_text
-    }
-
-    /// Ordered layout events for widgets selected with [`trace_widget`].
-    pub fn traces(&self) -> &[TraceEvent] {
-        &self.traces
-    }
-
-    /// Formats nonzero totals divided by `frames`.
-    pub fn per_frame(&self, frames: usize) -> String {
-        let divisor = frames.max(1) as f64;
-        let mut out = String::new();
-        for (name, value) in self.counters() {
-            if value != 0 {
-                let _ = writeln!(out, "  {name:<27} {:>12.2}", value as f64 / divisor);
-            }
-        }
-        if self.distinct_widgets != 0 {
-            let _ = writeln!(
-                out,
-                "  {:<27} {:>12}",
-                "distinct widgets", self.distinct_widgets
-            );
-        }
-        if self.distinct_text_widgets != 0 {
-            let _ = writeln!(
-                out,
-                "  {:<27} {:>12}",
-                "distinct text widgets", self.distinct_text_widgets
-            );
-        }
-        for (name, nanos) in self.timings_ns() {
-            if nanos != 0 {
-                let ms = nanos as f64 / divisor / 1_000_000.0;
-                let _ = writeln!(out, "  {name:<27} {ms:>12.3} ms");
-            }
-        }
-        if !self.hot_widgets.is_empty() {
-            let _ = writeln!(out, "  hottest widget draws:");
-            for callsite in &self.hot_widgets {
-                let calls = callsite.calls as f64 / divisor;
-                let _ = writeln!(
-                    out,
-                    "    {calls:>9.2}  {:?} {}",
-                    callsite.id, callsite.label
-                );
-            }
-        }
-        if !self.hot_text.is_empty() {
-            let _ = writeln!(out, "  hottest text renders:");
-            for callsite in &self.hot_text {
-                let calls = callsite.calls as f64 / divisor;
-                let _ = writeln!(
-                    out,
-                    "    {calls:>9.2}  {:>3} widths  {:?} {}",
-                    callsite.distinct_widths, callsite.id, callsite.label
-                );
-            }
-        }
-        if !self.traces.is_empty() {
-            let _ = writeln!(out, "  targeted layout trace:");
-            for event in &self.traces {
-                let _ = writeln!(out, "    {event:?}");
-            }
-        }
-        out
-    }
-}
-
-#[derive(Clone)]
-pub struct Callsite {
-    pub id: WidgetId,
-    pub label: String,
-    pub calls: u64,
-    pub distinct_widths: usize,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum ReuseOutcome {
-    Exact,
-    Moved,
-    Dirty,
-    WrongParent,
-    WrongLayer,
-    WrongMask,
-    WrongNode,
-    Remapped,
-    Outside,
-    Undrawn,
-}
-
-/// One targeted layout event. Events are retained in execution order, making
-/// repeated constraint paths visible without logging every widget globally.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum TraceEvent {
-    DrawRequest {
-        id: WidgetId,
-        parent: Option<WidgetId>,
-        region: UiRegion,
-        region_px: PxVec2,
-        region_node: bool,
-    },
-    Reuse {
-        id: WidgetId,
-        outcome: ReuseOutcome,
-    },
-    SizeReported {
-        id: WidgetId,
-        size: Size,
-    },
-    RegionNode {
-        id: WidgetId,
-        parent: WidgetId,
-        region: UiRegion,
-    },
-    SizeRead {
-        id: WidgetId,
-        reader: WidgetId,
-        size: Size,
-    },
-    HintRead {
-        id: WidgetId,
-        reader: WidgetId,
-        axis: Axis,
-        hint: Option<LayoutLen>,
-    },
-    TextRendered {
-        id: WidgetId,
-        width: Option<f32>,
-    },
-}
-
-#[derive(Default)]
-struct Calls {
-    label: String,
-    count: u64,
-    widths: HashSet<Option<u32>>,
-}
-
-#[derive(Default)]
-struct Current {
-    report: Report,
-    widgets: HashMap<WidgetId, Calls>,
-    text_widgets: HashMap<WidgetId, Calls>,
-    traced: HashSet<WidgetId>,
-}
-
-thread_local! {
-    static CURRENT: RefCell<Current> = RefCell::new(Current::default());
-}
-
-pub(crate) fn bump(counter: Counter) {
-    CURRENT.with_borrow_mut(|current| current.report.counters[counter as usize] += 1);
-}
-
-pub(crate) fn draw_widget(id: WidgetId, label: &str) {
-    CURRENT.with_borrow_mut(|current| {
-        let calls = current.widgets.entry(id).or_default();
-        if calls.label.is_empty() {
-            calls.label = label.to_owned();
-        }
-        calls.count += 1;
-    });
-}
-
-/// Adds a widget to the targeted trace set. Selection survives [`take`]
-/// until explicitly removed or cleared.
-pub fn trace_widget(id: impl Into<WidgetId>) {
-    CURRENT.with_borrow_mut(|current| {
-        current.traced.insert(id.into());
-    });
-}
-
-pub fn untrace_widget(id: impl Into<WidgetId>) {
-    CURRENT.with_borrow_mut(|current| {
-        current.traced.remove(&id.into());
-    });
-}
-
-pub fn clear_traced_widgets() {
-    CURRENT.with_borrow_mut(|current| current.traced.clear());
-}
-
-fn trace(id: WidgetId, event: TraceEvent) {
-    CURRENT.with_borrow_mut(|current| {
-        if current.traced.contains(&id) {
-            current.report.traces.push(event);
-        }
-    });
-}
-
-pub(crate) fn draw_request(
-    id: WidgetId,
-    parent: Option<WidgetId>,
-    region: UiRegion,
-    region_px: PxVec2,
-    region_node: bool,
-) {
-    trace(
-        id,
-        TraceEvent::DrawRequest {
-            id,
-            parent,
-            region,
-            region_px,
-            region_node,
-        },
-    );
-}
-
-pub(crate) fn reuse(id: WidgetId, outcome: ReuseOutcome) {
-    trace(id, TraceEvent::Reuse { id, outcome });
-}
-
-/// A drawing that cannot be reused because the box on offer is outside what
-/// it holds for, and which of the four contracts said so. They overlap: a
-/// drawing can be outside two of them at once, and counting each is what
-/// says where a rel base redrawing more than it should is coming from.
-pub(crate) fn outside(
-    id: WidgetId,
-    holds: LayoutHolds,
-    region: UiRegion,
-    rel_base: UiVec2,
-    window: PxVec2,
-) {
-    for axis in Axis::BOTH {
-        let holds = holds[axis];
-        let len = region[axis].len();
-        let window = window[axis];
-        if holds.region_len.is_some_and(|pinned| pinned != len) {
-            bump(Counter::OutsidePinnedLen);
-        }
-        if !holds.window.contains(window) {
-            bump(Counter::OutsideWindow);
-        }
-        if holds
-            .rel_base
-            .is_some_and(|pinned| pinned != rel_base[axis])
-        {
-            bump(Counter::OutsideRelBase);
-        }
-        if !holds.region.contains(len.to_px(window)) {
-            bump(Counter::OutsideRegion);
-        }
-    }
-    bump(Counter::ReuseOutside);
-    reuse(id, ReuseOutcome::Outside);
-}
-
-pub(crate) fn size_reported(id: WidgetId, size: Size) {
-    trace(id, TraceEvent::SizeReported { id, size });
-}
-
-pub(crate) fn region_node(id: WidgetId, parent: WidgetId, region: UiRegion) {
-    trace(id, TraceEvent::RegionNode { id, parent, region });
-}
-
-pub(crate) fn size_read(id: WidgetId, reader: WidgetId, size: Size) {
-    trace(id, TraceEvent::SizeRead { id, reader, size });
-}
-
-pub(crate) fn hint_read(id: WidgetId, reader: WidgetId, axis: Axis, hint: Option<LayoutLen>) {
-    trace(
-        id,
-        TraceEvent::HintRead {
-            id,
-            reader,
-            axis,
-            hint,
-        },
-    );
-}
-
-pub(crate) fn render_text(id: WidgetId, label: &str, width: Option<f32>) {
-    CURRENT.with_borrow_mut(|current| {
-        let calls = current.text_widgets.entry(id).or_default();
-        if calls.label.is_empty() {
-            calls.label = label.to_owned();
-        }
-        calls.count += 1;
-        calls.widths.insert(width.map(f32::to_bits));
-        if current.traced.contains(&id) {
-            current
-                .report
-                .traces
-                .push(TraceEvent::TextRendered { id, width });
-        }
-    });
-}
-
-pub(crate) struct Timer {
-    kind: TimerKind,
-    start: Instant,
-}
-
-pub(crate) fn timer(kind: TimerKind) -> Timer {
-    Timer {
-        kind,
-        start: Instant::now(),
-    }
-}
-
-impl Drop for Timer {
-    fn drop(&mut self) {
-        let nanos = self.start.elapsed().as_nanos().min(u64::MAX as u128) as u64;
-        CURRENT.with_borrow_mut(|current| current.report.nanos[self.kind as usize] += nanos);
-    }
-}
-
-/// Takes all diagnostics accumulated on this thread and resets them.
-pub fn take() -> Report {
-    CURRENT.with_borrow_mut(|current| {
-        current.report.distinct_widgets = current.widgets.len();
-        current.report.distinct_text_widgets = current.text_widgets.len();
-        current.report.hot_widgets = hottest(&current.widgets);
-        current.report.hot_text = hottest(&current.text_widgets);
-        let report = std::mem::take(&mut current.report);
-        current.widgets.clear();
-        current.text_widgets.clear();
-        report
-    })
-}
-
-fn hottest(calls: &HashMap<WidgetId, Calls>) -> Vec<Callsite> {
-    let mut calls: Vec<_> = calls
-        .iter()
-        .map(|(&id, calls)| Callsite {
-            id,
-            label: calls.label.clone(),
-            calls: calls.count,
-            distinct_widths: calls.widths.len(),
-        })
-        .collect();
-    calls.sort_by(|a, b| b.calls.cmp(&a.calls).then_with(|| a.label.cmp(&b.label)));
-    calls.truncate(8);
-    calls
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn taking_a_report_resets_its_counters() {
-        let _ = take();
-        bump(Counter::Updates);
-        bump(Counter::Updates);
-
-        let report = take();
-        assert_eq!(report.counters().next(), Some(("updates", 2)));
-        assert!(take().counters().all(|(_, count)| count == 0));
-    }
-}

core/src/lib.rs

@@ -9,14 +9,9 @@
 #![feature(unsize)]
 #![feature(coerce_unsized)]
 #![feature(option_into_flat_iter)]
-#![feature(const_index)]
-
-#[cfg(feature = "layout-diagnostics")]
-pub mod layout_diagnostics;
 
 mod attr;
 mod event;
-mod fixed;
 mod num;
 mod orientation;
 mod primitive;
@@ -28,7 +23,6 @@ pub mod util;
 
 pub use attr::*;
 pub use event::*;
-pub use fixed::*;
 pub use num::*;
 pub use orientation::*;
 pub use primitive::*;

core/src/orientation/align.rs

@@ -1,9 +1,8 @@
-use crate::util::impl_axis_index;
+use crate::vec2;
-use crate::{Px, Rel};
 
 use super::*;
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub struct Align {
     pub x: Option<AxisAlign>,
     pub y: Option<AxisAlign>,
@@ -31,32 +30,20 @@ impl Align {
     }
 }
 
-/// Where a widget sits in a box longer than it is. The default is the middle,
+#[derive(Clone, Copy, PartialEq, Eq)]
-/// because the two edges are the ones that assume a direction: which of them
+pub enum AxisAlign {
-/// is the near one depends on the writing system and on which way a container
+    Neg,
-/// runs, and the middle is the same either way.
+    Center,
-#[derive(Debug, Clone, Copy, PartialEq)]
+    Pos,
-pub struct AxisAlign(Rel);
-
-impl AxisAlign {
-    pub const NEG: Self = Self::new(0.0);
-    pub const CENTER: Self = Self::new(0.5);
-    pub const POS: Self = Self::new(1.0);
-
-    pub const fn new(rel: f32) -> Self {
-        Self(Rel::from_f32(rel))
-    }
-
-    /// A fraction of the room left over, which is what the layout reads: the
-    /// three constants are the familiar places along it, not the only ones.
-    pub const fn rel(&self) -> Rel {
-        self.0
-    }
 }
 
-impl Default for AxisAlign {
+impl AxisAlign {
-    fn default() -> Self {
+    pub const fn rel(&self) -> f32 {
-        Self::CENTER
+        match self {
+            Self::Neg => 0.0,
+            Self::Center => 0.5,
+            Self::Pos => 1.0,
+        }
     }
 }
 
@@ -66,38 +53,41 @@ pub struct CardinalAlign {
 }
 
 impl CardinalAlign {
-    pub const LEFT: Self = Self::new(Axis::X, AxisAlign::NEG);
+    pub const LEFT: Self = Self::new(Axis::X, AxisAlign::Neg);
-    pub const H_CENTER: Self = Self::new(Axis::X, AxisAlign::CENTER);
+    pub const H_CENTER: Self = Self::new(Axis::X, AxisAlign::Center);
-    pub const RIGHT: Self = Self::new(Axis::X, AxisAlign::POS);
+    pub const RIGHT: Self = Self::new(Axis::X, AxisAlign::Pos);
-    pub const TOP: Self = Self::new(Axis::Y, AxisAlign::NEG);
+    pub const TOP: Self = Self::new(Axis::Y, AxisAlign::Neg);
-    pub const V_CENTER: Self = Self::new(Axis::Y, AxisAlign::CENTER);
+    pub const V_CENTER: Self = Self::new(Axis::Y, AxisAlign::Center);
-    pub const BOT: Self = Self::new(Axis::Y, AxisAlign::POS);
+    pub const BOT: Self = Self::new(Axis::Y, AxisAlign::Pos);
 
     pub const fn new(axis: Axis, align: AxisAlign) -> Self {
         Self { axis, align }
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Default)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub struct RegionAlign {
     pub x: AxisAlign,
     pub y: AxisAlign,
 }
 
 impl RegionAlign {
-    pub const TOP_LEFT: Self = Self::new(AxisAlign::NEG, AxisAlign::NEG);
+    pub const TOP_LEFT: Self = Self::new(AxisAlign::Neg, AxisAlign::Neg);
-    pub const TOP_CENTER: Self = Self::new(AxisAlign::CENTER, AxisAlign::NEG);
+    pub const TOP_CENTER: Self = Self::new(AxisAlign::Center, AxisAlign::Neg);
-    pub const TOP_RIGHT: Self = Self::new(AxisAlign::POS, AxisAlign::NEG);
+    pub const TOP_RIGHT: Self = Self::new(AxisAlign::Pos, AxisAlign::Neg);
-    pub const CENTER_LEFT: Self = Self::new(AxisAlign::NEG, AxisAlign::CENTER);
+    pub const CENTER_LEFT: Self = Self::new(AxisAlign::Neg, AxisAlign::Center);
-    pub const CENTER: Self = Self::new(AxisAlign::CENTER, AxisAlign::CENTER);
+    pub const CENTER: Self = Self::new(AxisAlign::Center, AxisAlign::Center);
-    pub const CENTER_RIGHT: Self = Self::new(AxisAlign::POS, AxisAlign::CENTER);
+    pub const CENTER_RIGHT: Self = Self::new(AxisAlign::Pos, AxisAlign::Center);
-    pub const BOT_LEFT: Self = Self::new(AxisAlign::NEG, AxisAlign::POS);
+    pub const BOT_LEFT: Self = Self::new(AxisAlign::Neg, AxisAlign::Pos);
-    pub const BOT_CENTER: Self = Self::new(AxisAlign::CENTER, AxisAlign::POS);
+    pub const BOT_CENTER: Self = Self::new(AxisAlign::Center, AxisAlign::Pos);
-    pub const BOT_RIGHT: Self = Self::new(AxisAlign::POS, AxisAlign::POS);
+    pub const BOT_RIGHT: Self = Self::new(AxisAlign::Pos, AxisAlign::Pos);
 
     pub const fn new(x: AxisAlign, y: AxisAlign) -> Self {
         Self { x, y }
     }
+    pub const fn rel(&self) -> Vec2 {
+        vec2(self.x.rel(), self.y.rel())
+    }
 }
 
 impl UiVec2 {
@@ -150,17 +140,16 @@ impl Vec2 {
     }
 }
 
-impl Len {
+impl UiScalar {
-    /// This length placed in the box it is measured in: the alignment names a
-    /// point along that box, and the two ends are that point less the part of
-    /// the length falling before it and plus the part falling after.
     pub const fn align(&self, align: AxisAlign) -> UiSpan {
         let rel = align.rel();
-        let at = Len::from_parts(rel, Px::ZERO);
+        let mut start = UiScalar::rel(rel);
-        UiSpan {
+        start.abs -= self.abs * rel;
-            start: at - self.scale(rel),
+        start.rel -= self.rel * rel;
-            end: at + self.scale(Rel::ONE.sub(rel)),
+        let mut end = UiScalar::rel(rel);
-        }
+        end.abs += self.abs * (1.0 - rel);
+        end.rel += self.rel * (1.0 - rel);
+        UiSpan { start, end }
     }
 }
 
@@ -176,8 +165,8 @@ impl From<RegionAlign> for Align {
 impl From<Align> for RegionAlign {
     fn from(align: Align) -> Self {
         Self {
-            x: align.x.unwrap_or(AxisAlign::CENTER),
+            x: align.x.unwrap_or(AxisAlign::Center),
-            y: align.y.unwrap_or(AxisAlign::CENTER),
+            y: align.y.unwrap_or(AxisAlign::Center),
         }
     }
 }
@@ -200,10 +189,7 @@ impl From<CardinalAlign> for Align {
 
 const impl From<RegionAlign> for UiVec2 {
     fn from(align: RegionAlign) -> Self {
-        Self::new(
+        Self::rel(align.rel())
-            Len::from_parts(align.x.rel(), Px::ZERO),
-            Len::from_parts(align.y.rel(), Px::ZERO),
-        )
     }
 }
 
@@ -212,6 +198,3 @@ impl RegionAlign {
         UiVec2::from(self)
     }
 }
-
-impl_axis_index!(RegionAlign => AxisAlign);
-impl_axis_index!(Align => Option<AxisAlign>);

core/src/orientation/axis.rs

@@ -1,18 +1,11 @@
 use super::*;
-use crate::util::impl_axis_index;
-use crate::{Fixed, FixedVec2};
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+#[derive(Copy, Clone, Eq, PartialEq)]
 pub enum Axis {
     X,
     Y,
 }
 
-impl Axis {
-    /// Both of them, for the layout code that asks the same question of each.
-    pub const BOTH: [Self; 2] = [Self::X, Self::Y];
-}
-
 impl std::ops::Not for Axis {
     type Output = Self;
 
@@ -47,16 +40,21 @@ pub enum Sign {
     Pos,
 }
 
-impl<const SHIFT: u32> FixedVec2<SHIFT> {
+impl Vec2 {
-    pub const fn from_axis(axis: Axis, aligned: Fixed<SHIFT>, ortho: Fixed<SHIFT>) -> Self {
+    pub fn axis(&self, axis: Axis) -> f32 {
         match axis {
-            Axis::X => Self::new(aligned, ortho),
+            Axis::X => self.x,
-            Axis::Y => Self::new(ortho, aligned),
+            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,
         }
     }
-}
 
-impl Vec2 {
     pub const fn from_axis(axis: Axis, aligned: f32, ortho: f32) -> Self {
         Self {
             x: match axis {
@@ -71,5 +69,47 @@ impl Vec2 {
     }
 }
 
-impl_axis_index!({const SHIFT: u32} FixedVec2<SHIFT> => Fixed<SHIFT>);
+pub const trait AxisT {
-impl_axis_index!(Vec2 => f32);
+    fn get() -> Axis;
+}
+
+pub struct XAxis;
+const impl AxisT for XAxis {
+    fn get() -> Axis {
+        Axis::X
+    }
+}
+
+pub struct YAxis;
+const impl AxisT for YAxis {
+    fn get() -> Axis {
+        Axis::Y
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct BothAxis<T> {
+    pub x: T,
+    pub y: T,
+}
+
+impl<T> BothAxis<T> {
+    pub const fn axis<A: const AxisT>(&mut self) -> &mut T {
+        match A::get() {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
+    pub fn take_axis<A: const AxisT>(self) -> T {
+        match A::get() {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
+    pub fn axis_dyn(&mut self, axis: Axis) -> &mut T {
+        match axis {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
+}

core/src/orientation/len.rs

@@ -1,39 +1,22 @@
 use super::*;
-use crate::util::impl_axis_index;
+use crate::{UiNum, util::impl_op};
-use crate::{Px, PxVec2, Rel, UiNum, Weight, util::impl_op};
 
 #[derive(Debug, Default, Clone, Copy, PartialEq)]
 pub struct Size {
-    pub x: LayoutLen,
+    pub x: Len,
-    pub y: LayoutLen,
+    pub y: Len,
 }
 
-/// What a widget asks for along one axis: a [`Len`] -- pixels and a fraction
+#[derive(Debug, Clone, Copy, PartialEq)]
-/// of the box it is given -- plus a share of whatever is left over once
+pub struct Len {
-/// everything fixed has been taken. The parts add up rather than choosing
+    pub abs: f32,
-/// between one another.
+    pub rel: f32,
-///
+    pub rest: f32,
-/// Only a container dividing its room can answer a share, so a length nobody
-/// divides is a `Len`: a position, a padding, a cap, anything already
-/// resolved.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct LayoutLen {
-    pub px: Px,
-    pub rel: Rel,
-    pub leftover: Weight,
 }
 
-/// A bare number is pixels, which is the one length that needs no box to be
-/// read in.
 impl<N: UiNum> From<N> for Len {
     fn from(value: N) -> Self {
-        Len::px(value.to_f32())
+        Len::abs(value.to_f32())
-    }
-}
-
-impl<N: UiNum> From<N> for LayoutLen {
-    fn from(value: N) -> Self {
-        LayoutLen::px(value.to_f32())
     }
 }
 
@@ -46,76 +29,52 @@ impl<Nx: UiNum, Ny: UiNum> From<(Nx, Ny)> for Size {
     }
 }
 
-/// A length with no share in it is a length a container does not have to
+impl From<Len> for Size {
-/// divide, which is one it can always give.
+    fn from(value: Len) -> Self {
-impl From<Len> for LayoutLen {
-    fn from(len: Len) -> Self {
-        Self {
-            px: len.px,
-            rel: len.rel,
-            leftover: Weight::ZERO,
-        }
-    }
-}
-
-impl From<LayoutLen> for Size {
-    fn from(value: LayoutLen) -> Self {
         Self { x: value, y: value }
     }
 }
 
 impl Size {
     pub const ZERO: Self = Self {
-        x: LayoutLen::ZERO,
+        x: Len::ZERO,
-        y: LayoutLen::ZERO,
+        y: Len::ZERO,
     };
 
-    pub const LEFTOVER: Self = Self {
+    pub const REST: Self = Self {
-        x: LayoutLen::LEFTOVER,
+        x: Len::REST,
-        y: LayoutLen::LEFTOVER,
+        y: Len::REST,
     };
 
-    /// From something measured outside layout -- a texture, a shaped line --
+    pub fn abs(v: Vec2) -> Self {
-    /// which is where a size in floats comes from.
-    pub fn px(v: Vec2) -> Self {
-        Self::from_px(PxVec2::from_f32(v))
-    }
-
-    pub const fn from_px(v: PxVec2) -> Self {
         Self {
-            x: LayoutLen {
+            x: Len::abs(v.x),
-                px: v.x,
+            y: Len::abs(v.y),
-                ..LayoutLen::ZERO
-            },
-            y: LayoutLen {
-                px: v.y,
-                ..LayoutLen::ZERO
-            },
         }
     }
 
     pub fn rel(v: Vec2) -> Self {
         Self {
-            x: LayoutLen::rel(v.x),
+            x: Len::rel(v.x),
-            y: LayoutLen::rel(v.y),
+            y: Len::rel(v.y),
         }
     }
 
-    pub fn leftover(v: Vec2) -> Self {
+    pub fn rest(v: Vec2) -> Self {
         Self {
-            x: LayoutLen::leftover(v.x),
+            x: Len::rest(v.x),
-            y: LayoutLen::leftover(v.y),
+            y: Len::rest(v.y),
         }
     }
 
     pub fn to_uivec2(self) -> UiVec2 {
         UiVec2 {
-            x: self.x.apply_leftover(),
+            x: self.x.apply_rest(),
-            y: self.y.apply_leftover(),
+            y: self.y.apply_rest(),
         }
     }
 
-    pub fn from_axis(axis: Axis, aligned: LayoutLen, ortho: LayoutLen) -> Self {
+    pub fn from_axis(axis: Axis, aligned: Len, ortho: Len) -> Self {
         match axis {
             Axis::X => Self {
                 x: aligned,
@@ -127,88 +86,54 @@ impl Size {
             },
         }
     }
+
+    pub fn axis(&self, axis: Axis) -> Len {
+        match axis {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
 }
 
-impl LayoutLen {
+impl Len {
     pub const ZERO: Self = Self {
-        px: Px::ZERO,
+        abs: 0.0,
-        rel: Rel::ZERO,
+        rel: 0.0,
-        leftover: Weight::ZERO,
+        rest: 0.0,
     };
 
-    pub const LEFTOVER: Self = Self {
+    pub const REST: Self = Self {
-        px: Px::ZERO,
+        abs: 0.0,
-        rel: Rel::ZERO,
+        rel: 0.0,
-        leftover: Weight::ONE,
+        rest: 1.0,
     };
 
-    /// The whole of what is left over counts as the whole box, which is what
+    pub fn apply_rest(&self) -> UiScalar {
-    /// a length means to something that is not dividing a box between
+        UiScalar {
-    /// siblings -- a scroll asking how long its content is.
+            rel: self.rel + if self.rest > 0.0 { 1.0 } else { 0.0 },
-    pub fn apply_leftover(&self) -> Len {
+            abs: self.abs,
-        let share = match self.leftover > Weight::ZERO {
-            true => Rel::ONE,
-            false => Rel::ZERO,
-        };
-        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);
-        Self {
-            px: part.px,
-            rel: part.rel,
-            leftover: self.leftover,
         }
     }
 
-    pub fn px(px: impl UiNum) -> Self {
+    pub fn abs(abs: impl UiNum) -> Self {
         Self {
-            px: Px::from_num(px),
+            abs: abs.to_f32(),
-            ..Self::ZERO
+            rel: 0.0,
+            rest: 0.0,
         }
     }
     pub fn rel(rel: impl UiNum) -> Self {
         Self {
-            rel: Rel::from_num(rel),
+            abs: 0.0,
-            ..Self::ZERO
+            rel: rel.to_f32(),
+            rest: 0.0,
         }
     }
-    pub fn leftover(ratio: impl UiNum) -> Self {
+    pub fn rest(ratio: impl UiNum) -> Self {
         Self {
-            leftover: Weight::from_num(ratio),
+            abs: 0.0,
-            ..Self::ZERO
+            rel: 0.0,
+            rest: ratio.to_f32(),
         }
     }
 }
@@ -216,26 +141,38 @@ impl LayoutLen {
 pub mod len_fns {
     use super::*;
 
-    pub fn px(px: impl UiNum) -> LayoutLen {
+    pub fn abs(abs: impl UiNum) -> Len {
-        LayoutLen::px(px)
+        Len {
+            abs: abs.to_f32(),
+            rel: 0.0,
+            rest: 0.0,
+        }
     }
-    pub fn rel(rel: impl UiNum) -> LayoutLen {
+    pub fn rel(rel: impl UiNum) -> Len {
-        LayoutLen::rel(rel)
+        Len {
+            abs: 0.0,
+            rel: rel.to_f32(),
+            rest: 0.0,
+        }
     }
-    pub fn leftover(ratio: impl UiNum) -> LayoutLen {
+    pub fn rest(ratio: impl UiNum) -> Len {
-        LayoutLen::leftover(ratio)
+        Len {
+            abs: 0.0,
+            rel: 0.0,
+            rest: ratio.to_f32(),
+        }
     }
 }
 
-impl_op!(same LayoutLen Add add; px rel leftover);
+impl_op!(Len Add add; abs rel rest);
-impl_op!(same LayoutLen Sub sub; px rel leftover);
+impl_op!(Len Sub sub; abs rel rest);
 
-impl_op!(same Size Add add; x y);
+impl_op!(Size Add add; x y);
-impl_op!(same Size Sub sub; x y);
+impl_op!(Size Sub sub; x y);
 
-impl Default for LayoutLen {
+impl Default for Len {
     fn default() -> Self {
-        Self::leftover(1.0)
+        Self::rest(1.0)
     }
 }
 
@@ -245,19 +182,17 @@ impl std::fmt::Display for Size {
     }
 }
 
-impl std::fmt::Display for LayoutLen {
+impl std::fmt::Display for Len {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.px != Px::ZERO {
+        if self.abs != 0.0 {
-            write!(f, "{} px;", self.px)?;
+            write!(f, "{} abs;", self.abs)?;
         }
-        if self.rel != Rel::ZERO {
+        if self.rel != 0.0 {
             write!(f, "{} rel;", self.rel)?;
         }
-        if self.leftover != Weight::ZERO {
+        if self.rest != 0.0 {
-            write!(f, "{} leftover;", self.leftover)?;
+            write!(f, "{} rest;", self.rest)?;
         }
         Ok(())
     }
 }
-
-impl_axis_index!(Size => LayoutLen);

core/src/orientation/pos.rs

@@ -1,47 +1,41 @@
-use crate::util::impl_axis_index;
+use std::{fmt::Display, hash::Hash, marker::Destruct};
-use std::{fmt::Display, marker::Destruct};
 
 use super::*;
-use crate::{Px, PxVec2, Rel, UiNum, util::impl_op};
+use crate::{
+    UiNum,
+    util::{LerpUtil, impl_op},
+};
 
 #[repr(C)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, bytemuck::Pod, bytemuck::Zeroable, Default)]
 pub struct UiVec2 {
-    pub x: Len,
+    pub x: UiScalar,
-    pub y: Len,
+    pub y: UiScalar,
 }
 
 impl UiVec2 {
     pub const ZERO: Self = Self {
-        x: Len::ZERO,
+        x: UiScalar::ZERO,
-        y: Len::ZERO,
+        y: UiScalar::ZERO,
     };
 
-    pub const fn new(x: Len, y: Len) -> Self {
+    pub const fn new(x: UiScalar, y: UiScalar) -> Self {
         Self { x, y }
     }
 
-    pub const fn px(px: impl const Into<Vec2>) -> Self {
+    pub const fn abs(abs: impl const Into<Vec2>) -> Self {
-        let px = px.into();
+        let abs = abs.into();
         Self {
-            x: Len::px(px.x),
+            x: UiScalar::abs(abs.x),
-            y: Len::px(px.y),
+            y: UiScalar::abs(abs.y),
-        }
-    }
-
-    /// From lengths already on the grid, with no fraction of a box.
-    pub const fn from_px(px: PxVec2) -> Self {
-        Self {
-            x: Len::from_parts(Rel::ZERO, px.x),
-            y: Len::from_parts(Rel::ZERO, px.y),
         }
     }
 
     pub const fn rel(rel: impl const Into<Vec2>) -> Self {
         let rel = rel.into();
         Self {
-            x: Len::rel(rel.x),
+            x: UiScalar::rel(rel.x),
-            y: Len::rel(rel.y),
+            y: UiScalar::rel(rel.y),
         }
     }
 
@@ -62,15 +56,30 @@ impl UiVec2 {
         }
     }
 
-    /// Resolved against a box of `size`, which is where a fraction stops
+    pub fn axis_mut(&mut self, axis: Axis) -> &mut UiScalar {
-    /// being one and becomes a place.
+        match axis {
-    pub fn to_px(&self, size: PxVec2) -> PxVec2 {
+            Axis::X => &mut self.x,
-        PxVec2::new(self.x.to_px(size.x), self.y.to_px(size.y))
+            Axis::Y => &mut self.y,
+        }
+    }
+
+    pub fn axis(&self, axis: Axis) -> UiScalar {
+        match axis {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
+
+    pub fn to_abs(&self, rel: Vec2) -> Vec2 {
+        Vec2 {
+            x: self.x.to_abs(rel.x),
+            y: self.y.to_abs(rel.y),
+        }
     }
 
     pub const FULL_SIZE: Self = Self::rel(Vec2::ONE);
 
-    pub const fn from_axis(axis: Axis, aligned: Len, ortho: Len) -> Self {
+    pub const fn from_axis(axis: Axis, aligned: UiScalar, ortho: UiScalar) -> Self {
         match axis {
             Axis::X => Self {
                 x: aligned,
@@ -83,27 +92,34 @@ impl UiVec2 {
         }
     }
 
-    pub fn get_px(&self) -> Vec2 {
+    pub fn get_abs(&self) -> Vec2 {
-        (self.x.px.to_f32(), self.y.px.to_f32()).into()
+        (self.x.abs, self.y.abs).into()
     }
 
     pub fn get_rel(&self) -> Vec2 {
-        (self.x.rel.to_f32(), self.y.rel.to_f32()).into()
+        (self.x.rel, self.y.rel).into()
+    }
+
+    pub fn abs_mut(&mut self) -> Vec2View<'_> {
+        Vec2View {
+            x: &mut self.x.abs,
+            y: &mut self.y.abs,
+        }
     }
 }
 
 impl Display for UiVec2 {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "rel{};px{}", self.get_rel(), self.get_px())
+        write!(f, "rel{};abs{}", self.get_rel(), self.get_abs())
     }
 }
 
-impl_op!(same UiVec2 Add add; x y);
+impl_op!(UiVec2 Add add; x y);
-impl_op!(same UiVec2 Sub sub; x y);
+impl_op!(UiVec2 Sub sub; x y);
 
 const impl From<Vec2> for UiVec2 {
-    fn from(px: Vec2) -> Self {
+    fn from(abs: Vec2) -> Self {
-        Self::px(px)
+        Self::abs(abs)
     }
 }
 
@@ -111,137 +127,135 @@ const impl<T: const UiNum, U: const UiNum> From<(T, U)> for UiVec2
 where
     (T, U): const Destruct,
 {
-    fn from(px: (T, U)) -> Self {
+    fn from(abs: (T, U)) -> Self {
-        Self::px(px)
+        Self::abs(abs)
     }
 }
 
-/// A length along one axis: a fraction of the box it is measured in plus an
-/// offset, `rel * box + px`. A position is the same number -- the length from
-/// the start of the box to the point -- which is why a [`UiSpan`] is two of
-/// these. Both parts are fixed point, so composing one through a chain of
-/// boxes rounds only where it multiplies, and lands on the same number as any
-/// other route to the same place.
-///
-/// It carries no claim on what a container has left over. That is
-/// [`crate::LayoutLen`], which is this plus a weight, and which means nothing
-/// to anyone but whoever divides the room.
 #[repr(C)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, bytemuck::Pod, Default, bytemuck::Zeroable)]
+#[derive(Debug, Copy, Clone, PartialEq, bytemuck::Pod, Default, bytemuck::Zeroable)]
-pub struct Len {
+pub struct UiScalar {
-    pub rel: Rel,
+    pub rel: f32,
-    pub px: Px,
+    pub abs: f32,
 }
 
-impl_op!(same Len Add add; rel px);
+impl Eq for UiScalar {}
-impl_op!(same Len Sub sub; rel px);
+impl Hash for UiScalar {
-
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-impl Len {
+        state.write_u32(self.rel.to_bits());
-    pub const ZERO: Self = Self {
+        state.write_u32(self.abs.to_bits());
-        rel: Rel::ZERO,
-        px: Px::ZERO,
-    };
-    pub const FULL: Self = Self {
-        rel: Rel::ONE,
-        px: Px::ZERO,
-    };
-
-    pub const fn new(rel: f32, px: f32) -> Self {
-        Self::from_parts(Rel::from_f32(rel), Px::from_f32(px))
     }
+}
 
-    /// From parts already on the grid, rather than numbers to be put on it.
+impl_op!(UiScalar Add add; rel abs);
-    pub const fn from_parts(rel: Rel, px: Px) -> Self {
+impl_op!(UiScalar Sub sub; rel abs);
-        Self { rel, px }
+
+impl UiScalar {
+    pub const ZERO: Self = Self { rel: 0.0, abs: 0.0 };
+    pub const FULL: Self = Self { rel: 1.0, abs: 0.0 };
+
+    pub const fn new(rel: f32, abs: f32) -> Self {
+        Self { rel, abs }
     }
 
     pub const fn rel(rel: f32) -> Self {
-        Self::from_parts(Rel::from_f32(rel), Px::ZERO)
+        Self { rel, abs: 0.0 }
     }
 
-    pub const fn px(px: f32) -> Self {
+    pub const fn abs(abs: f32) -> Self {
-        Self::from_parts(Rel::ZERO, Px::from_f32(px))
+        Self { rel: 0.0, abs }
+    }
+
+    pub const fn rel_min() -> Self {
+        Self::new(0.0, 0.0)
+    }
+
+    pub const fn rel_max() -> Self {
+        Self::new(1.0, 0.0)
     }
 
     pub const fn max(&self, other: Self) -> Self {
         Self {
             rel: self.rel.max(other.rel),
-            px: self.px.max(other.px),
+            abs: self.abs.max(other.abs),
         }
     }
 
     pub const fn min(&self, other: Self) -> Self {
         Self {
             rel: self.rel.min(other.rel),
-            px: self.px.min(other.px),
+            abs: self.abs.min(other.abs),
         }
     }
 
-    /// Both parts by the same fraction, which is what a part of a length
+    pub const fn offset(mut self, amt: f32) -> Self {
-    /// means when the length is part pixels and part a fraction of a box.
+        self.abs += amt;
-    pub const fn scale(&self, by: Rel) -> Self {
-        Self {
-            rel: self.rel.mul(by),
-            px: self.px.mul(by),
-        }
-    }
-
-    pub const fn offset(mut self, amt: Px) -> Self {
-        self.px = self.px.add(amt);
         self
     }
 
     pub const fn within(&self, span: &UiSpan) -> Self {
+        let anchor = self.rel.lerp(span.start.rel, span.end.rel);
+        let offset = self.abs + self.rel.lerp(span.start.abs, span.end.abs);
         Self {
-            rel: self.rel.lerp(span.start.rel, span.end.rel),
+            rel: anchor,
-            px: self.px.add(self.rel.lerp(span.start.px, span.end.px)),
+            abs: offset,
         }
     }
 
-    pub const fn within_len(&self, len: Len) -> Self {
+    /// Undoes `within`, and `None` where the span has a fixed length: every
+    /// fraction of it lands on the same `rel`, so none can be told apart.
+    pub fn outside(&self, span: &UiSpan) -> Option<Self> {
+        let rel = self.rel.lerp_inv(span.start.rel, span.end.rel)?;
+        let abs = self.abs - rel.lerp(span.start.abs, span.end.abs);
+        Some(Self { rel, abs })
+    }
+
+    pub fn within_len(&self, len: UiScalar) -> Self {
         self.within(&UiSpan {
-            start: Len::ZERO,
+            start: UiScalar::ZERO,
             end: len,
         })
     }
 
+    pub fn select_len(&self, len: UiScalar) -> Self {
+        len.within_len(*self)
+    }
+
     pub const fn flip(&mut self) {
-        self.rel = Rel::ONE.sub(self.rel);
+        self.rel = 1.0 - self.rel;
-        self.px = self.px.neg();
+        self.abs = -self.abs;
     }
 
     pub const fn to(&self, end: Self) -> UiSpan {
         UiSpan { start: *self, end }
     }
 
-    /// Resolved against a box of `len`, which is the only place a fraction
+    pub const fn to_abs(&self, rel: f32) -> f32 {
-    /// becomes a number of pixels.
+        self.rel * rel + self.abs
-    pub const fn to_px(&self, len: Px) -> Px {
-        self.px.add(len.mul(self.rel))
     }
 }
 
 #[repr(C)]
 #[derive(Debug, Copy, Clone, PartialEq, bytemuck::Pod, bytemuck::Zeroable)]
 pub struct UiSpan {
-    pub start: Len,
+    pub start: UiScalar,
-    pub end: Len,
+    pub end: UiScalar,
 }
 
 impl UiSpan {
     pub const FULL: Self = Self {
-        start: Len::ZERO,
+        start: UiScalar::ZERO,
-        end: Len::FULL,
+        end: UiScalar::FULL,
     };
 
     pub const fn rel(rel: f32) -> Self {
         Self {
-            start: Len::rel(rel),
+            start: UiScalar::rel(rel),
-            end: Len::rel(rel),
+            end: UiScalar::rel(rel),
         }
     }
 
-    pub const fn new(start: Len, end: Len) -> Self {
+    pub const fn new(start: UiScalar, end: UiScalar) -> Self {
         Self { start, end }
     }
 
@@ -249,19 +263,14 @@ impl UiSpan {
         self.start.flip();
         self.end.flip();
         std::mem::swap(&mut self.start.rel, &mut self.end.rel);
-        std::mem::swap(&mut self.start.px, &mut self.end.px);
+        std::mem::swap(&mut self.start.abs, &mut self.end.abs);
     }
 
-    pub const fn shift(&mut self, offset: Len) {
+    pub const fn shift(&mut self, offset: UiScalar) {
         self.start += offset;
         self.end += offset;
     }
 
-    /// Composing a box through the one it sits in, and the hottest line in
-    /// layout. It used to skip the multiplies where a span was the whole of
-    /// its parent or the parent the whole of its own; both come out of the
-    /// multiply unchanged anyway, and the body those comparisons cost was
-    /// what kept the inliner from taking this at all.
     pub const fn within(&self, parent: &Self) -> Self {
         Self {
             start: self.start.within(parent),
@@ -269,16 +278,14 @@ impl UiSpan {
         }
     }
 
-    /// A box `len` long inside this one, on the side `align` says. Both must
+    pub fn outside(&self, parent: &Self) -> Option<Self> {
-    /// be lengths of the same rel base: it subtracts one from the other
+        Some(Self {
-    /// rather than composing it in, which is what keeps a fraction the same
+            start: self.start.outside(parent)?,
-    /// fraction however long this box turns out to be.
+            end: self.end.outside(parent)?,
-    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 {
+    pub const fn len(&self) -> UiScalar {
         self.end - self.start
     }
 }
@@ -312,6 +319,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(),
@@ -330,10 +351,10 @@ impl UiRegion {
         self
     }
 
-    pub fn to_px(&self, size: PxVec2) -> PixelRegion {
+    pub fn to_px(&self, size: Vec2) -> PixelRegion {
         PixelRegion {
-            top_left: self.top_left().to_px(size),
+            top_left: self.top_left().get_rel() * size + self.top_left().get_abs(),
-            bot_right: self.bot_right().to_px(size),
+            bot_right: self.bot_right().get_rel() * size + self.bot_right().get_abs(),
         }
     }
 
@@ -376,6 +397,50 @@ impl UiRegion {
     }
 }
 
+/// Taking a drawing out of one box and putting it in another, checked once
+/// for a whole subtree so that applying it cannot fail.
+///
+/// A box of a fixed length holds each part as an offset from its start rather
+/// than as a fraction of it, so those parts can be carried to a box of the
+/// same length but never stretched to a different one.
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub struct Remap {
+    from: UiRegion,
+    to: UiRegion,
+}
+
+impl Remap {
+    pub fn new(from: UiRegion, to: UiRegion) -> Option<Self> {
+        [Axis::X, Axis::Y]
+            .into_iter()
+            .all(|axis| {
+                let (from, to) = (from.axis(axis), to.axis(axis));
+                from.start.rel != from.end.rel || from.len() == to.len()
+            })
+            .then_some(Self { from, to })
+    }
+
+    pub fn apply(&self, region: UiRegion) -> UiRegion {
+        UiRegion {
+            x: Self::span(region.x, self.from.x, self.to.x),
+            y: Self::span(region.y, self.from.y, self.to.y),
+        }
+    }
+
+    fn span(span: UiSpan, from: UiSpan, to: UiSpan) -> UiSpan {
+        match span.outside(&from) {
+            Some(out) => out.within(&to),
+            // `new` admits this only where the two are the same length, so
+            // the difference between their starts is the whole move.
+            None => {
+                let mut span = span;
+                span.shift(to.start - from.start);
+                span
+            }
+        }
+    }
+}
+
 impl Display for UiRegion {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
@@ -388,21 +453,21 @@ impl Display for UiRegion {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub struct PixelRegion {
-    pub top_left: PxVec2,
+    pub top_left: Vec2,
-    pub bot_right: PxVec2,
+    pub bot_right: Vec2,
 }
 
 impl PixelRegion {
-    pub fn contains(&self, pos: PxVec2) -> bool {
+    pub fn contains(&self, pos: Vec2) -> bool {
         pos.x >= self.top_left.x
             && pos.x <= self.bot_right.x
             && pos.y >= self.top_left.y
             && pos.y <= self.bot_right.y
     }
 
-    pub fn size(&self) -> PxVec2 {
+    pub fn size(&self) -> Vec2 {
         self.bot_right - self.top_left
     }
 }
@@ -413,5 +478,19 @@ impl Display for PixelRegion {
     }
 }
 
-impl_axis_index!(UiVec2 => Len);
+pub struct Vec2View<'a> {
-impl_axis_index!(UiRegion => UiSpan);
+    pub x: &'a mut f32,
+    pub y: &'a mut f32,
+}
+
+impl Vec2View<'_> {
+    pub fn set(&mut self, other: Vec2) {
+        *self.x = other.x;
+        *self.y = other.y;
+    }
+
+    pub fn add(&mut self, other: Vec2) {
+        *self.x += other.x;
+        *self.y += other.y;
+    }
+}

core/src/primitive/layer.rs

@@ -120,10 +120,6 @@ impl<T: Default> Layers<T> {
 }
 
 impl DrawLayers {
-    /// Inlined on purpose: it is one call per glyph, the innermost thing a
-    /// frame does, and whether the inliner takes it turns out to depend on
-    /// unrelated code elsewhere in the crate -- 12% of a resize frame.
-    #[inline]
     pub fn write<P: Primitive>(
         &mut self,
         layer: LayerId,

core/src/primitive/text.rs

@@ -1,17 +1,11 @@
-#[cfg(feature = "layout-diagnostics")]
-use crate::layout_diagnostics::{self as diag, Counter, TimerKind};
 use crate::{
-    Align, GlyphAtlas, GlyphEntry, GlyphKey, PlacedGlyph, Px, PxVec2, RegionAlign, UiColor,
+    Align, GlyphAtlas, GlyphEntry, GlyphKey, PlacedGlyph, RegionAlign, UiColor, util::Vec2,
-    util::Vec2,
 };
 use parley::{
     Alignment, AlignmentOptions, FontContext, FontFamily, FontFamilyName, GenericFamily, Layout,
     LayoutContext, LineHeight, PositionedLayoutItem, StyleProperty,
 };
-use std::{
+use std::hash::{DefaultHasher, Hash, Hasher};
-    collections::VecDeque,
-    hash::{DefaultHasher, Hash, Hasher},
-};
 use swash::{
     FontRef,
     scale::{Render, ScaleContext, Source, StrikeWith},
@@ -23,32 +17,8 @@ pub struct TextData {
     pub layout_ctx: LayoutContext<UiColor>,
     scale_ctx: ScaleContext,
     pub atlas: GlyphAtlas,
-    spare: VecDeque<Placed>,
 }
 
-/// The glyphs of one text at one width. A buffer holds the ones it is drawn
-/// as; these are the ones it had before, kept because a container measures a
-/// child by drawing it in a box it may not keep, and so comes back to widths
-/// it has already asked for.
-struct Placed {
-    /// Where the glyphs land is a function of these three and nothing else,
-    /// so no widget or buffer identity is involved and two texts of the same
-    /// words share an answer.
-    text: String,
-    key: LayoutKey,
-    glyphs: RenderedText,
-}
-
-/// How many to keep. Bounding the whole store rather than each buffer is what
-/// makes this a fixed cost instead of one a tree of ten thousand texts pays
-/// ten thousand times; the re-asks come from laying out one subtree, so they
-/// are close together and few are needed. Instructions over 500 resize frames
-/// of `tests/revision_cost.rs`, both the repeating widths and the sweep that
-/// cannot hit across frames: 13.7B at 32, 12.1B at 64, 10.4B and 12.1B at 128,
-/// and nothing past that -- so 128, which is no worse in the case that never
-/// repeats and better in the one that does.
-const SPARE_PLACED: usize = 128;
-
 impl Default for TextData {
     fn default() -> Self {
         Self {
@@ -56,7 +26,6 @@ impl Default for TextData {
             layout_ctx: LayoutContext::new(),
             scale_ctx: ScaleContext::new(),
             atlas: GlyphAtlas::default(),
-            spare: VecDeque::new(),
         }
     }
 }
@@ -112,9 +81,6 @@ pub struct TextBuffer {
     text: String,
     layout: Layout<UiColor>,
     layout_key: Option<LayoutKey>,
-    /// The glyphs placed from `layout`, so drawing this text again at the
-    /// width it already has places them once.
-    placed: Option<RenderedText>,
 }
 
 #[derive(PartialEq)]
@@ -129,10 +95,13 @@ impl TextBuffer {
             text: text.into(),
             layout: Layout::new(),
             layout_key: None,
-            placed: None,
         }
     }
 
+    pub fn new_empty() -> Self {
+        Self::new("")
+    }
+
     pub fn text(&self) -> &str {
         &self.text
     }
@@ -150,45 +119,15 @@ impl TextBuffer {
         if text != self.text {
             self.text = text;
             self.layout_key = None;
-            self.placed = None;
         }
     }
 
     /// Invalidates the layout and returns the underlying string for editing.
     pub fn edit(&mut self) -> &mut String {
         self.layout_key = None;
-        self.placed = None;
         &mut self.text
     }
 
-    /// The glyphs of the shaping it is drawn as, once they are placed.
-    pub fn rendered(&self) -> Option<&RenderedText> {
-        self.placed.as_ref()
-    }
-
-    /// The width its shaping wraps at, and `None` where it does not wrap or
-    /// has not been shaped.
-    pub fn wrap_width(&self) -> Option<f32> {
-        self.layout_key.as_ref()?.max_width
-    }
-
-    /// Widths covered by the current line breaks, including a wider shaping
-    /// retained when a later draw requested a narrower box.
-    pub fn width_holds(&self) -> crate::Holds {
-        let Some(width) = self.wrap_width() else {
-            return crate::Holds::ANY;
-        };
-        let width = Px::from_f32(width);
-        let soft_wrapped = self.layout.lines().any(|line| {
-            matches!(
-                line.break_reason(),
-                parley::layout::BreakReason::Regular | parley::layout::BreakReason::Emergency
-            )
-        });
-        let upper = if soft_wrapped { width } else { Px::MAX };
-        crate::Holds::from(Px::ceil_from_f32(self.layout.width()).min(width)..=upper)
-    }
-
     pub fn size(&self) -> Vec2 {
         Vec2::new(self.layout.width(), self.layout.height())
     }
@@ -199,62 +138,8 @@ impl TextBuffer {
             max_width: width,
         };
         if self.layout_key.as_ref() == Some(&layout_key) {
-            #[cfg(feature = "layout-diagnostics")]
-            diag::bump(Counter::TextShapeHits);
             return;
         }
-        // A greedy break at one width is the same break at every width down
-        // to the longest line it produced: each line still fits, and none can
-        // take a word that would not fit in the wider box. So the layout in
-        // hand already answers, and re-breaking would only be work.
-        //
-        // At the longest line exactly, with no margin below it. A narrower
-        // width really does break differently, so answering one from the
-        // break in hand is how a warm tree keeps lines a cold tree would
-        // never produce. The margin was here because a text reports the
-        // width it used and a parent hands that back; the report is the step
-        // at or above its longest line now, so what comes back fits.
-        if let Some(key) = &self.layout_key
-            && key.attrs == *attrs
-            && let (Some(broke_at), Some(want)) = (key.max_width, width)
-            && want <= broke_at
-            && want >= self.layout.width()
-        {
-            #[cfg(feature = "layout-diagnostics")]
-            diag::bump(Counter::TextShapeHits);
-            return;
-        }
-        let same_shaping = self
-            .layout_key
-            .as_ref()
-            .is_some_and(|key| key.attrs == *attrs);
-        let old_key = self.layout_key.replace(layout_key);
-        // The glyphs it holds are of the width it held, which the layout may
-        // well come back to.
-        if let Some(key) = old_key
-            && let Some(glyphs) = self.placed.take()
-        {
-            data.keep_placed(Placed {
-                text: self.text.clone(),
-                key,
-                glyphs,
-            });
-        }
-        // Only the line breaking depends on the width: the shaped runs under
-        // it are a function of the text and the attrs, and parley re-breaks
-        // them in place. So a new width is a break, not a shaping.
-        if same_shaping {
-            #[cfg(feature = "layout-diagnostics")]
-            diag::bump(Counter::TextBreaks);
-            #[cfg(feature = "layout-diagnostics")]
-            let _break = diag::timer(TimerKind::TextBreak);
-            self.break_lines(width);
-            return;
-        }
-        #[cfg(feature = "layout-diagnostics")]
-        diag::bump(Counter::TextShapes);
-        #[cfg(feature = "layout-diagnostics")]
-        let _shape = diag::timer(TimerKind::TextShape);
         let mut builder = data
             .layout_ctx
             .ranged_builder(&mut data.font_ctx, &self.text, 1.0, true);
@@ -265,13 +150,10 @@ impl TextBuffer {
         )));
         builder.push_default(StyleProperty::Brush(attrs.color));
         builder.build_into(&mut self.layout, &self.text);
-        self.break_lines(width);
-    }
-
-    fn break_lines(&mut self, width: Option<f32>) {
         self.layout.break_all_lines(width);
         self.layout
             .align(Alignment::Start, AlignmentOptions::default());
+        self.layout_key = Some(layout_key);
     }
 }
 
@@ -314,9 +196,9 @@ impl TextData {
                     };
                     placed.push(PlacedGlyph {
                         entry,
-                        offset: PxVec2::new(
+                        offset: Vec2::new(
-                            Px::from_int(glyph.x.floor() as i32 + entry.left),
+                            glyph.x.floor() + entry.left as f32,
-                            Px::from_int(glyph.y.floor() as i32 - entry.top),
+                            glyph.y.floor() - entry.top as f32,
                         ),
                     });
                 }
@@ -383,54 +265,18 @@ pub struct RenderedText {
 }
 
 impl TextData {
-    /// The glyphs of this text at this width, taken out of what is kept.
+    pub fn render(
-    fn take_placed(&mut self, text: &str, key: &LayoutKey) -> Option<RenderedText> {
-        // From the newest, since a re-ask is usually of something recent.
-        let at = self
-            .spare
-            .iter()
-            .rposition(|spare| spare.key == *key && spare.text == text)?;
-        self.spare.remove(at).map(|spare| spare.glyphs)
-    }
-
-    fn keep_placed(&mut self, placed: Placed) {
-        if self.spare.len() >= SPARE_PLACED {
-            self.spare.pop_front();
-        }
-        self.spare.push_back(placed);
-    }
-
-    pub fn render<'b>(
         &mut self,
-        buffer: &'b mut TextBuffer,
+        buffer: &mut TextBuffer,
         attrs: &TextAttrs,
         width: Option<f32>,
-    ) -> &'b RenderedText {
+    ) -> RenderedText {
-        #[cfg(feature = "layout-diagnostics")]
-        diag::bump(Counter::TextRenders);
-        #[cfg(feature = "layout-diagnostics")]
-        let _render = diag::timer(TimerKind::TextRender);
         buffer.shape(self, attrs, width);
-        // Only asked for when the buffer no longer holds them: taking one out
+        let glyphs = self.place(buffer);
-        // of the store to then drop it would throw an answer away.
+        RenderedText {
-        let placed = buffer.placed.take().or_else(|| {
+            glyphs,
-            let key = buffer.layout_key.as_ref()?;
+            size: buffer.size(),
-            self.take_placed(&buffer.text, key)
+            color: attrs.color,
-        });
+        }
-        let placed = match placed {
-            Some(placed) => placed,
-            None => {
-                #[cfg(feature = "layout-diagnostics")]
-                diag::bump(Counter::GlyphPlacements);
-                #[cfg(feature = "layout-diagnostics")]
-                let _place = diag::timer(TimerKind::GlyphPlacement);
-                RenderedText {
-                    glyphs: self.place(buffer),
-                    size: buffer.size(),
-                    color: attrs.color,
-                }
-            }
-        };
-        buffer.placed.insert(placed)
     }
 }

core/src/render/atlas.rs

@@ -1,5 +1,5 @@
 use crate::{
-    PatchRect, PxVec2,
+    PatchRect,
     util::{HashMap, Vec2},
 };
 use image::RgbaImage;
@@ -167,6 +167,10 @@ impl GlyphAtlas {
     pub fn page_count(&self) -> u32 {
         self.pages.len() as u32
     }
+
+    pub fn glyph_count(&self) -> usize {
+        self.entries.len()
+    }
 }
 
 impl Page {
@@ -237,7 +241,5 @@ fn write_glyph(page: &mut RgbaImage, image: &Image, x: u32, y: u32) {
 #[derive(Clone, Copy)]
 pub struct PlacedGlyph {
     pub entry: GlyphEntry,
-    /// Whole pixels from the origin of the text to this glyph's top-left,
+    pub offset: Vec2,
-    /// on the grid once here rather than on every frame that draws it.
-    pub offset: PxVec2,
 }

core/src/render/data.rs

@@ -1,10 +1,11 @@
-use crate::{UiRegion, util::Id, util::Vec2};
+use crate::{UiRegion, util::Id};
 use wgpu::*;
 
 #[repr(C)]
 #[derive(Copy, Clone, bytemuck::Pod, bytemuck::Zeroable, Default)]
 pub struct WindowUniform {
-    pub dim: Vec2,
+    pub width: f32,
+    pub height: f32,
 }
 
 #[repr(C)]
@@ -12,19 +13,15 @@ pub struct WindowUniform {
 pub struct PrimitiveInstance {
     pub region: UiRegion,
     pub mask_idx: MaskIdx,
-    pub move_idx: MoveIdx,
 }
 
 impl PrimitiveInstance {
-    // The region's four scalars, each a `Rel` beside a `Px`: whole counts
+    const ATTRIBS: [VertexAttribute; 5] = vertex_attr_array![
-    // that the shader decodes, rather than the numbers themselves.
+        0 => Float32x2,
-    const ATTRIBS: [VertexAttribute; 6] = vertex_attr_array![
+        1 => Float32x2,
-        0 => Sint32x2,
+        2 => Float32x2,
-        1 => Sint32x2,
+        3 => Float32x2,
-        2 => Sint32x2,
-        3 => Sint32x2,
         4 => Uint32,
-        5 => Uint32,
     ];
 
     pub fn desc() -> VertexBufferLayout<'static> {
@@ -46,45 +43,4 @@ impl MaskIdx {
 #[derive(Debug, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
 pub struct Mask {
     pub region: UiRegion,
-    pub move_idx: MoveIdx,
-}
-
-/// Its own type rather than another `Id<u32>`, because it sits beside
-/// `MaskIdx` in an instance and the two must not be swappable.
-#[repr(transparent)]
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct MoveIdx(u32);
-
-impl MoveIdx {
-    pub const NONE: Self = Self(u32::MAX);
-
-    pub(crate) fn slot(idx: usize) -> Self {
-        Self(idx as u32)
-    }
-
-    pub(crate) fn idx(self) -> usize {
-        self.0 as usize
-    }
-}
-
-/// One link of the chain a primitive's position is resolved through: the box
-/// its contents are placed within, given in the coordinates of the slot it
-/// names. Moving or resizing a subtree writes its own slot and nothing else.
-///
-/// The identity is `UiRegion::FULL`, not zero: a zeroed entry is a box of no
-/// extent, which collapses everything under it to a point.
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct MoveOffset {
-    pub region: UiRegion,
-    pub parent: MoveIdx,
-}
-
-unsafe impl bytemuck::Pod for MoveOffset {}
-unsafe impl bytemuck::Zeroable for MoveOffset {}
-
-impl MoveOffset {
-    pub fn new(parent: MoveIdx, region: UiRegion) -> Self {
-        Self { region, parent }
-    }
 }

core/src/render/mod.rs

@@ -17,31 +17,11 @@ mod texture;
 mod util;
 
 pub use atlas::*;
-pub use data::{Mask, MaskIdx, MoveIdx, MoveOffset};
+pub use data::{Mask, MaskIdx};
 pub use primitive::*;
 
 const PRELUDE: &str = include_str!("./shader/prelude.wgsl");
 
-fn module_source(wgsl: &str) -> String {
-    // Every number both sides count in, written once here rather than a
-    // second time in the shader: a grid the two disagree about puts every
-    // coordinate somewhere else, and a sentinel they disagree about makes one
-    // of them walk a chain from a slot the other says is not there.
-    format!(
-        "const PX_STEP: f32 = 1.0 / {}.0;\n\
-         const REL_STEP: f32 = 1.0 / {}.0;\n\
-         const MASK_NONE: u32 = {}u;\n\
-         const MOVE_NONE: u32 = {}u;\n\
-         const CHAIN_LIMIT: u32 = {}u;\n\
-         {PRELUDE}\n{wgsl}",
-        1u32 << crate::PX_SHIFT,
-        1u32 << crate::REL_SHIFT,
-        MaskIdx::NONE.idx(),
-        MoveIdx::NONE.idx(),
-        crate::CHAIN_LIMIT,
-    )
-}
-
 pub struct UiRenderNode {
     shared_layout: BindGroupLayout,
     shared_group: BindGroup,
@@ -54,7 +34,6 @@ pub struct UiRenderNode {
     active: Vec<usize>,
     window_buffer: Buffer,
     masks: ArrBuf<Mask>,
-    moves: ArrBuf<MoveOffset>,
 }
 
 struct RenderLayer {
@@ -115,8 +94,7 @@ impl UiRenderNode {
             self.active.push(i);
             for change in draws.apply_free() {
                 if let Some(inst) = ui_render.active.get_mut(&change.id) {
-                    for primitive in &mut inst.primitives {
+                    for h in &mut inst.primitives {
-                        let h = &mut primitive.handle;
                         if h.layer == i && h.kind == change.kind && h.inst_idx == change.old {
                             h.inst_idx = change.new;
                             break;
@@ -149,35 +127,32 @@ impl UiRenderNode {
         for primitive in &mut self.primitives {
             primitive.render.update(ui);
         }
-        let mut regroup = false;
         if ui.masks.changed {
             ui.masks.changed = false;
-            regroup |= self.masks.update(device, queue, &ui.masks[..]);
+            if self.masks.update(device, queue, &ui.masks[..]) {
-        }
+                self.shared_group = Self::shared_group(
-        if ui_render.moves.changed {
+                    device,
-            ui_render.moves.changed = false;
+                    &self.shared_layout,
-            regroup |= self.moves.update(device, queue, ui_render.moves.entries());
+                    &self.window_buffer,
-        }
+                    &self.masks,
-        if regroup {
+                );
-            self.shared_group = Self::shared_group(
+            }
-                device,
-                &self.shared_layout,
-                &self.window_buffer,
-                &self.masks,
-                &self.moves,
-            );
         }
     }
 
     pub fn resize(&mut self, size: impl Into<Vec2>, queue: &Queue) {
         let size = size.into();
-        let slice = &[WindowUniform { dim: size }];
+        let slice = &[WindowUniform {
+            width: size.x,
+            height: size.y,
+        }];
         queue.write_buffer(&self.window_buffer, 0, bytemuck::cast_slice(slice));
     }
 
     pub fn new(device: &Device, config: &SurfaceConfiguration) -> Self {
         let window_uniform = WindowUniform {
-            dim: Vec2::new(config.width as f32, config.height as f32),
+            width: config.width as f32,
+            height: config.height as f32,
         };
         let window_buffer = device.create_buffer_init(&BufferInitDescriptor {
             label: Some("window"),
@@ -191,13 +166,7 @@ impl UiRenderNode {
             BufferUsages::STORAGE | BufferUsages::COPY_DST,
             "ui masks",
         );
-        let moves = ArrBuf::new(
+        let shared_group = Self::shared_group(device, &shared_layout, &window_buffer, &masks);
-            device,
-            BufferUsages::STORAGE | BufferUsages::COPY_DST,
-            "ui move offsets",
-        );
-        let shared_group =
-            Self::shared_group(device, &shared_layout, &window_buffer, &masks, &moves);
 
         Self {
             shared_layout,
@@ -208,7 +177,6 @@ impl UiRenderNode {
             layers: HashMap::default(),
             active: Vec::new(),
             masks,
-            moves,
         }
     }
 
@@ -243,7 +211,7 @@ impl UiRenderNode {
     ) -> RenderPipeline {
         let module = device.create_shader_module(ShaderModuleDescriptor {
             label: Some(label),
-            source: ShaderSource::Wgsl(module_source(wgsl).into()),
+            source: ShaderSource::Wgsl(format!("{PRELUDE}\n{wgsl}").into()),
         });
         device.create_render_pipeline(&RenderPipelineDescriptor {
             label: Some(label),
@@ -284,8 +252,7 @@ impl UiRenderNode {
         })
     }
 
-    /// What every draw in the ui is given: the window, the masks and the
+    /// What every draw in the ui is given: the window and the masks.
-    /// move chain every position is resolved through.
     fn shared_layout(device: &Device) -> BindGroupLayout {
         device.create_bind_group_layout(&BindGroupLayoutDescriptor {
             entries: &[
@@ -309,16 +276,6 @@ impl UiRenderNode {
                     },
                     count: None,
                 },
-                BindGroupLayoutEntry {
-                    binding: 2,
-                    visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT,
-                    ty: BindingType::Buffer {
-                        ty: BufferBindingType::Storage { read_only: true },
-                        has_dynamic_offset: false,
-                        min_binding_size: BufferSize::new(size_of::<MoveOffset>() as u64),
-                    },
-                    count: None,
-                },
             ],
             label: Some("ui shared"),
         })
@@ -329,7 +286,6 @@ impl UiRenderNode {
         layout: &BindGroupLayout,
         window: &Buffer,
         masks: &ArrBuf<Mask>,
-        moves: &ArrBuf<MoveOffset>,
     ) -> BindGroup {
         device.create_bind_group(&BindGroupDescriptor {
             layout,
@@ -342,10 +298,6 @@ impl UiRenderNode {
                     binding: 1,
                     resource: masks.buffer.as_entire_binding(),
                 },
-                BindGroupEntry {
-                    binding: 2,
-                    resource: moves.buffer.as_entire_binding(),
-                },
             ],
             label: Some("ui shared"),
         })
@@ -422,35 +374,3 @@ impl ListBuffers {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::module_source;
-    use wgpu::naga::{
-        front::wgsl,
-        valid::{Capabilities, ValidationFlags, Validator},
-    };
-
-    /// Every shader file, composed as the renderer composes it, parses and
-    /// validates with no device -- so an edit that breaks one fails here and
-    /// not in the first window opened.
-    #[test]
-    fn every_shader_validates() {
-        let dir = concat!(env!("CARGO_MANIFEST_DIR"), "/src/render/shader");
-        let mut checked = 0;
-        for entry in std::fs::read_dir(dir).unwrap() {
-            let path = entry.unwrap().path();
-            if path.extension().is_none_or(|e| e != "wgsl") || path.ends_with("prelude.wgsl") {
-                continue;
-            }
-            let source = module_source(&std::fs::read_to_string(&path).unwrap());
-            let module = wgsl::parse_str(&source)
-                .unwrap_or_else(|e| panic!("{}: {}", path.display(), e.emit_to_string(&source)));
-            Validator::new(ValidationFlags::all(), Capabilities::all())
-                .validate(&module)
-                .unwrap_or_else(|e| panic!("{}: {e:?}", path.display()));
-            checked += 1;
-        }
-        assert!(checked > 0, "no shaders found in {dir}");
-    }
-}

core/src/render/primitive.rs

@@ -3,7 +3,7 @@ use std::{any::TypeId, marker::PhantomData};
 use crate::{
     Color, TextureHandle, UiData, UiRegion, WidgetId,
     render::{
-        data::{MaskIdx, MoveIdx, PrimitiveInstance},
+        data::{MaskIdx, PrimitiveInstance},
         page::GlyphRender,
         texture::ImageRender,
     },
@@ -246,7 +246,6 @@ impl LayerDraws {
             primitive,
             region,
             mask_idx,
-            move_idx,
         }: PrimitiveInst<P>,
     ) -> PrimitiveHandle {
         self.updated = true;
@@ -259,11 +258,7 @@ impl LayerDraws {
             .get_or_insert_with(InstanceList::new::<P>)
             .push(
                 id,
-                PrimitiveInstance {
+                PrimitiveInstance { region, mask_idx },
-                    region,
-                    mask_idx,
-                    move_idx,
-                },
                 bytemuck::bytes_of(&primitive),
             );
         PrimitiveHandle {
@@ -309,7 +304,6 @@ pub struct PrimitiveInst<P> {
     pub primitive: P,
     pub region: UiRegion,
     pub mask_idx: MaskIdx,
-    pub move_idx: MoveIdx,
 }
 
 pub struct PrimitiveChange {
@@ -353,7 +347,7 @@ impl RectPrimitive {
 
 /// `color` is multiplied by the atlas alpha for a mask glyph; a colour glyph
 /// takes the texel unchanged, which `GlyphEntry::IS_COLORED` selects.
-#[repr(C)]
+#[repr(C, align(8))]
 #[derive(Debug, Copy, Clone)]
 pub struct GlyphPrimitive {
     pub uv_min: Vec2,
@@ -364,8 +358,8 @@ pub struct GlyphPrimitive {
     pub flags: u32,
 }
 
-// Manual rather than derived: `Vec2`'s alignment leaves four bytes of padding
+// Manual rather than derived: the align(8) leaves four bytes of padding, which
-// here, which is how WGSL lays the struct out.
+// is how WGSL lays the struct out.
 unsafe impl bytemuck::Pod for GlyphPrimitive {}
 unsafe impl bytemuck::Zeroable for GlyphPrimitive {}
 impl Primitive for GlyphPrimitive {

core/src/render/shader/prelude.wgsl

@@ -7,117 +7,32 @@
 var<uniform> window: WindowUniform;
 @group(0) @binding(1)
 var<storage> masks: array<Mask>;
-@group(0) @binding(2)
-var<storage> move_offsets: array<MoveOffset>;
 
 struct WindowUniform {
     dim: vec2<f32>,
 };
 
 struct Mask {
-    x: RawSpan,
-    y: RawSpan,
-    move_idx: u32,
-}
-
-struct MoveOffset {
-    x: RawSpan,
-    y: RawSpan,
-    parent: u32,
-}
-
-// `PX_STEP`, `REL_STEP`, `MASK_NONE`, `MOVE_NONE` and `CHAIN_LIMIT` are
-// prepended from `iris_core`'s own constants, so none of them is written
-// twice. What the CPU stores is a whole count of each step, and both steps
-// are powers of two, so decoding is exact and the number here is the number
-// the CPU decided.
-
-// Every coordinate the CPU decided is a whole count of `PX_STEP`, so one that
-// composes to within half a step of a pixel boundary is on that boundary and
-// belongs to the pixel above it. Flooring the product instead drops a pixel
-// wherever a fraction divides a window exactly: a fifth of 1920 comes out of
-// `REL_STEP` as 383.99998, and five tabs each lose their last column.
-//
-// Taken over the whole coordinate, fraction and pixels summed, since a floor
-// does not distribute over a sum: floored apart, a half of one and a half of
-// the other lose the pixel the two together make.
-fn snap_floor(v: vec2<f32>) -> vec2<f32> {
-    return floor(v + PX_STEP * 0.5);
-}
-
-struct RawScalar {
-    rel: i32,
-    px: i32,
-}
-
-struct RawSpan {
-    start: RawScalar,
-    end: RawScalar,
-}
-
-fn scalar_of(raw: RawScalar) -> Len {
-    return Len(f32(raw.rel) * REL_STEP, f32(raw.px) * PX_STEP);
-}
-
-fn span_of(raw: RawSpan) -> UiSpan {
-    return UiSpan(scalar_of(raw.start), scalar_of(raw.end));
-}
-
-fn scalar_of_pair(raw: vec2<i32>) -> Len {
-    return Len(f32(raw.x) * REL_STEP, f32(raw.y) * PX_STEP);
-}
-
-struct Region {
     x: UiSpan,
     y: UiSpan,
 }
 
-// The same expression `Len::within` uses, in floats rather than on the
-// CPU's grid: a move is resolved here so that scrolling a subtree writes one
-// entry instead of walking it. What has to hold is that this agrees with
-// itself frame to frame, not that it matches the CPU to the last bit.
-fn scalar_within(s: Len, p: UiSpan) -> Len {
-    return Len(
-        p.start.rel + (p.end.rel - p.start.rel) * s.rel,
-        s.px + (p.start.px + (p.end.px - p.start.px) * s.rel),
-    );
-}
-
-fn span_within(s: UiSpan, p: UiSpan) -> UiSpan {
-    return UiSpan(scalar_within(s.start, p), scalar_within(s.end, p));
-}
-
-fn resolve_move(idx: u32, local: Region) -> Region {
-    var r = local;
-    var at = idx;
-    for (var step = 0u; step < CHAIN_LIMIT; step++) {
-        if at == MOVE_NONE {
-            break;
-        }
-        let entry = move_offsets[at];
-        r = Region(span_within(r.x, span_of(entry.x)), span_within(r.y, span_of(entry.y)));
-        at = entry.parent;
-    }
-    return r;
-}
-
 struct UiSpan {
-    start: Len,
+    start: UiScalar,
-    end: Len,
+    end: UiScalar,
 }
 
-struct Len {
+struct UiScalar {
     rel: f32,
-    px: f32,
+    abs: f32,
 }
 
 struct InstanceInput {
-    @location(0) x_start: vec2<i32>,
+    @location(0) x_start: vec2<f32>,
-    @location(1) x_end: vec2<i32>,
+    @location(1) x_end: vec2<f32>,
-    @location(2) y_start: vec2<i32>,
+    @location(2) y_start: vec2<f32>,
-    @location(3) y_end: vec2<i32>,
+    @location(3) y_end: vec2<f32>,
     @location(4) mask_idx: u32,
-    @location(5) move_idx: u32,
 }
 
 struct VertexOutput {
@@ -137,18 +52,13 @@ fn vs_main(
 ) -> VertexOutput {
     var out: VertexOutput;
 
-    let local = Region(
+    let top_left_rel = vec2(in.x_start.x, in.y_start.x);
-        UiSpan(scalar_of_pair(in.x_start), scalar_of_pair(in.x_end)),
+    let top_left_abs = vec2(in.x_start.y, in.y_start.y);
-        UiSpan(scalar_of_pair(in.y_start), scalar_of_pair(in.y_end)),
+    let bot_right_rel = vec2(in.x_end.x, in.y_end.x);
-    );
+    let bot_right_abs = vec2(in.x_end.y, in.y_end.y);
-    let r = resolve_move(in.move_idx, local);
-    let top_left_rel = vec2(r.x.start.rel, r.y.start.rel);
-    let top_left_px = vec2(r.x.start.px, r.y.start.px);
-    let bot_right_rel = vec2(r.x.end.rel, r.y.end.rel);
-    let bot_right_px = vec2(r.x.end.px, r.y.end.px);
 
-    let top_left = snap_floor(top_left_rel * window.dim + top_left_px);
+    let top_left = floor(top_left_rel * window.dim) + floor(top_left_abs);
-    let bot_right = snap_floor(bot_right_rel * window.dim + bot_right_px);
+    let bot_right = floor(bot_right_rel * window.dim) + floor(bot_right_abs);
     let size = bot_right - top_left;
 
     let uv = vec2<f32>(
@@ -167,20 +77,17 @@ fn vs_main(
 }
 
 fn masked(in: VertexOutput, color: vec4<f32>) -> vec4<f32> {
-    if in.mask_idx == MASK_NONE {
+    if in.mask_idx == 4294967295u {
         return color;
     }
     let mask = masks[in.mask_idx];
-    // Its own chain, not the drawn primitive's, so a stationary viewport
+    let tl = vec2(mask.x.start.rel, mask.y.start.rel);
-    // clips content that moves inside it.
+    let tl_abs = vec2(mask.x.start.abs, mask.y.start.abs);
-    let m = resolve_move(mask.move_idx, Region(span_of(mask.x), span_of(mask.y)));
+    let br = vec2(mask.x.end.rel, mask.y.end.rel);
-    let tl = vec2(m.x.start.rel, m.y.start.rel);
+    let br_abs = vec2(mask.x.end.abs, mask.y.end.abs);
-    let tl_px = vec2(m.x.start.px, m.y.start.px);
-    let br = vec2(m.x.end.rel, m.y.end.rel);
-    let br_px = vec2(m.x.end.px, m.y.end.px);
 
-    let top_left = snap_floor(tl * window.dim + tl_px);
+    let top_left = floor(tl * window.dim) + floor(tl_abs);
-    let bot_right = snap_floor(br * window.dim + br_px);
+    let bot_right = floor(br * window.dim) + floor(br_abs);
     let pos = in.clip_position.xy;
     if pos.x < top_left.x || pos.x > bot_right.x || pos.y < top_left.y || pos.y > bot_right.y {
         return color * 0.0;

core/src/ui/active.rs

@@ -1,114 +1,20 @@
-use crate::{
+use crate::{LayerId, MaskIdx, PrimitiveHandle, Size, TextureHandle, UiRegion, WidgetId};
-    Bounds, Declared, LayerId, LayoutHolds, MaskIdx, MoveIdx, PlaceDesc, RegionAlign,
-    RetainedPrimitive, Size, TextureHandle, UiRegion, UiVec2, WidgetId,
-};
 
-/// What is kept of a widget its parent has asked about. `drawn` says whether
+/// important non rendering data for retained drawing
-/// it currently draws; one that does not is kept so that a change to it, or
-/// under it, still reaches whoever asked.
 #[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.
     pub region: UiRegion,
-    /// The measured answer and its dependencies. A hint-only dependency or
+    /// What the widget said it used of `region`, the last time it drew.
-    /// a widget first encountered during placement has no measurement yet.
-    pub answer: Option<Answer>,
-    /// 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.
     pub size: Size,
-    /// The window and region reads that this drawing holds for, and the
-    /// rel base and region it pinned.
-    pub holds: LayoutHolds,
-    pub drawn: bool,
     pub parent: Option<WidgetId>,
-    /// How far down the tree it was drawn, the root being 1. Carried down a
-    /// draw rather than worked out by walking up, so it is right for every
-    /// 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
+    pub primitives: Vec<PrimitiveHandle>,
-    /// 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 children: Vec<WidgetId>,
-    pub request_deps: Vec<WidgetId>,
+    /// The children whose size this widget read while drawing.
-    pub(crate) scratch: DrawScratch,
+    pub size_deps: Vec<WidgetId>,
-    /// The movable region its primitives are positioned through: its own when
+    /// Whether it read the output's size, and so is wrong when that changes.
-    /// opted in, otherwise the nearest ancestor's.
+    pub reads_output: bool,
-    pub move_idx: MoveIdx,
-    /// The declared lengths whoever drew this widget resolved into its rel base.
-    /// A change to one moves a box this widget cannot fix by drawing again,
-    /// and comparing them is what says so.
-    pub declared: Declared,
-    /// Its bounds, resolved the same way. The answer is held to these where
-    /// the box was not, so a change to one changes what it answers even
-    /// where its declared lengths stand.
-    pub bounds: Bounds,
-    /// 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.
-    pub parent_move: MoveIdx,
-    /// The mask its drawing is clipped to: one it set itself, or the one it
-    /// inherited from whoever drew it.
     pub mask: MaskIdx,
-    /// That inherited one. The two differ exactly where the widget set a
-    /// mask of its own, which is the one it owns and the one a move rewrites
-    /// -- and the one a redraw of it must not be handed back, since setting
-    /// a mask asserts there is none.
-    pub parent_mask: MaskIdx,
     pub layer: LayerId,
 }
-
-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(|answer| answer.size)
-    }
-
-    /// Whether it owns a region node rather than sharing the one it was drawn
-    /// under, which is what its two move indices being different says.
-    pub fn is_region_node(&self) -> bool {
-        self.move_idx != self.parent_move
-    }
-}
-
-/// What a widget answered when it was asked: the size it reported, and the
-/// boxes and windows that answer holds for.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct Answer {
-    pub size: Size,
-    pub holds: LayoutHolds,
-}
-
-#[derive(Debug, Default)]
-pub(crate) struct DrawScratch {
-    pub children: Vec<WidgetId>,
-    pub size_deps: Vec<WidgetId>,
-    pub under: Vec<(WidgetId, LayoutHolds)>,
-    pub requests: Vec<crate::RequestedLen>,
-    pub lengths: Vec<crate::Px>,
-}

core/src/ui/holds.rs

@@ -1,242 +0,0 @@
-use crate::{Bound, Len, Outside, Px, REL_SHIFT, fixed::div_toward, fixed::narrow};
-use std::ops::RangeInclusive;
-
-/// The lengths of a box, in pixels, that one drawing of a widget holds for:
-/// give the widget any box in this range and it draws the same thing and
-/// reports the same size. A widget that never reads its box in pixels holds
-/// for every length; one that does holds for the one it read unless it says
-/// otherwise, and a parent holds for whatever keeps every child it asked
-/// about or drew inside its own range.
-///
-/// The ends are lengths on the grid rather than floats with a tolerance
-/// around them: a box offered back at the length a widget reported comes back
-/// as the same number, so a range means what it says. The one place a range
-/// is wider than the length it came from is [`Self::through`], and what it is
-/// wider by is the floor that inverting a fraction undoes.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct Holds {
-    pub lo: Px,
-    pub hi: Px,
-}
-
-impl Len {
-    /// Whether this is longer than `than` in a window this wide, and the
-    /// windows that answer holds for.
-    ///
-    /// Which is longer is a question in pixels -- `rel(0.5)` is longer than
-    /// 300 px at a box of 600 and shorter at 400 -- and it is asked of the
-    /// difference and answered back through that same difference, so the
-    /// boundary is the comparison's own rather than a second way of finding
-    /// it.
-    pub fn longer_than(&self, than: Len, window: Px) -> (bool, Holds) {
-        let over = *self - than;
-        let longer = over.to_px(window) > Px::ZERO;
-        let side = match longer {
-            true => Px::STEP..=Px::MAX,
-            false => Px::MIN..=Px::ZERO,
-        };
-        (longer, Holds::from(side).through(over))
-    }
-}
-
-impl Bound {
-    /// Which end of this bound `len` falls outside, and the windows that
-    /// answer holds for. Nothing where it is inside, which is the answer
-    /// wherever there is no bound at all.
-    ///
-    /// `len` and this bound are lengths of the same thing, whichever that
-    /// is: a box in window lengths wants the bound resolved, and a length a
-    /// widget declares of its rel base wants it as the rule wrote it. Both
-    /// comparisons are in pixels, so each is a question about this window,
-    /// and the box is decided again on the other side of a crossing.
-    pub fn outside(&self, len: Len, window: Px) -> (Option<Outside>, Holds) {
-        let mut outside = None;
-        let mut holds = Holds::ANY;
-        let mut held = len;
-        if let Some(min) = self.min {
-            let (shorter, kept) = min.longer_than(held, window);
-            holds = holds.and(kept);
-            if shorter {
-                outside = Some(Outside::Shorter);
-                held = min;
-            }
-        }
-        if let Some(max) = self.max {
-            let (longer, kept) = held.longer_than(max, window);
-            holds = holds.and(kept);
-            if longer {
-                debug_assert!(
-                    outside.is_none(),
-                    "a floor of {:?} over a cap of {max:?} bounds nothing",
-                    self.min,
-                );
-                outside = Some(Outside::Longer);
-            }
-        }
-        (outside, holds)
-    }
-}
-
-impl Holds {
-    pub const ANY: Self = Self {
-        lo: Px::MIN,
-        hi: Px::MAX,
-    };
-
-    pub const fn at(len: Px) -> Self {
-        Self { lo: len, hi: len }
-    }
-
-    pub const fn contains(&self, len: Px) -> bool {
-        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),
-            hi: self.hi.min(other.hi),
-        }
-    }
-
-    /// What a box has to be for a part of it, `len` of the box long, to stay
-    /// in this range: the exact preimage of `px + floor(rel * box)`, which is
-    /// the one way a box in pixels is reached. A part with no relative extent
-    /// is a fixed length -- it was drawn at that length and any box keeps it
-    /// there.
-    ///
-    /// The answer is an interval even where this range is a single length,
-    /// because the multiply on the way in drops to the step below and many
-    /// boxes therefore give one length. That is a floor rather than an
-    /// allowance: inverting it is two divisions and nothing else, and the
-    /// whole of a box maps back to itself.
-    pub const fn through(&self, len: Len) -> Self {
-        if self.lo.raw() == Px::MIN.raw() && self.hi.raw() == Px::MAX.raw() {
-            return Self::ANY;
-        }
-        let rel = len.rel.raw() as i64;
-        if rel == 0 {
-            return Self::ANY;
-        }
-        let px = len.px.raw() as i64;
-        // `floor(rel * box) >= lo - px` is `rel * box >= (lo - px) << REL`, and
-        // `floor(rel * box) <= hi - px` is `rel * box < (hi - px + 1) << REL`.
-        let lo = (self.lo.raw() as i64 - px) << REL_SHIFT;
-        let hi = (((self.hi.raw() as i64 - px) + 1) << REL_SHIFT) - 1;
-        // Dividing by a negative fraction turns the ends around, so which
-        // bound each comes from is decided before dividing rather than by
-        // taking the min and max of four divisions.
-        match rel > 0 {
-            true => Self::raws(div_toward(lo, rel, true), div_toward(hi, rel, false)),
-            false => Self::raws(div_toward(hi, rel, true), div_toward(lo, rel, false)),
-        }
-    }
-
-    const fn raws(lo: i64, hi: i64) -> Self {
-        Self {
-            lo: Px::from_raw(narrow(lo)),
-            hi: Px::from_raw(narrow(hi)),
-        }
-    }
-}
-
-impl From<RangeInclusive<Px>> for Holds {
-    fn from(range: RangeInclusive<Px>) -> Self {
-        Self {
-            lo: *range.start(),
-            hi: *range.end(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::Rel;
-
-    #[test]
-    fn an_unrestricted_range_stays_unrestricted_through_any_length() {
-        for rel in [-2.0, -0.5, 0.0, 0.5, 1.0, 2.0] {
-            for px in [-8, 0, 8] {
-                let len = Len::from_parts(Rel::from_f32(rel), Px::from_int(px));
-                assert_eq!(Holds::ANY.through(len), Holds::ANY);
-            }
-        }
-    }
-
-    #[test]
-    fn through_reverses_a_range_for_a_negative_fraction() {
-        // `10 - box / 2` is between 20 and 40 for boxes from -60 to -20.
-        let part = Len::from_parts(Rel::from_f32(-0.5), Px::from_int(10));
-        let holds = Holds::from(Px::from_int(20)..=Px::from_int(40)).through(part);
-        assert!(holds.contains(Px::from_int(-60)) && holds.contains(Px::from_int(-20)));
-        assert!(!holds.contains(Px::from_int(-61)) && !holds.contains(Px::from_int(-19)));
-    }
-
-    /// The case the widening is for: a part that holds only for the length it
-    /// was drawn at has to hold for the box it was drawn in, and a third of a
-    /// box is not a whole number of steps.
-    #[test]
-    fn a_part_maps_back_onto_the_box_it_was_measured_in() {
-        let part = Len::from_parts(Rel::from_f32(1.0 / 3.0), Px::from_int(-146));
-        for box_len in (440..460).map(Px::from_int) {
-            let holds = Holds::at(part.to_px(box_len)).through(part);
-            assert!(holds.contains(box_len), "{box_len:?} left out by {holds:?}");
-        }
-    }
-
-    /// A widget handed the whole of its parent's box, with or without pixels
-    /// taken off it, has no fraction to invert: multiplying by one is exact
-    /// and taking the pixels off again is too, so the box maps back to
-    /// itself. Allowing for anything here compounded a step a level down a
-    /// chain of widgets each taking the whole of its parent.
-    #[test]
-    fn the_whole_of_a_box_maps_back_to_itself() {
-        let at = Px::from_int(956);
-        assert_eq!(Holds::at(at).through(Len::FULL), Holds::at(at));
-        let less_eight = Len::from_parts(Rel::ONE, Px::from_int(-8));
-        assert_eq!(
-            Holds::at(at).through(less_eight),
-            Holds::at(at + Px::from_int(8))
-        );
-    }
-
-    /// The range is the exact preimage at both ends, so a box one step
-    /// outside it really does give a length outside this range. What a wider
-    /// range costs is a drawing reused where it does not hold.
-    #[test]
-    fn a_box_one_step_outside_the_range_is_outside_it() {
-        let part = Len::from_parts(Rel::from_f32(1.0 / 3.0), Px::from_int(-146));
-        let at = Px::from_int(300);
-        let holds = Holds::at(at).through(part);
-        for inside in [holds.lo, holds.hi] {
-            assert_eq!(part.to_px(inside), at, "{inside:?} left out of {holds:?}");
-        }
-        for outside in [holds.lo.next_down(), holds.hi.next_up()] {
-            assert_ne!(part.to_px(outside), at, "{outside:?} admitted by {holds:?}");
-        }
-    }
-
-    /// A truncating multiply only ever drops, so the step it needs allowing
-    /// for on the way in belongs at the top of the range and not the bottom.
-    #[test]
-    fn a_fraction_widens_further_up_than_down() {
-        let half = Len::from_parts(Rel::from_f32(0.5), Px::ZERO);
-        let holds = Holds::at(Px::from_int(100)).through(half);
-        let box_len = Px::from_int(200);
-        assert!(holds.hi - box_len > box_len - holds.lo, "{holds:?}");
-    }
-
-    #[test]
-    fn a_boundary_the_next_step_along_does_not_admit_it() {
-        let boundary = Px::from_int(10);
-        let above = Holds::from(boundary.next_up()..=Px::MAX);
-        assert!(!above.contains(boundary));
-        assert!(above.contains(boundary.next_up()));
-    }
-}

core/src/ui/layout_holds.rs

@@ -1,108 +0,0 @@
-use crate::util::impl_axis_index;
-use crate::{Axis, Holds, Len, Px, PxVec2, UiRegion, UiVec2};
-
-/// 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.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct LayoutHolds {
-    pub x: AxisHolds,
-    pub y: AxisHolds,
-}
-
-impl LayoutHolds {
-    pub const ANY: Self = Self {
-        x: AxisHolds::ANY,
-        y: AxisHolds::ANY,
-    };
-
-    pub fn and(&self, other: Self) -> Self {
-        Self {
-            x: self.x.and(other.x),
-            y: self.y.and(other.y),
-        }
-    }
-
-    pub fn covers(&self, other: Self) -> bool {
-        self.x.covers(other.x) && self.y.covers(other.y)
-    }
-
-    pub fn contains(&self, window: PxVec2, rel_base: UiVec2, region: UiRegion) -> bool {
-        Axis::BOTH
-            .into_iter()
-            .all(|axis| self[axis].contains(window[axis], rel_base[axis], region[axis].len()))
-    }
-}
-
-impl_axis_index!(LayoutHolds => AxisHolds);

core/src/ui/mod.rs

@@ -1,26 +1,13 @@
 use crate::{
-    Mask, MoveIdx, MoveOffset, PrimitiveRegistry, TextData, Textures, UiRegion, WeakWidget,
+    Mask, PrimitiveRegistry, TextData, Textures, WeakWidget, WidgetId, Widgets, util::TrackedArena,
-    WidgetId, Widgets,
-    util::{Arena, Id, TrackedArena},
 };
 
-/// How far the shader will walk a move chain. It bounds a malformed cycle
-/// rather than any real tree; `Moves::resolve` uses the same number so the
-/// two agree on what a deep tree resolves to.
-pub const CHAIN_LIMIT: u32 = 64;
-
 mod active;
-mod holds;
-mod layout_holds;
 mod painter;
-mod place;
 mod render_state;
 
 pub use active::*;
-pub use holds::*;
-pub use layout_holds::*;
 pub use painter::{Painter, PrimitiveLike};
-pub use place::{PlaceDesc, PlaceDescAxis, PlaceFit, RetainedPrimitive};
 pub use render_state::*;
 
 #[derive(Default)]
@@ -33,94 +20,6 @@ pub struct UiData {
     pub masks: TrackedArena<Mask, u32>,
 }
 
-/// Where each widget's drawing sits relative to its parent's slot, so moving
-/// a subtree writes one entry rather than every descendant's primitives.
-#[derive(Default)]
-pub struct Moves {
-    arena: Arena<MoveOffset, u32>,
-    pub changed: bool,
-}
-
-impl Moves {
-    pub fn push(&mut self, parent: MoveIdx, region: UiRegion) -> MoveIdx {
-        self.changed = true;
-        MoveIdx::slot(self.arena.push(MoveOffset::new(parent, region)).idx())
-    }
-
-    /// Re-points a slot at a different parent, for a widget drawn somewhere
-    /// else in the tree than it was.
-    pub fn set_parent(&mut self, idx: MoveIdx, parent: MoveIdx) {
-        let entry = self.arena.get_mut(Id::preset(idx.idx() as u32));
-        if entry.parent != parent {
-            entry.parent = parent;
-            self.changed = true;
-        }
-    }
-
-    pub fn remove(&mut self, idx: MoveIdx) {
-        self.changed = true;
-        self.arena.remove(Id::preset(idx.idx() as u32));
-    }
-
-    /// Sets the box a slot's contents are placed within, itself given in the
-    /// coordinates of its parent slot.
-    pub fn set(&mut self, idx: MoveIdx, region: UiRegion) {
-        let entry = self.arena.get_mut(Id::preset(idx.idx() as u32));
-        if entry.region != region {
-            entry.region = region;
-            self.changed = true;
-        }
-    }
-
-    /// The same walk the vertex shader does, in the same `Len` the shader is
-    /// handed, for asking where a drawing will actually land -- hit testing,
-    /// and nothing layout decides on. Layout threads its lengths down the
-    /// draw instead, so no box it compares is composed back up this chain.
-    pub fn resolve(&self, idx: MoveIdx, local: UiRegion) -> UiRegion {
-        let mut region = local;
-        self.walk(idx, |entry| region = region.within(entry));
-        region
-    }
-
-    fn walk(&self, idx: MoveIdx, mut step: impl FnMut(&UiRegion)) {
-        let mut at = idx;
-        for _ in 0..CHAIN_LIMIT {
-            if at == MoveIdx::NONE {
-                return;
-            }
-            let entry = &self.arena[at.idx()];
-            step(&entry.region);
-            at = entry.parent;
-        }
-        debug_assert!(
-            at == MoveIdx::NONE,
-            "a move chain longer than {CHAIN_LIMIT} resolves to the wrong place, \
-             and the shader stops at the same depth"
-        );
-    }
-
-    /// How many slots a region in `idx` is composed through, which is what
-    /// the shader's walk costs per primitive.
-    pub fn depth(&self, idx: MoveIdx) -> usize {
-        let mut depth = 0;
-        let mut at = idx;
-        while at != MoveIdx::NONE && depth < CHAIN_LIMIT as usize {
-            at = self.arena[at.idx()].parent;
-            depth += 1;
-        }
-        depth
-    }
-
-    pub fn entries(&self) -> &[MoveOffset] {
-        &self.arena
-    }
-
-    pub fn clear(&mut self) {
-        self.changed = true;
-        self.arena = Arena::default();
-    }
-}
-
 pub trait UiRsc {
     fn ui(&self) -> &UiData;
     fn ui_mut(&mut self) -> &mut UiData;

core/src/ui/place.rs

@@ -1,234 +0,0 @@
-use crate::util::impl_axis_index;
-use crate::{Axis, AxisAlign, Len, PrimitiveHandle, RegionAlign, UiRegion, UiSpan, UiVec2};
-
-/// 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 {
-    pub span: PlaceSpan,
-    pub fit: PlaceFit,
-    pub rel_base: RelBase,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum PlaceFit {
-    Align,
-    Fill,
-    /// The parent has already evaluated the child's size request.
-    Allocated,
-}
-
-impl PlaceFit {
-    pub fn fills(self) -> bool {
-        self != Self::Align
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum PlaceSpan {
-    Within(UiSpan),
-    Shifted(UiSpan),
-    Sized(Len),
-}
-
-/// What a child's fractions are of. [`PlaceSpan::Sized`] is a length the
-/// caller named, which is always its own base, so nothing here constructs one
-/// beside anything but [`Self::Len`].
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub 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.fit = PlaceFit::Fill;
-        self
-    }
-
-    /// A final allocation, including any comparisons in the child's request.
-    pub const fn allocated(mut self) -> Self {
-        self.fit = PlaceFit::Allocated;
-        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 on_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
-    }
-
-    /// Where it lands in the coordinates `own` is in.
-    pub 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),
-        }
-    }
-}
-
-/// 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 from_axes(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
-    }
-
-    /// What a child's fractions on one axis are of, as a length of the
-    /// window: a length this place names, or the rel base of the widget
-    /// giving it, which is `parent_rel_base`.
-    pub(super) fn base(&self, axis: Axis, parent_rel_base: UiVec2) -> Len {
-        match self[axis].rel_base {
-            RelBase::Len(len) => len,
-            RelBase::Inherit | RelBase::WithRegion => parent_rel_base[axis],
-        }
-    }
-
-    /// The box each axis names, in the coordinates `own` is in.
-    pub 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),
-            fit: PlaceFit::Align,
-            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),
-            fit: PlaceFit::Align,
-            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),
-            fit: PlaceFit::Align,
-            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/arena.rs

@@ -34,10 +34,6 @@ impl<T, I: IdNum> Arena<T, I> {
         self.tracker.free(id);
         self.data[i]
     }
-
-    pub fn get_mut(&mut self, id: Id<I>) -> &mut T {
-        &mut self.data[id.idx()]
-    }
 }
 
 impl<T, I: IdNum> Default for Arena<T, I> {
@@ -75,11 +71,6 @@ impl<T, I: IdNum> TrackedArena<T, I> {
         self.refs[i.idx()] += 1;
     }
 
-    pub fn get_mut(&mut self, id: Id<I>) -> &mut T {
-        self.changed = true;
-        self.inner.get_mut(id)
-    }
-
     pub fn remove(&mut self, id: Id<I>) -> T
     where
         T: Copy,

core/src/util/math.rs

@@ -1,5 +1,6 @@
-pub const trait LerpUtil {
+pub const trait LerpUtil: Sized {
     fn lerp(self, from: Self, to: Self) -> Self;
+    fn lerp_inv(self, from: Self, to: Self) -> Option<Self>;
 }
 
 const impl LerpUtil for f32 {
@@ -8,6 +9,14 @@ const impl LerpUtil for f32 {
     fn lerp(self, from: Self, to: Self) -> Self {
         from + (to - from) * self
     }
+    /// inverse of lerp, and `None` where `from` and `to` are the same point:
+    /// every input lerps to it, so there is no one answer to come back to.
+    fn lerp_inv(self, from: Self, to: Self) -> Option<Self> {
+        match to == from {
+            true => None,
+            false => Some((self - from) / (to - from)),
+        }
+    }
 }
 
 macro_rules! impl_op {
@@ -56,34 +65,6 @@ macro_rules! impl_op {
             }
         }
     };
-    // Without the `f32` operations, for a type whose fields are not all the
-    // same kind of number: there is nothing a bare float means to a fraction
-    // and an offset at once.
-    (same $T:ident $op:ident $fn:ident $opa:ident $fna:ident; $($field:ident)*) => {
-        #[allow(non_snake_case)]
-        mod ${concat($T, _op_, $fn, _same_impl)} {
-            use super::*;
-            #[allow(unused_imports)]
-            use std::ops::*;
-            const impl $op for $T {
-                type Output = Self;
-
-                fn $fn(self, rhs: Self) -> Self::Output {
-                    Self {
-                        $($field: self.$field.$fn(rhs.$field),)*
-                    }
-                }
-            }
-            const impl $opa for $T {
-                fn $fna(&mut self, rhs: Self) {
-                    *self = self.$fn(rhs);
-                }
-            }
-        }
-    };
-    (same $T:ident $op:ident $fn:ident; $($field:ident)*) => {
-        impl_op!(same $T $op $fn ${concat($op,Assign)} ${concat($fn,_assign)}; $($field)*);
-    };
     ($T:ident $op:ident $fn:ident; $($field:ident)*) => {
         impl_op!($T $op $fn ${concat($op,Assign)} ${concat($fn,_assign)}; $($field)*);
     };
@@ -93,31 +74,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/util/slot.rs

@@ -1,4 +1,4 @@
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct SlotId {
     idx: u32,
     genr: u32,

core/src/util/trust.rs

@@ -1,3 +1,8 @@
+#[allow(clippy::missing_safety_doc)]
+pub(crate) unsafe fn forget_ref<'a, T>(x: &T) -> &'a T {
+    unsafe { std::mem::transmute::<&T, &T>(x) }
+}
+
 #[allow(clippy::missing_safety_doc)]
 pub(crate) unsafe fn forget_mut<'a, T>(x: &mut T) -> &'a mut T {
     unsafe { std::mem::transmute::<&mut T, &mut T>(x) }

core/src/util/vec2.rs

@@ -1,11 +1,7 @@
 use crate::util::impl_op;
 use std::{hash::Hash, ops::*};
 
-/// `align(8)` because that is WGSL's alignment for a `vec2<f32>`, so any GPU
+#[repr(C)]
-/// struct holding one is laid out the way its shader reads it without having
-/// to say so itself. Those structs still need a manual `unsafe impl Pod`,
-/// since the trailing padding this introduces is what `derive(Pod)` refuses.
-#[repr(C, align(8))]
 #[derive(Clone, Copy, PartialEq, Default, bytemuck::Pod, bytemuck::Zeroable)]
 pub struct Vec2 {
     pub x: f32,

core/src/widget/data.rs

@@ -1,11 +1,8 @@
-use crate::{RegionAlign, SizeRules, Widget};
+use crate::Widget;
 
 pub struct WidgetData {
     pub widget: Box<dyn Widget>,
     pub label: String,
-    pub(super) region_node: bool,
-    pub(super) size: SizeRules,
-    pub(super) align: RegionAlign,
     /// dynamic borrow checking
     pub borrowed: bool,
 }
@@ -19,9 +16,6 @@ impl WidgetData {
         Self {
             widget: Box::new(widget),
             label,
-            region_node: false,
-            size: SizeRules::default(),
-            align: RegionAlign::default(),
             borrowed: false,
         }
     }

core/src/widget/mod.rs

@@ -1,11 +1,9 @@
-use crate::{Axis, LayoutLen, Painter, Size};
+use crate::{Axis, Len, Painter, Size};
 use std::any::Any;
 
 mod data;
 mod handle;
 mod like;
-mod request;
-mod size_rule;
 mod tag;
 mod view;
 mod widgets;
@@ -13,28 +11,35 @@ mod widgets;
 pub use data::*;
 pub use handle::*;
 pub use like::*;
-pub use request::*;
-pub use size_rule::*;
 pub use tag::*;
 pub use view::*;
 pub use widgets::*;
 
+/// What may be done to a widget's drawing when the box it was given changes
+/// on this axis, instead of drawing it again. Asked per axis, because wrapped
+/// text reads the width it is offered and not the height.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub enum OnResize {
+    Scale,
+    Translate,
+    #[default]
+    Redraw,
+}
+
 pub trait Widget: Any {
     /// Draws the widget, and returns what it used of the box it was given.
     fn draw(&mut self, painter: &mut Painter) -> Size;
 
-    /// Describes an axis before painting. Return `None` when discovering it
-    /// needs a concrete box or work performed by `draw`.
-    fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
-        self.size_hint(axis).map(|len| requests.length(len))
-    }
-
     /// An exact length the widget can give without a painter or its children.
     /// Optional, and saves a draw rather than changing one: a hint that
     /// disagrees with the eventual draw fails a debug assertion.
-    fn size_hint(&self, _axis: Axis) -> Option<LayoutLen> {
+    fn size_hint(&self, _axis: Axis) -> Option<Len> {
         None
     }
+
+    fn on_resize(&self, _axis: Axis) -> OnResize {
+        OnResize::default()
+    }
 }
 
 impl Widget for () {
@@ -43,8 +48,12 @@ impl Widget for () {
         Size::default()
     }
 
-    fn size_hint(&self, _axis: Axis) -> Option<LayoutLen> {
+    fn size_hint(&self, _axis: Axis) -> Option<Len> {
-        Some(LayoutLen::default())
+        Some(Len::default())
+    }
+
+    fn on_resize(&self, _axis: Axis) -> OnResize {
+        OnResize::Scale
     }
 }
 

core/src/widget/request.rs

@@ -1,438 +0,0 @@
-use crate::{Axis, LayoutLen, Len, Px, StrongWidget, Weight, WidgetId, Widgets};
-
-impl<N: crate::UiNum> From<N> for SizeRequest {
-    fn from(value: N) -> Self {
-        LayoutLen::px(value).into()
-    }
-}
-
-impl LayoutLen {
-    pub fn min(self, other: impl Into<SizeRequest>) -> SizeRequest {
-        SizeRequest::from(self).min(other)
-    }
-
-    pub fn max(self, other: impl Into<SizeRequest>) -> SizeRequest {
-        SizeRequest::from(self).max(other)
-    }
-
-    pub fn clamp(self, min: impl Into<SizeRequest>, max: impl Into<SizeRequest>) -> SizeRequest {
-        SizeRequest::from(self).clamp(min, max)
-    }
-}
-
-/// A size request before a container has divided its leftover space.
-/// Comparisons keep both operands until the share is known.
-#[derive(Clone, Debug, PartialEq)]
-pub enum SizeRequest {
-    Linear(LayoutLen),
-    Sum(std::sync::Arc<(Self, Self)>),
-    Min(std::sync::Arc<(Self, Self)>),
-    Max(std::sync::Arc<(Self, Self)>),
-}
-
-impl From<LayoutLen> for SizeRequest {
-    fn from(len: LayoutLen) -> Self {
-        Self::Linear(len)
-    }
-}
-
-impl From<Len> for SizeRequest {
-    fn from(len: Len) -> Self {
-        LayoutLen::from(len).into()
-    }
-}
-
-impl SizeRequest {
-    pub fn min(self, other: impl Into<Self>) -> Self {
-        let other = other.into();
-        if let (Self::Linear(a), Self::Linear(b)) = (&self, &other)
-            && let Some(order) = independent_order(*a, *b)
-        {
-            return if !order.is_gt() { self } else { other };
-        }
-        if self == other {
-            self
-        } else {
-            Self::Min(std::sync::Arc::new((self, other)))
-        }
-    }
-
-    pub fn max(self, other: impl Into<Self>) -> Self {
-        let other = other.into();
-        if let (Self::Linear(a), Self::Linear(b)) = (&self, &other)
-            && let Some(order) = independent_order(*a, *b)
-        {
-            return if !order.is_lt() { self } else { other };
-        }
-        if self == other {
-            self
-        } else {
-            Self::Max(std::sync::Arc::new((self, other)))
-        }
-    }
-
-    pub fn clamp(self, min: impl Into<Self>, max: impl Into<Self>) -> Self {
-        self.max(min).min(max)
-    }
-}
-
-impl std::ops::Add for SizeRequest {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self {
-        match (self, other) {
-            (Self::Linear(a), Self::Linear(b)) => Self::Linear(a + b),
-            (a, b) => Self::Sum(std::sync::Arc::new((a, b))),
-        }
-    }
-}
-
-/// A discovered length. Deferred values belong to the current layout pass;
-/// widgets must not retain them. Ordinary requests remain inline lengths.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct RequestedLen(RequestValue);
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-enum RequestValue {
-    Linear(LayoutLen),
-    Deferred {
-        index: usize,
-        epoch: u64,
-        leftover: bool,
-    },
-}
-
-impl From<LayoutLen> for RequestedLen {
-    fn from(len: LayoutLen) -> Self {
-        Self(RequestValue::Linear(len))
-    }
-}
-impl From<Len> for RequestedLen {
-    fn from(len: Len) -> Self {
-        LayoutLen::from(len).into()
-    }
-}
-impl RequestedLen {
-    pub fn linear(self) -> Option<LayoutLen> {
-        match self.0 {
-            RequestValue::Linear(len) => Some(len),
-            _ => None,
-        }
-    }
-    pub fn has_leftover(self) -> bool {
-        match self.0 {
-            RequestValue::Linear(len) => len.leftover > Weight::ZERO,
-            RequestValue::Deferred { leftover, .. } => leftover,
-        }
-    }
-}
-
-#[derive(Clone, Copy)]
-enum Op {
-    Sum,
-    Min,
-    Max,
-}
-struct Node {
-    op: Op,
-    a: RequestedLen,
-    b: RequestedLen,
-}
-
-#[derive(Default)]
-pub(crate) struct RequestArena {
-    nodes: Vec<Node>,
-    epoch: u64,
-}
-
-impl RequestArena {
-    pub(crate) fn reset(&mut self) {
-        self.nodes.clear();
-        self.epoch = self
-            .epoch
-            .checked_add(1)
-            .expect("layout generation exhausted");
-    }
-    pub(crate) fn import(&mut self, request: &SizeRequest, base: Len) -> RequestedLen {
-        let (op, pair) = match request {
-            SizeRequest::Linear(len) => return len.within_len(base).into(),
-            SizeRequest::Sum(pair) => (Op::Sum, pair),
-            SizeRequest::Min(pair) => (Op::Min, pair),
-            SizeRequest::Max(pair) => (Op::Max, pair),
-        };
-        let a = self.import(&pair.0, base);
-        let b = self.import(&pair.1, base);
-        self.combine(op, a, b)
-    }
-    fn combine(&mut self, op: Op, a: RequestedLen, b: RequestedLen) -> RequestedLen {
-        if let (Some(x), Some(y)) = (a.linear(), b.linear()) {
-            if matches!(op, Op::Sum) {
-                return (x + y).into();
-            }
-            let order = independent_order(x, y);
-            if let Some(order) = order {
-                let take_a = match op {
-                    Op::Min => !order.is_gt(),
-                    _ => !order.is_lt(),
-                };
-                return if take_a { a } else { b };
-            }
-        }
-        if a == b && !matches!(op, Op::Sum) {
-            return a;
-        }
-        let index = self.nodes.len();
-        self.nodes.push(Node { op, a, b });
-        RequestedLen(RequestValue::Deferred {
-            index,
-            epoch: self.epoch,
-            leftover: a.has_leftover() || b.has_leftover(),
-        })
-    }
-    pub(crate) fn minimum(&self, request: RequestedLen, window: Px) -> Px {
-        Px::from_raw(self.segment(request, Ratio::ZERO, window).fixed as i32)
-    }
-    fn segment(&self, request: RequestedLen, at: Ratio, window: Px) -> Segment {
-        match request.0 {
-            RequestValue::Linear(len) => {
-                assert!(
-                    len.leftover >= Weight::ZERO,
-                    "a leftover weight cannot be negative"
-                );
-                Segment {
-                    fixed: i64::from(len.without_leftover().to_px(window).raw()),
-                    weight: i64::from(len.leftover.raw()),
-                    end: None,
-                }
-            }
-            RequestValue::Deferred { index, epoch, .. } => {
-                assert_eq!(epoch, self.epoch, "request retained beyond its layout pass");
-                let Node { op, a, b } = self.nodes[index];
-                let a = self.segment(a, at, window);
-                let b = self.segment(b, at, window);
-                if matches!(op, Op::Sum) {
-                    return a + b;
-                }
-                // At a crossing choose the branch to its right, so the next
-                // iteration advances rather than selecting that crossing again.
-                let order = a.value(at).cmp(&b.value(at)).then(a.weight.cmp(&b.weight));
-                let take_a = match op {
-                    Op::Min => !order.is_gt(),
-                    _ => !order.is_lt(),
-                };
-                let mut selected = if take_a { a } else { b };
-                selected.end = first(a.end, b.end);
-                if a.weight != b.weight {
-                    let crossing = Ratio::new(b.fixed - a.fixed, a.weight - b.weight);
-                    if crossing > at {
-                        selected.end = first(selected.end, Some(crossing));
-                    }
-                }
-                selected
-            }
-        }
-    }
-    /// Allocates one scope of nonnegative shares. Floors can overflow; caps
-    /// can leave unused room. Prefix rounding keeps adjacent slot edges equal.
-    pub(crate) fn allocate<'a>(
-        &'a self,
-        requests: &'a [RequestedLen],
-        room: Px,
-        window: Px,
-    ) -> impl Iterator<Item = Px> + 'a {
-        let mut at = Ratio::ZERO;
-        loop {
-            let total = requests.iter().fold(Segment::ZERO, |total, request| {
-                total + self.segment(*request, at, window)
-            });
-            if total.value(at) >= i128::from(room.raw()) * i128::from(at.den) {
-                break;
-            }
-            if total.weight != 0 {
-                let solution = Ratio::new(i64::from(room.raw()) - total.fixed, total.weight);
-                if total.end.is_none_or(|end| solution <= end) {
-                    at = solution;
-                    break;
-                }
-            }
-            match total.end {
-                Some(end) => at = end,
-                None => break,
-            }
-        }
-        let mut prefix = 0_i128;
-        let mut previous = 0_i128;
-        requests.iter().map(move |request| {
-            prefix += self.segment(*request, at, window).value(at);
-            let den = i128::from(at.den);
-            let edge = prefix.signum() * ((prefix.abs() + den / 2) / den);
-            let len = Px::from_raw((edge - previous) as i32);
-            previous = edge;
-            len
-        })
-    }
-}
-
-#[derive(Clone, Copy, Debug, Eq)]
-struct Ratio {
-    num: i64,
-    den: i64,
-}
-
-impl PartialEq for Ratio {
-    fn eq(&self, other: &Self) -> bool {
-        self.cmp(other).is_eq()
-    }
-}
-
-impl Ratio {
-    const ZERO: Self = Self { num: 0, den: 1 };
-
-    fn new(num: i64, den: i64) -> Self {
-        assert_ne!(den, 0);
-        if den < 0 {
-            Self {
-                num: -num,
-                den: -den,
-            }
-        } else {
-            Self { num, den }
-        }
-    }
-}
-
-impl Ord for Ratio {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        (i128::from(self.num) * i128::from(other.den))
-            .cmp(&(i128::from(other.num) * i128::from(self.den)))
-    }
-}
-
-impl PartialOrd for Ratio {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-#[derive(Clone, Copy)]
-struct Segment {
-    fixed: i64,
-    weight: i64,
-    end: Option<Ratio>,
-}
-
-impl Segment {
-    const ZERO: Self = Self {
-        fixed: 0,
-        weight: 0,
-        end: None,
-    };
-
-    fn value(self, at: Ratio) -> i128 {
-        i128::from(self.fixed) * i128::from(at.den) + i128::from(self.weight) * i128::from(at.num)
-    }
-}
-
-impl std::ops::Add for Segment {
-    type Output = Self;
-    fn add(self, other: Self) -> Self {
-        Self {
-            fixed: self.fixed + other.fixed,
-            weight: self.weight + other.weight,
-            end: first(self.end, other.end),
-        }
-    }
-}
-
-fn first(a: Option<Ratio>, b: Option<Ratio>) -> Option<Ratio> {
-    match (a, b) {
-        (Some(a), Some(b)) => Some(a.min(b)),
-        (a, b) => a.or(b),
-    }
-}
-
-/// Read-only discovery of requests through a widget's children. A request is
-/// expressed in window lengths; `rel_base` supplies the base for declarations.
-pub struct SizeRequests<'a> {
-    pub(crate) arena: &'a mut RequestArena,
-    pub(crate) measured: Option<&'a crate::util::HashMap<WidgetId, crate::ActiveData>>,
-    pub(crate) widgets: &'a Widgets,
-    pub(crate) dependencies: &'a mut Vec<WidgetId>,
-    pub(crate) rel_base: Len,
-}
-
-impl SizeRequests<'_> {
-    pub fn sum(&mut self, a: RequestedLen, b: RequestedLen) -> RequestedLen {
-        self.arena.combine(Op::Sum, a, b)
-    }
-    pub fn min(&mut self, a: RequestedLen, b: RequestedLen) -> RequestedLen {
-        self.arena.combine(Op::Min, a, b)
-    }
-    pub fn max(&mut self, a: RequestedLen, b: RequestedLen) -> RequestedLen {
-        self.arena.combine(Op::Max, a, b)
-    }
-
-    pub fn widget<W: ?Sized>(
-        &mut self,
-        child: &StrongWidget<W>,
-        axis: Axis,
-    ) -> Option<RequestedLen> {
-        self.dependencies.push(child.id());
-        let rules = self.widgets.size_rules(child.id());
-        let rule = &rules[axis];
-        if let crate::SizeRule::Request(request) = rule {
-            return Some(self.arena.import(request, self.rel_base));
-        }
-        if let Some(exact) = rule.exact() {
-            return Some(exact.within_len(self.rel_base).into());
-        }
-        let widget = self.widgets.get_dyn(child.id())?;
-        let request = widget.size_request(self, axis).or_else(|| {
-            self.measured?
-                .get(&child.id())?
-                .measured()
-                .map(|size| size[axis].into())
-        })?;
-        Some(self.bounded(request, rule.bound()))
-    }
-
-    pub(crate) fn bounded(&mut self, request: RequestedLen, bound: crate::Bound) -> RequestedLen {
-        let bound = bound.within_len(self.rel_base);
-        let request = match bound.min {
-            Some(min) => self.max(request, min.into()),
-            None => request,
-        };
-        match bound.max {
-            Some(max) => self.min(request, max.into()),
-            None => request,
-        }
-    }
-
-    pub fn length(&self, len: LayoutLen) -> RequestedLen {
-        len.within_len(self.rel_base).into()
-    }
-
-    pub fn inset<W: ?Sized>(
-        &mut self,
-        child: &StrongWidget<W>,
-        axis: Axis,
-        padding: Px,
-    ) -> Option<RequestedLen> {
-        let base = self.rel_base;
-        self.rel_base.px -= padding;
-        let request = self.widget(child, axis);
-        self.rel_base = base;
-        request.map(|request| self.sum(request, Len::from_parts(crate::Rel::ZERO, padding).into()))
-    }
-}
-
-// Equal fractions keep this valid even when padding makes a rel base negative.
-fn independent_order(a: LayoutLen, b: LayoutLen) -> Option<std::cmp::Ordering> {
-    if a.rel == b.rel && a.leftover == b.leftover {
-        Some(a.px.cmp(&b.px))
-    } else if a.px == b.px && a.rel == b.rel {
-        Some(a.leftover.cmp(&b.leftover))
-    } else {
-        None
-    }
-}

core/src/widget/size_rule.rs

@@ -1,229 +0,0 @@
-use crate::util::impl_axis_index;
-use crate::{Axis, LayoutLen, Len, Rel, SizeRequest};
-
-/// 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.
-///
-/// A rule and a drawn size are not two opinions to reconcile: a rule wins on
-/// the axis it names, and the `Size` returned by `draw` answers only the axes
-/// with no rule. That is what lets a span divide its space around a length
-/// nobody has drawn yet, and it is why a rule lives beside the widget rather
-/// than inside it -- the widget under the rule never has to know about it.
-///
-/// Exact expressions can bound a share before allocation. Bounds on an
-/// intrinsic answer are applied after that answer becomes known.
-#[derive(Debug, Clone, PartialEq, Default)]
-pub enum SizeRule {
-    /// Whatever the widget reports from drawing.
-    #[default]
-    Free,
-    /// This length, whatever the widget reports.
-    Exact(LayoutLen),
-    /// An exact request whose comparisons await the parent's allocation.
-    Request(std::sync::Arc<SizeRequest>),
-    /// At least this long, and otherwise whatever the box gives it.
-    Min(Len),
-    /// At most this long.
-    Max(Len),
-    /// Between the two.
-    Clamp { min: Len, max: Len },
-}
-
-impl SizeRule {
-    /// What this rule allows the length to be where it does not give one
-    /// outright.
-    pub fn bound(&self) -> Bound {
-        match *self {
-            Self::Free | Self::Exact(_) | Self::Request(_) => Bound::ANY,
-            Self::Min(min) => Bound {
-                min: Some(min),
-                max: None,
-            },
-            Self::Max(max) => Bound {
-                min: None,
-                max: Some(max),
-            },
-            Self::Clamp { min, max } => Bound {
-                min: Some(min),
-                max: Some(max),
-            },
-        }
-    }
-
-    /// Whether what this rule says is a fraction of the rel base, so that
-    /// the same rule against a different one is a different length.
-    pub fn has_fraction(&self) -> bool {
-        let bound = self.bound();
-        self.exact().is_some_and(|len| len.rel != Rel::ZERO)
-            || [bound.min, bound.max]
-                .iter()
-                .flatten()
-                .any(|len| len.rel != Rel::ZERO)
-    }
-
-    /// This rule with a floor under it, which is the whole of it where there
-    /// was no rule.
-    pub fn at_least(&self, min: Len) -> Self {
-        match *self {
-            Self::Free | Self::Min(_) => Self::Min(min),
-            Self::Max(max) | Self::Clamp { max, .. } => Self::Clamp { min, max },
-            Self::Request(ref request) => request.as_ref().clone().max(min).into(),
-            Self::Exact(len) => len.max(min).into(),
-        }
-    }
-
-    /// This rule with a cap over it, which is the whole of it where there was
-    /// no rule.
-    pub fn at_most(&self, max: Len) -> Self {
-        match *self {
-            Self::Free | Self::Max(_) => Self::Max(max),
-            Self::Min(min) | Self::Clamp { min, .. } => Self::Clamp { min, max },
-            Self::Request(ref request) => request.as_ref().clone().min(max).into(),
-            Self::Exact(len) => len.min(max).into(),
-        }
-    }
-
-    /// 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(|len| len.declared())
-    }
-
-    /// The length this rule gives outright, whatever the widget reports --
-    /// which makes the widget's answer on that axis moot. A share counts: it
-    /// is a length the widget's parent still has to divide, so it is exact
-    /// here and resolved there, unlike `declared`, which is only the ones
-    /// that give a box directly.
-    pub fn exact(&self) -> Option<LayoutLen> {
-        match self {
-            Self::Exact(len) => Some(*len),
-            Self::Free | Self::Request(_) | Self::Min(_) | Self::Max(_) | Self::Clamp { .. } => {
-                None
-            }
-        }
-    }
-}
-
-/// What a rule allows a length to be where it does not give one outright: a
-/// floor, a cap, or both. Each is a length of the rel base the widget is
-/// asked with, which is the base a declared length is a fraction of too.
-///
-/// A bound is a [`Len`]. Comparisons involving shares are [`SizeRequest`]s.
-#[derive(Debug, Clone, Copy, PartialEq, Default)]
-pub struct Bound {
-    pub min: Option<Len>,
-    pub max: Option<Len>,
-}
-
-/// Which end of a bound a length fell outside.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Outside {
-    Shorter,
-    Longer,
-}
-
-impl Bound {
-    /// Every length.
-    pub const ANY: Self = Self {
-        min: None,
-        max: None,
-    };
-
-    /// The end [`Outside`] names, which is the length a widget outside it
-    /// gets instead of its own.
-    pub fn at(&self, outside: Outside) -> Len {
-        let end = match outside {
-            Outside::Shorter => self.min,
-            Outside::Longer => self.max,
-        };
-        end.expect("an end nothing is outside of")
-    }
-
-    /// This bound as lengths of the window, from lengths of a rel base that
-    /// long.
-    pub fn within_len(&self, len: Len) -> Self {
-        Self {
-            min: self.min.map(|min| min.within_len(len)),
-            max: self.max.map(|max| max.within_len(len)),
-        }
-    }
-}
-
-/// One bound per axis, as [`SizeRules`] is one rule per axis.
-#[derive(Debug, Clone, Copy, PartialEq, Default)]
-pub struct Bounds {
-    pub x: Bound,
-    pub y: Bound,
-}
-
-impl Bounds {
-    pub const ANY: Self = Self {
-        x: Bound::ANY,
-        y: Bound::ANY,
-    };
-
-    pub fn from_axes(f: impl Fn(Axis) -> Bound) -> Self {
-        Self {
-            x: f(Axis::X),
-            y: f(Axis::Y),
-        }
-    }
-}
-
-impl_axis_index!(Bounds => Bound);
-
-impl From<LayoutLen> for SizeRule {
-    fn from(len: LayoutLen) -> Self {
-        Self::Exact(len)
-    }
-}
-
-impl From<SizeRequest> for SizeRule {
-    fn from(request: SizeRequest) -> Self {
-        match request {
-            SizeRequest::Linear(len) => Self::Exact(len),
-            request => Self::Request(std::sync::Arc::new(request)),
-        }
-    }
-}
-
-impl From<Option<LayoutLen>> for SizeRule {
-    fn from(len: Option<LayoutLen>) -> Self {
-        len.map_or(Self::Free, Self::Exact)
-    }
-}
-
-/// One rule per axis, which is how a widget carries a length on one axis and
-/// leaves the other to whatever it draws.
-#[derive(Debug, Clone, PartialEq, Default)]
-pub struct SizeRules {
-    pub x: SizeRule,
-    pub y: SizeRule,
-}
-
-impl_axis_index!(SizeRules => SizeRule);
-
-/// 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 from_axes(f: impl Fn(Axis) -> Option<Len>) -> Self {
-        Self {
-            x: f(Axis::X),
-            y: f(Axis::Y),
-        }
-    }
-}
-
-impl_axis_index!(Declared => Option<Len>);

core/src/widget/widgets.rs

@@ -1,8 +1,7 @@
 use std::sync::mpsc::{Receiver, Sender, channel};
 
 use crate::{
-    Axis, AxisAlign, IdLike, Len, RegionAlign, SizeRule, SizeRules, StrongWidget, WeakWidget,
+    IdLike, StrongWidget, WeakWidget, Widget, WidgetData, WidgetId,
-    Widget, WidgetData, WidgetId,
     util::{DynBorrower, HashSet, SlotVec, forget_mut, to_mut},
 };
 
@@ -30,14 +29,6 @@ impl Widgets {
         !self.needs_redraw.is_empty()
     }
 
-    /// Marks this widget for the next frame to draw again, with nothing about
-    /// it changed. Taking a widget mutably marks it too, which is the ordinary
-    /// content-change signal; this is for a change the borrow cannot express,
-    /// and for asking for the same tree over again.
-    pub fn mark_for_redraw(&mut self, id: impl IdLike) {
-        self.needs_redraw.insert(id.id());
-    }
-
     pub fn get_dyn(&self, id: WidgetId) -> Option<&dyn Widget> {
         Some(self.vec.get(id)?.widget.as_ref())
     }
@@ -49,14 +40,14 @@ impl Widgets {
 
     /// get_dyn but dynamic borrow checking of widgets
     /// lets you do recursive (tree) operations, like the painter does
-    pub(crate) fn get_dyn_dynamic<'a>(&self, id: WidgetId) -> DynBorrower<'a, dyn Widget> {
+    pub(crate) fn get_dyn_dynamic<'a>(&self, id: WidgetId) -> WidgetWrapper<'a> {
         // SAFETY: must guarantee no other mutable references to this widget exist
         // done through the borrow variable
         let data = unsafe { forget_mut(to_mut(self.vec.get(id).unwrap())) };
         if data.borrowed {
             panic!("tried to mutably borrow the same widget twice");
         }
-        DynBorrower::new(data.widget.as_mut(), &mut data.borrowed)
+        WidgetWrapper::new(data.widget.as_mut(), &mut data.borrowed)
     }
 
     pub fn get<I: IdLike>(&self, id: &I) -> Option<&I::Widget>
@@ -109,87 +100,6 @@ impl Widgets {
         self.data_mut(id.id()).unwrap().label = label;
     }
 
-    /// Whether this widget owns a movable retained region.
-    pub fn is_region_node(&self, id: impl IdLike) -> bool {
-        self.data(id).unwrap().region_node
-    }
-
-    /// Chooses whether this widget's retained drawing has one movable region
-    /// of its own. Changing the boundary redraws the subtree once so every
-    /// primitive names the right coordinate space.
-    pub fn set_region_node(&mut self, id: impl IdLike, region_node: bool) {
-        let id = id.id();
-        let data = self.data_mut(id).unwrap();
-        if data.region_node == region_node {
-            return;
-        }
-        data.region_node = region_node;
-        self.needs_redraw.insert(id);
-    }
-
-    /// The length rules whoever draws this widget applies to its box.
-    pub fn size_rules(&self, id: impl IdLike) -> SizeRules {
-        self.data(id).unwrap().size.clone()
-    }
-
-    /// Sets one axis's rule. The widget is marked rather than its parent
-    /// because the parent is not known here; `redraw` escalates a changed
-    /// declared length to whoever resolves it.
-    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 {
-            return;
-        }
-        data.size[axis] = rule;
-        self.needs_redraw.insert(id);
-    }
-
-    /// Puts a floor under this widget's length on one axis, keeping a cap it
-    /// already had. See [`SizeRule::at_least`].
-    pub fn set_min_len(&mut self, id: impl IdLike, axis: Axis, min: Len) {
-        let id = id.id();
-        let rule = self.size_rules(id)[axis].at_least(min);
-        self.set_size_rule(id, axis, rule);
-    }
-
-    /// Puts a cap over it, keeping a floor it already had. See
-    /// [`SizeRule::at_most`].
-    pub fn set_max_len(&mut self, id: impl IdLike, axis: Axis, max: Len) {
-        let id = id.id();
-        let rule = self.size_rules(id)[axis].at_most(max);
-        self.set_size_rule(id, axis, rule);
-    }
-
-    /// Where this widget sits in a box longer than the length it takes.
-    pub fn alignment(&self, id: impl IdLike) -> RegionAlign {
-        self.data(id).unwrap().align
-    }
-
-    /// Sets one axis's alignment. Which box a widget ends up in is its
-    /// parent's to decide, so this is escalated the way a length rule is.
-    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 {
-            return;
-        }
-        data.align[axis] = align;
-        self.needs_redraw.insert(id);
-    }
-
-    /// Both axes at once.
-    pub fn set_size_rules(
-        &mut self,
-        id: impl IdLike,
-        x: impl Into<SizeRule>,
-        y: impl Into<SizeRule>,
-    ) {
-        let id = id.id();
-        self.set_size_rule(id, Axis::X, x.into());
-        self.set_size_rule(id, Axis::Y, y.into());
-    }
-
     pub fn data_mut(&mut self, id: impl IdLike) -> Option<&mut WidgetData> {
         self.vec.get_mut(id.id())
     }
@@ -212,6 +122,8 @@ impl Default for Widgets {
     }
 }
 
+pub type WidgetWrapper<'a> = DynBorrower<'a, dyn Widget>;
+
 impl<I: IdLike> std::ops::Index<I> for Widgets
 where
     I::Widget: Sized + Widget,

examples/random.rs

@@ -1,31 +0,0 @@
-//! The seeded random tree `tests/generated.rs` checks, drawn so it can be
-//! looked at. `IRIS_SEED` and `IRIS_DEPTH` choose which one.
-
-use iris::prelude::*;
-use iris::random::Edits;
-
-fn env(name: &str, fallback: u64) -> u64 {
-    std::env::var(name)
-        .ok()
-        .and_then(|v| v.parse().ok())
-        .unwrap_or(fallback)
-}
-
-fn main() {
-    DefaultApp::<State>::run();
-}
-
-#[derive(DefaultUiState)]
-struct State {
-    ui_state: DefaultUiState,
-}
-
-impl DefaultAppState for State {
-    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>, _: Proxy<Self>) -> Self {
-        let seed = env("IRIS_SEED", 1);
-        let depth = env("IRIS_DEPTH", 4) as usize;
-        let (root, _) = iris::random::grow(rsc, seed, depth, &Edits::default());
-        ui_state.set_root(root);
-        Self { ui_state }
-    }
-}

examples/tabs/main.rs

@@ -20,26 +20,22 @@ impl DefaultAppState for Client {
         let pad_test = (
             rrect.color(Color::BLUE),
             (
-                // The square is one widget and the two shares of the row it
-                // sits centred in are another: a length is a property of a
-                // widget, so `.width` here would overwrite the `.sized`.
                 rrect
                     .color(Color::RED)
                     .sized((100, 100))
                     .center()
-                    .wrapper()
+                    .width(rest(2)),
-                    .width(leftover(2)),
                 (
                     rrect.color(Color::ORANGE),
                     rrect.color(Color::LIME).pad(10.0),
                 )
                     .span(Dir::RIGHT)
-                    .width(leftover(2)),
+                    .width(rest(2)),
                 rrect.color(Color::YELLOW),
             )
                 .span(Dir::RIGHT)
                 .pad(10)
-                .width(leftover(3)),
+                .width(rest(3)),
         )
             .span(Dir::RIGHT)
             .add(rsc);
@@ -125,11 +121,11 @@ impl DefaultAppState for Client {
             .add(rsc);
 
         let text_edit_scroll = (
-            msg_area.height(leftover(1)),
+            msg_area.height(rest(1)),
             (
                 Rect::new(Color::WHITE.darker(0.9)),
                 (
-                    add_text.width(leftover(1)),
+                    add_text.width(rest(1)),
                     Rect::new(Color::GREEN)
                         .on(CursorSense::click(), move |ctx, rsc: &mut ClientRsc| {
                             rsc.run_event::<Submit>(add_text, (), ctx.state);
@@ -147,7 +143,7 @@ impl DefaultAppState for Client {
             .span(Dir::DOWN)
             .add(rsc);
 
-        let main = Wrapper::new().add(rsc);
+        let main = WidgetPtr::new().add(rsc);
 
         let vals = Rc::new(RefCell::new((0, Vec::new())));
         let mut switch_button = |color, to: WeakWidget, label| {

examples/text.rs

@@ -28,14 +28,10 @@ impl DefaultAppState for State {
             .pad(16)
             .background(panel());
 
-        // Each one takes the whole width, because `text_align` puts the
-        // glyphs somewhere in the box the text is given and a text that
-        // reports the width of its own glyphs is given exactly that.
-        let label = |text: &str, align| wtext(text).size(24).text_align(align).width(rel(1.0));
         let aligned = (
-            label("left", Align::LEFT),
+            wtext("left").size(24).text_align(Align::LEFT),
-            label("centred", Align::H_CENTER),
+            wtext("centred").size(24).text_align(Align::CENTER),
-            label("right", Align::RIGHT),
+            wtext("right").size(24).text_align(Align::RIGHT),
         )
             .span(Dir::DOWN)
             .gap(8)

macro/src/lib.rs

@@ -18,7 +18,6 @@ struct Input {
 }
 
 struct InputFn {
-    attrs: Vec<Attribute>,
     sig: Signature,
     body: Block,
 }
@@ -33,10 +32,9 @@ impl Parse for Input {
         input.parse::<Token![;]>()?;
         let mut fns = Vec::new();
         while !input.is_empty() {
-            let attrs = input.call(Attribute::parse_outer)?;
             let sig = input.parse()?;
             let body = input.parse()?;
-            fns.push(InputFn { attrs, sig, body })
+            fns.push(InputFn { sig, body })
         }
         if !input.is_empty() {
             input.error("function expected");
@@ -61,15 +59,10 @@ pub fn widget_trait(input: TokenStream) -> TokenStream {
         fns,
     } = parse_macro_input!(input as Input);
 
-    // What a method says about itself belongs on the trait, where a reader
+    let sigs: Vec<_> = fns.iter().map(|f| f.sig.clone()).collect();
-    // looks it up; the implementation is the same text and says it again.
-    let sigs: Vec<_> = fns
-        .iter()
-        .map(|InputFn { attrs, sig, .. }| quote! { #(#attrs)* #sig })
-        .collect();
     let impls: Vec<_> = fns
         .iter()
-        .map(|InputFn { attrs, sig, body }| quote! { #(#attrs)* #sig #body })
+        .map(|InputFn { sig, body }| quote! { #sig #body })
         .collect();
 
     let Some(GenericParam::Type(state)) = generics.params.first() else {

scripts/run-headless.sh

@@ -17,10 +17,6 @@
 # custom one would otherwise inherit the other's output and quietly screenshot
 # the wrong size.
 #
-# `--resize WxH@Hz` changes the output under the app once it is up, then
-# screenshots. A resize is its own case: what it has to match is a cold start
-# at that size, byte for byte, and nothing in `cargo test` can see it.
-#
 # `--replay FILE` drives a `.touch` recording into the window through
 # `replay-touch`, which reads it with the same parser `iris::harness` uses. A
 # recording is `<ms> down|move|up <x> <y>` in the output's own pixels. With
@@ -50,7 +46,6 @@ run="${XDG_RUNTIME_DIR:-/tmp}/iris-headless"
 seconds=3
 shot=""
 replay=""
-resize=""
 example=""
 kind=example
 mode=1920x1200@60Hz
@@ -62,14 +57,13 @@ while [ $# -gt 0 ]; do
         --seconds) seconds=$2; shift 2 ;;
         --bin) kind=bin; shift ;;
         --mode) mode=$2; shift 2 ;;
-        --resize) resize=$2; shift 2 ;;
         --replay) replay=$2; shift 2 ;;
         --dir) workdir=$(cd "$2" && pwd); shift 2 ;;
         --) shift; break ;;
         *) example=$1; shift ;;
     esac
 done
-[ -n "$example" ] || { echo "usage: $0 NAME [--bin] [--dir DIR] [--mode WxH@Hz] [--resize WxH@Hz] [--replay TOUCH] [--shot PNG] [--seconds N] [-- cargo args]" >&2; exit 2; }
+[ -n "$example" ] || { echo "usage: $0 NAME [--bin] [--dir DIR] [--mode WxH@Hz] [--replay TOUCH] [--shot PNG] [--seconds N] [-- cargo args]" >&2; exit 2; }
 [ -z "$replay" ] || [ -f "$replay" ] || { echo "run-headless: no touch script at $replay" >&2; exit 2; }
 [ -z "$shot" ] || need grim "the screenshot --shot writes"
 
@@ -106,16 +100,11 @@ export WAYLAND_DISPLAY
 
 echo "run-headless: $WAYLAND_DISPLAY (sway $(swaymsg -t get_version --raw | sed -n 's/.*"human_readable":"\([^"]*\)".*/\1/p'))" >&2
 
-# The extent `replay-touch` positions against, so a script's coordinates are
+swaymsg output HEADLESS-1 mode "$mode" >/dev/null
-# the output's own pixels. Set beside every mode change, since a gesture
+# The extent `replay-touch` positions against, so a script's coordinates
-# scaled against a mode the output no longer has lands somewhere else and
+# are the output's own pixels.
-# still looks like a run that worked.
+out_w=${mode%x*}
-set_mode() {
+out_h=${mode#*x}; out_h=${out_h%@*}
-    swaymsg output HEADLESS-1 mode "$1" >/dev/null
-    out_w=${1%x*}
-    out_h=${1#*x}; out_h=${out_h%@*}
-}
-set_mode "$mode"
 
 # Built before the app starts, so a compile error is not reported as a
 # window that failed to move.
@@ -153,12 +142,6 @@ while [ $i -lt "$((seconds * 2))" ]; do
     i=$((i + 1)); sleep 0.5
 done
 
-if [ -n "$resize" ] && kill -0 "$pid" 2>/dev/null; then
-    set_mode "$resize"
-    echo "run-headless: resized to $resize" >&2
-    sleep 2
-fi
-
 if [ -n "$replay" ] && kill -0 "$pid" 2>/dev/null; then
     if [ -n "$shot" ]; then
         grim "${shot%.png}-before.png"

src/default/attr.rs

@@ -15,11 +15,8 @@ where
             let region = ctx.data.render.window_region(&id).unwrap();
             let id_pos = region.top_left;
             let container_pos = ctx.data.render.window_region(&container).unwrap().top_left;
-            // The two regions are on the grid and the pointer is not, so the
+            let pos = ctx.data.pos + container_pos - id_pos;
-            // step between them is taken there and the pointer keeps the
+            let size = region.size();
-            // precision the platform gave it.
-            let pos = ctx.data.pos + (container_pos - id_pos).to_f32();
-            let size = region.size().to_f32();
             select(
                 rsc,
                 ctx.data.render,
@@ -73,8 +70,8 @@ fn select(
     if let Some(region) = render.window_region(&id) {
         state.window.set_ime_allowed(true);
         state.window.set_ime_cursor_area(
-            LogicalPosition::<f32>::from(region.top_left.to_f32().tuple()),
+            LogicalPosition::<f32>::from(region.top_left.tuple()),
-            LogicalSize::<f32>::from(region.size().to_f32().tuple()),
+            LogicalSize::<f32>::from(region.size().tuple()),
         );
     }
     state.focus = Some(id);

src/default/mod.rs

@@ -251,7 +251,7 @@ impl<State: DefaultAppState> AppState for DefaultApp<State> {
                 ui_state.renderer.draw();
             }
             WindowEvent::Resized(size) => {
-                render.resize((size.width, size.height), rsc.widgets_mut());
+                render.resize((size.width, size.height));
                 ui_state.renderer.resize(size)
             }
             WindowEvent::KeyboardInput { event, .. } => {

src/default/render.rs

@@ -22,12 +22,12 @@ impl UiRenderer {
     }
 
     pub fn draw(&mut self) {
-        let (output, suboptimal) = match self.surface.get_current_texture() {
+        let output = match self.surface.get_current_texture() {
-            CurrentSurfaceTexture::Success(texture) => (texture, false),
+            CurrentSurfaceTexture::Success(texture) => texture,
-            // Used for this frame, and the swapchain rebuilt after it has
+            CurrentSurfaceTexture::Suboptimal(texture) => {
-            // been presented: configuring the surface while a texture it
+                self.surface.configure(&self.device, &self.config);
-            // handed out is still alive panics.
+                texture
-            CurrentSurfaceTexture::Suboptimal(texture) => (texture, true),
+            }
             CurrentSurfaceTexture::Outdated | CurrentSurfaceTexture::Lost => {
                 self.surface.configure(&self.device, &self.config);
                 return;
@@ -60,9 +60,6 @@ impl UiRenderer {
         self.queue.submit(std::iter::once(encoder.finish()));
         self.window.pre_present_notify();
         self.queue.present(output);
-        if suboptimal {
-            self.surface.configure(&self.device, &self.config);
-        }
     }
 
     pub fn resize(&mut self, size: &PhysicalSize<u32>) {

src/default/sense.rs

@@ -198,7 +198,7 @@ impl SensorUi for UiRenderState {
                 let Some(region) = region_of(id) else {
                     continue;
                 };
-                if !cursor.exists || !region.contains(PxVec2::from_f32(cursor.pos)) {
+                if !cursor.exists || !region.contains(cursor.pos) {
                     continue;
                 }
                 hovered.now.push(id);
@@ -249,8 +249,8 @@ fn deliver<Rsc: HasEvents>(
     region: PixelRegion,
 ) -> bool {
     let data = CursorData {
-        pos: cursor.pos - region.top_left.to_f32(),
+        pos: cursor.pos - region.top_left,
-        size: region.size().to_f32(),
+        size: region.bot_right - region.top_left,
         scroll_delta: cursor.scroll_delta,
         hover,
         cursor: cursor.clone(),

src/harness.rs

@@ -29,14 +29,8 @@ macro_rules! assert_corners {
         assert_eq!(
             $harness.region(&$id).expect("widget drew nothing"),
             $crate::core::PixelRegion {
-                top_left: $crate::core::PxVec2::new(
+                top_left: $crate::core::util::Vec2::new($x0 as f32, $y0 as f32),
-                    $crate::core::Px::from_f32($x0 as f32),
+                bot_right: $crate::core::util::Vec2::new($x1 as f32, $y1 as f32),
-                    $crate::core::Px::from_f32($y0 as f32),
-                ),
-                bot_right: $crate::core::PxVec2::new(
-                    $crate::core::Px::from_f32($x1 as f32),
-                    $crate::core::Px::from_f32($y1 as f32),
-                ),
             }
         );
     };
@@ -144,9 +138,9 @@ impl Harness {
         // bound that comes with `SyncSender` is far past anything a test
         // leaves unread.
         let (send, updates) = sync_channel(1024);
-        let mut rsc = DefaultRsc::init(Arc::new(Queue(send)));
+        let rsc = DefaultRsc::init(Arc::new(Queue(send)));
         let mut render = UiRenderState::new();
-        render.resize(size, rsc.widgets_mut());
+        render.resize(size);
         Self {
             rsc,
             render,
@@ -157,18 +151,11 @@ impl Harness {
     }
 
     pub fn size(&self) -> Vec2 {
-        self.render.output_size().to_f32()
+        self.render.output_size()
     }
 
     pub fn resize(&mut self, size: impl Into<Vec2>) {
-        self.render.resize(size, self.rsc.widgets_mut());
+        self.render.resize(size);
-    }
-
-    /// Changes a length rule after the fact, the way `.width()` sets one.
-    pub fn set_len(&mut self, id: impl IdLike, axis: Axis, len: impl Into<LayoutLen>) {
-        self.rsc
-            .widgets_mut()
-            .set_size_rule(id, axis, SizeRule::Exact(len.into()));
     }
 
     /// Sets the root and lays it out, so a pointer event has something to hit.

src/lib.rs

@@ -8,7 +8,6 @@
 pub mod default;
 pub mod event;
 pub mod harness;
-pub mod random;
 pub mod widget;
 
 pub use iris_core as core;

src/random.rs

@@ -1,990 +0,0 @@
-//! A seeded random widget tree, for tests and for looking at.
-//!
-//! One seed is one tree, on any machine and after any upgrade, so a test can
-//! grow the same tree twice and a failing seed is reproduced by its number.
-//! `examples/random.rs` draws one; `tests/generated.rs` checks that laying one
-//! out again lands where growing it from scratch would.
-
-use crate::prelude::*;
-use std::collections::HashMap;
-
-/// What a test changes between two trees grown from the same seed, so the
-/// warm one can be mutated and the cold one grown that way to begin with.
-#[derive(Default)]
-pub struct Edits {
-    /// Declared sizes, by the order the rules were put on.
-    pub sizes: HashMap<usize, SizeRules>,
-    /// Which children a span has, by the order the spans were made.
-    pub spans: HashMap<usize, SpanEdit>,
-    /// Alignments, by the order they were put on.
-    pub aligns: HashMap<usize, Align>,
-    /// Which widgets own a movable region, by the order they were offered
-    /// one. Region nodes change what a move writes and how deep a primitive's
-    /// chain is, so a tree that never grows one leaves both untested.
-    pub nodes: HashMap<usize, bool>,
-    /// Whether a [`Branch`] takes the side it would take at any measurement,
-    /// rather than the side the one it made says. The oracle wants the
-    /// measured side -- that is the whole point of a branch, and how a widget
-    /// believing a measurement a cold start would not have given it becomes a
-    /// different tree. A rig measuring cost wants this instead: a fixture
-    /// whose shape moves with the thing being measured cannot be compared
-    /// with itself across a change to it, and seed 1 at depth 8 went from 88
-    /// drawn widgets and 2,298 primitive writes a frame to 115 and 8,209
-    /// across fixed point, which is three and a half times the work behind a
-    /// number read as three and a half times the cost.
-    pub fixed_branches: bool,
-}
-
-#[derive(Default, Clone)]
-pub struct SpanEdit {
-    /// Children to leave out, by index among the ones grown.
-    pub detach: Vec<usize>,
-    /// How many of the span's spares are in it, appended in order.
-    pub attach: usize,
-}
-
-/// xorshift64, written out rather than taken from a crate so that a seed
-/// keeps meaning the same tree.
-pub struct Rng(u64);
-
-impl Rng {
-    pub fn new(seed: u64) -> Self {
-        Self(seed | 1)
-    }
-
-    pub fn bits(&mut self) -> u64 {
-        self.0 ^= self.0 << 13;
-        self.0 ^= self.0 >> 7;
-        self.0 ^= self.0 << 17;
-        self.0
-    }
-
-    pub fn below(&mut self, n: usize) -> usize {
-        (self.bits() % n as u64) as usize
-    }
-
-    pub fn chance(&mut self) -> bool {
-        self.bits() & 1 == 0
-    }
-}
-
-const COLORS: [UiColor; 6] = [
-    UiColor::RED,
-    UiColor::GREEN,
-    UiColor::BLUE,
-    UiColor::YELLOW,
-    UiColor::CYAN,
-    UiColor::MAGENTA,
-];
-
-/// Leaves grown beside every span, for a test to put into it.
-const SPARES: usize = 3;
-
-const WORDS: &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.";
-
-/// What growing a tree gives back: every widget in creation order, so two
-/// trees from one seed line up index for index, and the declared sizes, which
-/// are what a test changes to watch the change propagate.
-#[derive(Default)]
-pub struct Tree {
-    pub ids: Vec<WidgetId>,
-    pub sized: Vec<WidgetId>,
-    pub aligned: Vec<WidgetId>,
-    pub nodes: Vec<WidgetId>,
-    pub spans: Vec<Spanned>,
-    pub scrolls: Vec<WeakWidget<Scroll>>,
-}
-
-/// Branches on a child's measured length. Comparing boxes catches a widget
-/// that moved; this catches one that believed a measurement a cold start
-/// would not have given it, by turning that into a different tree. Its own
-/// configuration never changes, so which side draws is a property of the
-/// layout alone.
-pub struct Branch {
-    pub probe: StrongWidget,
-    pub wide: StrongWidget,
-    pub narrow: StrongWidget,
-    pub threshold: f32,
-}
-
-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.on_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 below = UiSpan::new(cut, painter.region_len(Axis::Y)).shifted_desc();
-        let place = below.on_axis(Axis::Y);
-        match px > threshold {
-            true => painter.widget_at(&self.wide, place),
-            false => painter.widget_at(&self.narrow, place),
-        };
-        Size::LEFTOVER
-    }
-
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
-        Some(LayoutLen::LEFTOVER)
-    }
-}
-
-pub struct Spanned {
-    pub id: WeakWidget<Span>,
-    /// Everything made for this span that it does not hold -- spares never
-    /// attached and children detached alike. A widget belongs to one parent,
-    /// and one that belongs to nobody still has to be held here: dropping
-    /// the last share of it frees its id for the next widget to be given,
-    /// which puts two trees out of step.
-    pub spares: Vec<StrongWidget>,
-    /// How many children it was grown with, before any edit.
-    pub grown: usize,
-}
-
-/// A tree described rather than built: [`plan`] turns a seed into one of
-/// these and [`build`] turns it into widgets, where growing did both at once.
-///
-/// The split is what makes a counterexample readable. A failing seed used to
-/// be the entire record of one, because a grower that makes widgets as it
-/// draws leaves nothing to take apart -- a shrinker could only grow its own
-/// trees and hope to meet the same shape, which in practice it does not. A
-/// plan is reduced by [`Plan::smaller`] and built again, so any seed that
-/// fails can be cut down until what is left is small enough to read.
-#[derive(Clone, Debug, PartialEq)]
-pub struct Plan {
-    pub kind: Kind,
-    /// The declared size this widget carries. Whoever grows a widget offers
-    /// it one and the offer is taken or declined; a second offer to the same
-    /// widget is dropped, because two rules on one widget would settle in the
-    /// order they were applied rather than in grow order.
-    pub size: Option<SizeRules>,
-    /// The alignment it carries, under the same one-offer rule. An axis left
-    /// out takes the centered default, which is what [`RegionAlign`] reads it
-    /// as.
-    pub align: Option<Align>,
-    /// Whether it was offered a movable region of its own and what it
-    /// answered. `Some(false)` is an offer declined, which still uses up the
-    /// one offer, where `None` is an offer never made.
-    pub region_node: Option<bool>,
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum Kind {
-    /// Wrapped and unwrapped text, because only one of them reads the width
-    /// it is given and so only one has to be drawn again for a new one.
-    Wrapped,
-    OneLine,
-    Rect {
-        color: usize,
-        alpha: u8,
-    },
-    /// The one leaf whose own length is a number of pixels it knows before it
-    /// is drawn, which is the hint a rule beside it has to win over.
-    Image,
-    /// Scrolling reads the pixel length of its box, which nothing else here
-    /// does, and gives its child a box longer than its own.
-    Scroll {
-        axis: Axis,
-        inner: Box<Plan>,
-    },
-    /// All three sides are grown either way, so a tree that draws one has the
-    /// same ids as a tree that draws another.
-    Branch {
-        probe: Box<Plan>,
-        wide: Box<Plan>,
-        narrow: Box<Plan>,
-        threshold: f32,
-    },
-    /// Each side its own, since a padding that is the same all round hides
-    /// anything that treats one edge differently from another.
-    Pad {
-        padding: [i32; 4],
-        inner: Box<Plan>,
-    },
-    Stack {
-        children: Vec<Plan>,
-    },
-    Span {
-        dir: usize,
-        gap: i32,
-        /// Grown for this span, in the order they are made.
-        children: Vec<Plan>,
-        /// Grown beside it whether or not they end up in it, so the widget
-        /// after them has the same id in a tree that leaves them out as in
-        /// one that puts them in.
-        spares: Vec<Plan>,
-        /// Which of `children` then `spares` are actually in the span, and
-        /// in what order -- kept apart from the two lists above so that a
-        /// tree which detaches, attaches or reorders its children still
-        /// makes the same widgets in the same order, and two builds line up
-        /// index for index. Anything not named here is built and held
-        /// rather than dropped, since freeing an id hands it to the next
-        /// widget and puts two trees out of step.
-        order: Vec<usize>,
-    },
-}
-
-impl Plan {
-    /// A widget carrying nothing anybody has offered it yet.
-    fn bare(kind: Kind) -> Self {
-        Self {
-            kind,
-            size: None,
-            align: None,
-            region_node: None,
-        }
-    }
-
-    /// How many widgets building it makes, spares and detached children
-    /// included, since those are made either way.
-    pub fn size(&self) -> usize {
-        1 + match &self.kind {
-            Kind::Scroll { inner, .. } | Kind::Pad { inner, .. } => inner.size(),
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                ..
-            } => probe.size() + wide.size() + narrow.size(),
-            Kind::Stack { children } => children.iter().map(Plan::size).sum(),
-            Kind::Span {
-                children, spares, ..
-            } => children.iter().chain(spares).map(Plan::size).sum(),
-            _ => 0,
-        }
-    }
-
-    /// The trees to try instead of this one when reducing a counterexample,
-    /// biggest cut first: a shrinker takes the first that still fails, so
-    /// offering "this subtree alone" before "this subtree with one child
-    /// fewer" is what gets from six hundred widgets to six rather than to
-    /// five hundred and ninety.
-    ///
-    /// Every one of these is a tree the generator could have grown, so a
-    /// reduced plan is a counterexample in its own right rather than a
-    /// special case only the shrinker can make.
-    pub fn smaller(&self) -> Vec<Plan> {
-        let mut out = Vec::new();
-        // Standing in for the whole of it, which is the largest cut there is.
-        for kid in self.kids() {
-            out.push(kid.clone());
-        }
-        // Then what it carries, which costs nothing to put back if it was
-        // not the thing that mattered.
-        for dropped in [
-            self.region_node.map(|_| Plan {
-                region_node: None,
-                ..self.clone()
-            }),
-            self.align.map(|_| Plan {
-                align: None,
-                ..self.clone()
-            }),
-            self.size.as_ref().map(|_| Plan {
-                size: None,
-                ..self.clone()
-            }),
-        ]
-        .into_iter()
-        .flatten()
-        {
-            out.push(dropped);
-        }
-        out.extend(self.kind.smaller().into_iter().map(|kind| Plan {
-            kind,
-            ..self.clone()
-        }));
-        out
-    }
-
-    /// Visits every widget in the order [`build`] makes them, so a count
-    /// kept by the visitor indexes the same widget as the matching [`Tree`]
-    /// vector does.
-    pub fn walk_mut(&mut self, at: &mut impl FnMut(&mut Plan)) {
-        match &mut self.kind {
-            Kind::Scroll { inner, .. } | Kind::Pad { inner, .. } => inner.walk_mut(at),
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                ..
-            } => {
-                probe.walk_mut(at);
-                wide.walk_mut(at);
-                narrow.walk_mut(at);
-            }
-            Kind::Stack { children } => {
-                for child in children {
-                    child.walk_mut(at);
-                }
-            }
-            Kind::Span {
-                children, spares, ..
-            } => {
-                for child in children.iter_mut().chain(spares) {
-                    child.walk_mut(at);
-                }
-            }
-            _ => {}
-        }
-        at(self);
-    }
-
-    /// The same tree with `edits` applied, by the indices the generator would
-    /// have used for them.
-    ///
-    /// [`plan`] resolves edits while drawing, which needs a seed. A scenario
-    /// needs them applied to a tree that already exists -- one it has built,
-    /// and one a shrinker may already have cut down, where no seed grows it
-    /// any more. Both routes take the same [`Edits`], so a case written
-    /// against one reads the same against the other.
-    pub fn edited(&self, edits: &Edits) -> Plan {
-        let mut out = self.clone();
-        let (mut sized, mut aligned, mut nodes, mut spans) = (0, 0, 0, 0);
-        out.walk_mut(&mut |plan| {
-            if let Kind::Span {
-                children,
-                spares,
-                order,
-                ..
-            } = &mut plan.kind
-            {
-                if let Some(edit) = edits.spans.get(&spans) {
-                    *order = span_edited(order, children.len(), spares.len(), edit);
-                }
-                spans += 1;
-            }
-            if let Kind::Branch { threshold, .. } = &mut plan.kind
-                && edits.fixed_branches
-            {
-                *threshold = f32::MIN;
-            }
-            if plan.size.is_some() {
-                if let Some(lens) = edits.sizes.get(&sized) {
-                    plan.size = Some(lens.clone());
-                }
-                sized += 1;
-            }
-            if plan.align.is_some() {
-                if let Some(align) = edits.aligns.get(&aligned) {
-                    plan.align = Some(*align);
-                }
-                aligned += 1;
-            }
-            if plan.region_node.is_some() {
-                if let Some(take) = edits.nodes.get(&nodes) {
-                    plan.region_node = Some(*take);
-                }
-                nodes += 1;
-            }
-        });
-        out
-    }
-
-    fn kids(&self) -> Vec<&Plan> {
-        match &self.kind {
-            Kind::Scroll { inner, .. } | Kind::Pad { inner, .. } => vec![inner],
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                ..
-            } => vec![probe, wide, narrow],
-            Kind::Stack { children } => children.iter().collect(),
-            Kind::Span { children, .. } => children.iter().collect(),
-            _ => Vec::new(),
-        }
-    }
-}
-
-impl Kind {
-    /// Simplifications of the shape alone, leaving what the widget carries to
-    /// [`Plan::smaller`]. Replacing a node with one of its children is there
-    /// rather than here, since it answers with a whole `Plan`.
-    fn smaller(&self) -> Vec<Kind> {
-        let mut out = Vec::new();
-        /// One child reduced at a time, rebuilt into the same shape. Every
-        /// answer has the same number of children as it was given, so it is
-        /// for the shapes whose child count is part of what they are.
-        fn reduced(kids: &[Plan], rebuild: &dyn Fn(Vec<Plan>) -> Kind) -> Vec<Kind> {
-            let mut out = Vec::new();
-            for (i, kid) in kids.iter().enumerate() {
-                for small in kid.smaller() {
-                    let mut next = kids.to_vec();
-                    next[i] = small;
-                    out.push(rebuild(next));
-                }
-            }
-            out
-        }
-
-        /// One child dropped, then [`reduced`]. For the shapes that hold any
-        /// number of children, where dropping one is the cut that matters.
-        fn each(kids: &[Plan], rebuild: &dyn Fn(Vec<Plan>) -> Kind) -> Vec<Kind> {
-            let mut out = Vec::new();
-            for i in 0..kids.len() {
-                if kids.len() > 1 {
-                    let mut less = kids.to_vec();
-                    less.remove(i);
-                    out.push(rebuild(less));
-                }
-            }
-            out.extend(reduced(kids, rebuild));
-            out
-        }
-        match self {
-            // The one leaf that reads the width it is given, then the one
-            // that does not, then the one that measures nothing at all. A
-            // picture measures nothing either, but its length is its own, so
-            // it steps to the leaf that takes whatever it is given.
-            Kind::Wrapped => out.push(Kind::OneLine),
-            Kind::OneLine | Kind::Image => out.push(Kind::Rect {
-                color: 0,
-                alpha: 255,
-            }),
-            Kind::Rect { .. } => {}
-            Kind::Scroll { axis, inner } => {
-                let axis = *axis;
-                out.extend(each(std::slice::from_ref(inner), &|mut k| Kind::Scroll {
-                    axis,
-                    inner: Box::new(k.remove(0)),
-                }));
-            }
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                threshold,
-            } => {
-                let threshold = *threshold;
-                // All three sides stay: a branch is the widget that draws
-                // one of two on a measurement, and one with a side missing
-                // is a different widget rather than a smaller one. Dropping
-                // the branch for a side is offered by `Plan::smaller`.
-                let sides = [(**probe).clone(), (**wide).clone(), (**narrow).clone()];
-                out.extend(reduced(&sides, &|k| Kind::Branch {
-                    probe: Box::new(k[0].clone()),
-                    wide: Box::new(k[1].clone()),
-                    narrow: Box::new(k[2].clone()),
-                    threshold,
-                }));
-            }
-            Kind::Pad { padding, inner } => {
-                let padding = *padding;
-                if padding != [0; 4] {
-                    out.push(Kind::Pad {
-                        padding: [0; 4],
-                        inner: inner.clone(),
-                    });
-                }
-                out.extend(each(std::slice::from_ref(inner), &|mut k| Kind::Pad {
-                    padding,
-                    inner: Box::new(k.remove(0)),
-                }));
-            }
-            Kind::Stack { children } => {
-                out.extend(each(children, &|children| Kind::Stack { children }))
-            }
-            Kind::Span {
-                dir,
-                gap,
-                children,
-                spares,
-                order,
-            } => {
-                let (dir, gap, n) = (*dir, *gap, children.len());
-                let span = |children: Vec<Plan>, spares: Vec<Plan>, order: Vec<usize>| Kind::Span {
-                    dir,
-                    gap,
-                    children,
-                    spares,
-                    order,
-                };
-                let identity: Vec<usize> = (0..n).collect();
-                // An order the generator did not choose is part of the tree,
-                // so take that off before taking the tree apart.
-                if *order != identity {
-                    out.push(span(children.clone(), spares.clone(), identity));
-                }
-                // Spares exist to be attached; with none attached they are
-                // widgets the span never holds.
-                if !spares.is_empty() && order.iter().all(|&i| i < n) {
-                    out.push(span(children.clone(), Vec::new(), order.clone()));
-                }
-                if gap != 0 {
-                    out.push(Kind::Span {
-                        dir,
-                        gap: 0,
-                        children: children.clone(),
-                        spares: spares.clone(),
-                        order: order.clone(),
-                    });
-                }
-                for k in 0..n {
-                    if n > 1 {
-                        let mut less = children.clone();
-                        less.remove(k);
-                        // Everything after it shifts down, spares included,
-                        // since they are indexed past the children.
-                        let order = order
-                            .iter()
-                            .filter(|&&i| i != k)
-                            .map(|&i| if i > k { i - 1 } else { i })
-                            .collect();
-                        out.push(span(less, spares.clone(), order));
-                    }
-                }
-                for (i, kid) in children.iter().enumerate() {
-                    for small in kid.smaller() {
-                        let mut next = children.clone();
-                        next[i] = small;
-                        out.push(span(next, spares.clone(), order.clone()));
-                    }
-                }
-            }
-        }
-        out
-    }
-}
-
-/// A [`SpanEdit`] applied to the order a span already holds its children in.
-///
-/// `detach` names positions in that order and `attach` takes from the front
-/// of what the span is not holding, both of which is what a test changing a
-/// live span does -- so an edit means the same thing said to a tree and said
-/// to the plan it was built from. On a span nobody has edited the order is
-/// the children in the order they were grown, and this is then "leave these
-/// out and put that many spares on the end".
-fn span_edited(order: &[usize], children: usize, spares: usize, edit: &SpanEdit) -> Vec<usize> {
-    let mut detach = edit.detach.clone();
-    detach.sort_unstable();
-    detach.dedup();
-    let mut next: Vec<usize> = order
-        .iter()
-        .enumerate()
-        .filter(|(at, _)| !detach.contains(at))
-        .map(|(_, &which)| which)
-        .collect();
-    // What the span is not holding, in the order it hands them back: what it
-    // was already not holding first, in the order the widgets were made, and
-    // what this edit takes out after that, highest position first. A child
-    // just detached goes to the back rather than straight back in, which is
-    // what makes detaching one and attaching one a trade.
-    let mut free: Vec<usize> = (0..children + spares)
-        .filter(|i| !order.contains(i))
-        .collect();
-    free.extend(detach.iter().rev().filter_map(|&at| order.get(at).copied()));
-    next.extend(free.into_iter().take(edit.attach));
-    next
-}
-
-/// Plans the tree `seed` describes, `edits` replacing what it would otherwise
-/// have given the widgets that carry them.
-///
-/// The edits are resolved here rather than at build time, so that a plan is
-/// the whole of what a tree is and building one has nothing left to decide.
-pub fn plan(seed: u64, depth: usize, edits: &Edits) -> Plan {
-    let mut sow = Sow {
-        rng: Rng::new(seed),
-        edits,
-        sized: 0,
-        aligned: 0,
-        nodes: 0,
-        spans: 0,
-    };
-    sow.node(depth)
-}
-
-/// Grows the tree `seed` describes, `edits` replacing the declared sizes it
-/// would otherwise have given those wrappers.
-pub fn grow<Rsc: UiRsc + 'static>(
-    rsc: &mut Rsc,
-    seed: u64,
-    depth: usize,
-    edits: &Edits,
-) -> (StrongWidget, Tree) {
-    build(rsc, &plan(seed, depth, edits))
-}
-
-/// Draws a plan out of the random stream. Every draw happens in the order it
-/// always has and before the decision it feeds, including the decisions that
-/// are then dropped, because a seed has to keep meaning the same tree.
-struct Sow<'a> {
-    rng: Rng,
-    edits: &'a Edits,
-    sized: usize,
-    aligned: usize,
-    nodes: usize,
-    spans: usize,
-}
-
-impl Sow<'_> {
-    fn leaf(&mut self) -> Plan {
-        Plan::bare(match self.rng.below(5) {
-            0 => Kind::Wrapped,
-            1 => Kind::OneLine,
-            2 => Kind::Image,
-            _ => {
-                let color = self.rng.below(COLORS.len());
-                let alpha = (self.rng.below(5) * 63) as u8;
-                Kind::Rect { color, alpha }
-            }
-        })
-    }
-
-    fn len(&mut self) -> LayoutLen {
-        LayoutLen::px(20.0 + self.rng.below(180) as f32)
-    }
-
-    /// A length of a box rather than a length of the window, which is what a
-    /// bound is.
-    ///
-    /// Pixels only, for now. A fraction in a bound is resolved against the rel
-    /// base the widget was asked with, and `place_at` hands a parent a
-    /// retained answer without checking that the answer still holds for the
-    /// rel base this place gives -- so a fraction resolved against one rel
-    /// base survives into another. Seeds 4 (shuffle-all-but-first) and 196
-    /// (resize-size) at depth 5 are where that showed; both pass with pixels.
-    /// The hole is older than bounds -- an `Exact` rule that is a fraction
-    /// can reach it too -- and closing it is a check at the re-place site.
-    fn bound(&mut self) -> Len {
-        Len::px(20.0 + self.rng.below(180) as f32)
-    }
-
-    fn rule(&mut self) -> SizeRule {
-        match self.rng.below(8) {
-            0 | 1 => self.len().into(),
-            2 => LayoutLen::LEFTOVER.into(),
-            3 => SizeRule::Min(self.bound()),
-            4 => SizeRule::Max(self.bound()),
-            // Both in pixels, so one can be put under the other: a floor and
-            // a cap that change sides with the window bound nothing, which
-            // is a caller's bug rather than a tree to grow.
-            5 => {
-                let (a, b) = (
-                    Px::from_f32(20.0 + self.rng.below(180) as f32),
-                    Px::from_f32(20.0 + self.rng.below(180) as f32),
-                );
-                SizeRule::Clamp {
-                    min: Len::px(a.min(b).to_f32()),
-                    max: Len::px(a.max(b).to_f32()),
-                }
-            }
-            _ => SizeRule::Free,
-        }
-    }
-
-    fn align(&mut self) -> Align {
-        let axis = |s: &mut Self| match s.rng.below(4) {
-            0 => None,
-            1 => Some(AxisAlign::NEG),
-            2 => Some(AxisAlign::CENTER),
-            _ => Some(AxisAlign::POS),
-        };
-        let (x, y) = (axis(self), axis(self));
-        // Aligning on neither axis leaves the branch unexercised.
-        match x.is_none() && y.is_none() {
-            true => Align {
-                x: Some(AxisAlign::CENTER),
-                y,
-            },
-            false => Align { x, y },
-        }
-    }
-
-    /// A declared size over half the tree, kept where a test can change it.
-    fn sized(&mut self, inner: &mut Plan) {
-        let take = self.rng.chance();
-        let lens = SizeRules {
-            x: self.rule(),
-            y: self.rule(),
-        };
-        if !take || inner.size.is_some() {
-            return;
-        }
-        let idx = self.sized;
-        self.sized += 1;
-        inner.size = Some(self.edits.sizes.get(&idx).cloned().unwrap_or(lens));
-    }
-
-    /// An alignment over some of the tree, kept where a test can change it.
-    fn aligned(&mut self, inner: &mut Plan) {
-        let align = self.align();
-        if inner.align.is_some() {
-            return;
-        }
-        let idx = self.aligned;
-        self.aligned += 1;
-        inner.align = Some(self.edits.aligns.get(&idx).copied().unwrap_or(align));
-    }
-
-    /// A movable region of its own over some of the tree. What it changes is
-    /// how a move is written and how long a primitive's chain is, neither of
-    /// which any other branch here varies.
-    fn noded(&mut self, inner: &mut Plan) {
-        let take = self.rng.below(4) == 0;
-        if inner.region_node.is_some() {
-            return;
-        }
-        let idx = self.nodes;
-        self.nodes += 1;
-        inner.region_node = Some(self.edits.nodes.get(&idx).copied().unwrap_or(take));
-    }
-
-    fn offered(&mut self, inner: &mut Plan) {
-        self.sized(inner);
-        self.noded(inner);
-    }
-
-    fn node(&mut self, depth: usize) -> Plan {
-        if depth == 0 {
-            return self.leaf();
-        }
-        let positioned = self.rng.below(6);
-        if positioned == 0 {
-            let mut inner = self.node(depth - 1);
-            self.offered(&mut inner);
-            let axis = if self.rng.chance() { Axis::X } else { Axis::Y };
-            return Plan::bare(Kind::Scroll {
-                axis,
-                inner: Box::new(inner),
-            });
-        }
-        if positioned == 2 {
-            let probe = self.node(depth - 1);
-            let wide = self.node(depth - 1);
-            let narrow = self.node(depth - 1);
-            // Drawn either way, so the side a fixed branch takes is still a
-            // side the generator chose -- and it consumes the same randomness
-            // as a measured one, so the two grow the same ids.
-            let measured = self.rng.below(500) as f32;
-            let threshold = match self.edits.fixed_branches {
-                true => f32::MIN,
-                false => measured,
-            };
-            return Plan::bare(Kind::Branch {
-                probe: Box::new(probe),
-                wide: Box::new(wide),
-                narrow: Box::new(narrow),
-                threshold,
-            });
-        }
-        if positioned == 1 {
-            // Carries an alignment and makes no widget of its own, so the
-            // plan for it is the child it aligned.
-            let mut inner = self.node(depth - 1);
-            self.offered(&mut inner);
-            self.aligned(&mut inner);
-            return inner;
-        }
-        if self.rng.below(4) == 0 {
-            let mut inner = self.node(depth - 1);
-            self.offered(&mut inner);
-            let side = |s: &mut Self| s.rng.below(24) as i32;
-            let padding = [side(self), side(self), side(self), side(self)];
-            return Plan::bare(Kind::Pad {
-                padding,
-                inner: Box::new(inner),
-            });
-        }
-        let grown = 2 + self.rng.below(3);
-        let mut children = Vec::with_capacity(grown);
-        for _ in 0..grown {
-            let mut child = self.node(depth - 1);
-            self.offered(&mut child);
-            children.push(child);
-        }
-        if self.rng.chance() {
-            return Plan::bare(Kind::Stack { children });
-        }
-        let spares: Vec<Plan> = (0..SPARES).map(|_| self.leaf()).collect();
-        let idx = self.spans;
-        self.spans += 1;
-        let edit = self.edits.spans.get(&idx).cloned().unwrap_or_default();
-        let dir = self.rng.below(4);
-        let gap = self.rng.below(3) as i32 * 4;
-        let grown: Vec<usize> = (0..children.len()).collect();
-        let order = span_edited(&grown, children.len(), spares.len(), &edit);
-        Plan::bare(Kind::Span {
-            dir,
-            gap,
-            children,
-            spares,
-            order,
-        })
-    }
-}
-
-/// Builds a plan's widgets in the order it describes them, so two builds of
-/// one plan line up index for index and their boxes can be compared.
-pub fn build<Rsc: UiRsc + 'static>(rsc: &mut Rsc, plan: &Plan) -> (StrongWidget, Tree) {
-    let mut build = Build {
-        rsc,
-        tree: Tree::default(),
-        checkerboard: None,
-    };
-    let root = build.node(plan);
-    (root, build.tree)
-}
-
-struct Build<'a, Rsc> {
-    rsc: &'a mut Rsc,
-    tree: Tree,
-    /// The checkerboard, uploaded when the first image in this tree is built.
-    /// A handle is a reference to the texture, so every image after that one
-    /// clones this rather than uploading the same picture again.
-    checkerboard: Option<TextureHandle>,
-}
-
-impl<Rsc: UiRsc + 'static> Build<'_, Rsc> {
-    fn node(&mut self, plan: &Plan) -> StrongWidget {
-        let built = self.kind(&plan.kind);
-        let id = built.id();
-        if let Some(lens) = plan.size.clone() {
-            self.rsc.ui_mut().widgets.set_size_rules(id, lens.x, lens.y);
-            self.tree.sized.push(id);
-        }
-        if let Some(align) = plan.align {
-            let resolved = RegionAlign::from(align);
-            let widgets = &mut self.rsc.ui_mut().widgets;
-            for axis in Axis::BOTH {
-                widgets.set_alignment(id, axis, resolved[axis]);
-            }
-            self.tree.aligned.push(id);
-        }
-        if let Some(take) = plan.region_node {
-            self.rsc.ui_mut().widgets.set_region_node(id, take);
-            self.tree.nodes.push(id);
-        }
-        built
-    }
-
-    /// The one picture the generated trees draw: a 64x64 checkerboard of purple
-    /// and black in 8 px cells. Committed rather than drawn here, so that one
-    /// seed is one tree whatever anything else does, and included rather than
-    /// opened, so that growing a tree does not depend on a working directory.
-    fn checkerboard(&mut self) -> TextureHandle {
-        if self.checkerboard.is_none() {
-            let image = include_bytes!("assets/checkerboard.png")
-                .get_image()
-                .expect("the checkerboard is committed beside this file");
-            self.checkerboard = Some(self.rsc.ui_mut().textures.add(image));
-        }
-        self.checkerboard.clone().unwrap()
-    }
-
-    fn kind(&mut self, kind: &Kind) -> StrongWidget {
-        let id: StrongWidget = match kind {
-            Kind::Wrapped => wtext(WORDS).size(16).wrap(true).add_strong(self.rsc),
-            Kind::OneLine => wtext("one line, overflowing whatever it is given")
-                .size(16)
-                .wrap(false)
-                .add_strong(self.rsc),
-            Kind::Rect { color, alpha } => rect(COLORS[*color].alpha(*alpha)).add_strong(self.rsc),
-            Kind::Image => Image::new(self.checkerboard()).add_strong(self.rsc),
-            Kind::Scroll { axis, inner } => {
-                let inner = self.node(inner);
-                let id = Scroll::new(inner, *axis).add(self.rsc);
-                self.tree.scrolls.push(id);
-                self.tree.ids.push(id.id());
-                return id.add_strong(self.rsc);
-            }
-            Kind::Branch {
-                probe,
-                wide,
-                narrow,
-                threshold,
-            } => {
-                let probe = self.node(probe);
-                let wide = self.node(wide);
-                let narrow = self.node(narrow);
-                let id = Branch {
-                    probe,
-                    wide,
-                    narrow,
-                    threshold: *threshold,
-                }
-                .add(self.rsc);
-                self.tree.ids.push(id.id());
-                return id.add_strong(self.rsc);
-            }
-            Kind::Pad { padding, inner } => {
-                let inner = self.node(inner);
-                let [left, right, top, bottom] = padding.map(Px::from_int);
-                let padding = Padding {
-                    left,
-                    right,
-                    top,
-                    bottom,
-                };
-                Pad { padding, inner }.add_strong(self.rsc)
-            }
-            Kind::Stack { children } => {
-                let children = children.iter().map(|c| self.node(c)).collect();
-                Stack {
-                    children,
-                    size: StackSize::Child(0),
-                }
-                .add_strong(self.rsc)
-            }
-            Kind::Span {
-                dir,
-                gap,
-                children,
-                spares,
-                order,
-            } => {
-                let grown = children.len();
-                // Every one of them is made, in this order, whether or not
-                // the span ends up holding it.
-                let made: Vec<StrongWidget> = children
-                    .iter()
-                    .chain(spares)
-                    .map(|c| self.node(c))
-                    .collect();
-                let mut left: Vec<Option<StrongWidget>> = made.into_iter().map(Some).collect();
-                let children: Vec<StrongWidget> = order
-                    .iter()
-                    .filter_map(|&i| left.get_mut(i).and_then(Option::take))
-                    .collect();
-                // What the span does not hold is still held here: dropping
-                // the last share of a widget frees its id for the next one
-                // to be given, which puts two trees out of step.
-                let spares: Vec<StrongWidget> = left.into_iter().flatten().collect();
-                let dir = [Dir::RIGHT, Dir::DOWN, Dir::LEFT, Dir::UP][*dir % 4];
-                let id = Span {
-                    children,
-                    dir,
-                    gap: Px::from_int(*gap),
-                }
-                .add(self.rsc);
-                // A row takes the height it is given rather than its tallest
-                // child, which is a rule beside the span rather than anything
-                // it draws. Derived from `dir` rather than stored, so a plan
-                // that says the direction says this too.
-                if dir.axis == Axis::X {
-                    self.rsc
-                        .widgets_mut()
-                        .set_size_rules(id, None, Some(LayoutLen::rel(1.0)));
-                }
-                self.tree.ids.push(id.id());
-                self.tree.spans.push(Spanned { id, spares, grown });
-                return id.add_strong(self.rsc);
-            }
-        };
-        self.tree.ids.push(id.id());
-        id
-    }
-}

src/widget/image.rs

@@ -8,20 +8,15 @@ pub struct Image {
 impl Widget for Image {
     fn draw(&mut self, painter: &mut Painter) -> Size {
         painter.primitive(&self.handle);
-        Size::px(self.handle.size())
+        Size::abs(self.handle.size())
     }
 
-    fn size_hint(&self, axis: Axis) -> Option<LayoutLen> {
+    fn size_hint(&self, axis: Axis) -> Option<Len> {
-        Some(LayoutLen::px(self.handle.size()[axis]))
+        Some(Len::abs(self.handle.size().axis(axis)))
     }
-}
 
-impl Image {
+    fn on_resize(&self, _: Axis) -> OnResize {
-    /// One texture already uploaded, for a caller holding its handle: [`image()`]
+        OnResize::Scale
-    /// uploads what it is given, and several widgets showing one picture want
-    /// one upload and one slot between them.
-    pub fn new(handle: TextureHandle) -> Self {
-        Self { handle }
     }
 }
 

src/widget/mask.rs

@@ -6,17 +6,12 @@ pub struct Masked {
 
 impl Widget for Masked {
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter.set_mask(UiRegion::FULL);
+        painter.set_mask(painter.region());
-        painter.widget(&self.inner);
+        painter.widget(&self.inner).size()
-        // 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
-        // neither take less of one nor honestly ask for more. Passing the
-        // inner size up instead asks to be placed at a length it does not
-        // draw, and the framework would place the drawing it clipped away.
-        Size::LEFTOVER
     }
 
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
+    /// It clips to the box it was given, not to the part its child used.
-        Some(LayoutLen::LEFTOVER)
+    fn on_resize(&self, _: Axis) -> OnResize {
+        OnResize::Redraw
     }
 }

src/widget/mod.rs

@@ -1,15 +1,15 @@
 mod image;
 mod mask;
 mod position;
+mod ptr;
 mod rect;
 mod text;
 mod trait_fns;
-mod wrapper;
 
 pub use image::*;
 pub use mask::*;
 pub use position::*;
+pub use ptr::*;
 pub use rect::*;
 pub use text::*;
 pub use trait_fns::*;
-pub use wrapper::*;

src/widget/position/align.rs

@@ -0,0 +1,22 @@
+use crate::prelude::*;
+
+pub struct Aligned {
+    pub inner: StrongWidget,
+    pub align: Align,
+}
+
+impl Widget for Aligned {
+    fn draw(&mut self, painter: &mut Painter) -> Size {
+        // Drawn where it may be too big, then given its aligned box once its
+        // size is known.
+        let size = painter.widget(&self.inner).size();
+        let region = match self.align.tuple() {
+            (Some(x), Some(y)) => size.to_uivec2().align(RegionAlign { x, y }),
+            (Some(x), None) => UiRegion::new(size.x.apply_rest().align(x), UiSpan::FULL),
+            (None, Some(y)) => UiRegion::new(UiSpan::FULL, size.y.apply_rest().align(y)),
+            (None, None) => UiRegion::FULL,
+        };
+        painter.widget_within(&self.inner, region);
+        size
+    }
+}

src/widget/position/layer.rs

@@ -6,10 +6,6 @@ pub struct LayerOffset {
 }
 
 impl Widget for LayerOffset {
-    fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
-        requests.widget(&self.inner, axis)
-    }
-
     fn draw(&mut self, painter: &mut Painter) -> Size {
         for _ in 0..self.offset {
             painter.next_layer();

src/widget/position/max_size.rs

@@ -1,68 +1,25 @@
 use crate::prelude::*;
 
-/// Asks its child in the shorter of a cap and the box this widget was given,
-/// and answers what the child used, held to the same cap.
-///
-/// A cap on the box is a widget rather than a [`SizeRule`] because a box is
-/// whoever asked's to decide: a rule that read the box it was given would be
-/// decided again by every path that hands a widget one, including the ones
-/// that re-place a drawing without asking it anything, and the decision would
-/// then depend on which path arrived last. A widget is drawn again whenever
-/// its own box changes, so the comparison is made where the answer can be
-/// kept -- `longer_than` narrows the windows this drawing holds for, and
-/// `holds` says the box lengths.
-///
-/// The box is what a text wraps at and what a scroll takes its viewport from,
-/// which is why capping the answer alone is not the same thing.
 pub struct MaxSize {
     pub inner: StrongWidget,
     pub x: Option<Len>,
     pub y: Option<Len>,
 }
 
-impl MaxSize {
-    fn max(&self, axis: Axis) -> Option<Len> {
-        match axis {
-            Axis::X => self.x,
-            Axis::Y => self.y,
-        }
-    }
-}
-
 impl Widget for MaxSize {
-    fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
-        let inner = requests.widget(&self.inner, axis)?;
-        Some(match self.max(axis) {
-            Some(max) => requests.min(inner, max.into()),
-            None => inner,
-        })
-    }
-
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        let align = painter.alignment();
+        let child = painter.widget(&self.inner).size();
-        let mut region = UiRegion::FULL;
+        let output = painter.output_size();
-        for axis in Axis::BOTH {
+        Size {
-            let Some(max) = self.max(axis) else {
+            x: capped(child.x, self.x, output.x),
-                continue;
+            y: capped(child.y, self.y, output.y),
-            };
-            let own = painter.region_len(axis);
-            if painter.longer_than(own, max, axis) {
-                region[axis] = max.align(align[axis]);
-            }
         }
-        let mut size = painter.widget_at(&self.inner, region).size();
+    }
-        for axis in Axis::BOTH {
+}
-            // The child may draw past the box it was given -- a text too tall
+
-            // for it -- and the cap is a promise about the length as well. A
+fn capped(len: Len, max: Option<Len>, output: f32) -> Len {
-            // share passes through: it is a length only to whoever divides
+    match max {
-            // one, and that is this widget's parent rather than this widget,
+        Some(max) if len.apply_rest().to_abs(output) > max.apply_rest().to_abs(output) => max,
-            // which has already given the share the box the cap allows.
+        _ => len,
-            if let Some(max) = self.max(axis)
-                && painter.longer_than(size[axis].without_leftover(), max, axis)
-            {
-                size[axis] = max.into();
-            }
-        }
-        size
     }
 }

src/widget/position/mod.rs

@@ -1,15 +1,19 @@
+mod align;
 mod layer;
 mod max_size;
 mod offset;
 mod pad;
 mod scroll;
+mod set_size;
 mod span;
 mod stack;
 
+pub use align::*;
 pub use layer::*;
 pub use max_size::*;
 pub use offset::*;
 pub use pad::*;
 pub use scroll::*;
+pub use set_size::*;
 pub use span::*;
 pub use stack::*;

src/widget/position/offset.rs

@@ -6,13 +6,8 @@ pub struct Offset {
 }
 
 impl Widget for Offset {
-    fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
-        requests.widget(&self.inner, axis)
-    }
-
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter
+        let region = UiRegion::FULL.offset(self.amt);
-            .widget_at(&self.inner, UiRegion::FULL.offset(self.amt))
+        painter.widget_within(&self.inner, region).size()
-            .size()
     }
 }

src/widget/position/pad.rs

@@ -6,35 +6,17 @@ pub struct Pad {
 }
 
 impl Widget for Pad {
-    fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
-        let padding = match axis {
-            Axis::X => self.padding.left + self.padding.right,
-            Axis::Y => self.padding.top + self.padding.bottom,
-        };
-        requests.inset(&self.inner, axis, padding)
-    }
-
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        // The inner's own alignment, not the near edge. This reports the
+        let inner = painter
-        // inner's size plus the padding, so where the box is that answer the
+            .widget_within(&self.inner, self.padding.region())
-        // inset box is exactly the inner and alignment has no room to move
+            .size();
-        // 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();
         Size {
-            x: LayoutLen {
+            x: Len {
-                px: inner.x.px + self.padding.left + self.padding.right,
+                abs: inner.x.abs + self.padding.left + self.padding.right,
                 ..inner.x
             },
-            y: LayoutLen {
+            y: Len {
-                px: inner.y.px + self.padding.top + self.padding.bottom,
+                abs: inner.y.abs + self.padding.top + self.padding.bottom,
                 ..inner.y
             },
         }
@@ -42,22 +24,22 @@ impl Widget for Pad {
 }
 
 pub struct Padding {
-    pub left: Px,
+    pub left: f32,
-    pub right: Px,
+    pub right: f32,
-    pub top: Px,
+    pub top: f32,
-    pub bottom: Px,
+    pub bottom: f32,
 }
 
 impl Padding {
     pub const ZERO: Self = Self {
-        left: Px::ZERO,
+        left: 0.0,
-        right: Px::ZERO,
+        right: 0.0,
-        top: Px::ZERO,
+        top: 0.0,
-        bottom: Px::ZERO,
+        bottom: 0.0,
     };
 
     pub fn uniform(amt: impl UiNum) -> Self {
-        let amt = Px::from_num(amt);
+        let amt = amt.to_f32();
         Self {
             left: amt,
             right: amt,
@@ -65,82 +47,80 @@ impl Padding {
             bottom: amt,
         }
     }
-    /// `region` less this padding on each side.
+    pub fn region(&self) -> UiRegion {
-    pub fn region_of(&self, mut region: UiRegion) -> UiRegion {
+        let mut region = UiRegion::FULL;
-        region.x.start.px += self.left;
+        region.x.start.abs += self.left;
-        region.y.start.px += self.top;
+        region.y.start.abs += self.top;
-        region.x.end.px -= self.right;
+        region.x.end.abs -= self.right;
-        region.y.end.px -= self.bottom;
+        region.y.end.abs -= self.bottom;
         region
     }
-
-    pub fn region(&self) -> UiRegion {
-        self.region_of(UiRegion::FULL)
-    }
     pub fn x(amt: impl UiNum) -> Self {
-        let amt = Px::from_num(amt);
+        let amt = amt.to_f32();
         Self {
             left: amt,
             right: amt,
-            ..Self::ZERO
+            top: 0.0,
+            bottom: 0.0,
         }
     }
     pub fn y(amt: impl UiNum) -> Self {
-        let amt = Px::from_num(amt);
+        let amt = amt.to_f32();
         Self {
+            left: 0.0,
+            right: 0.0,
             top: amt,
             bottom: amt,
-            ..Self::ZERO
         }
     }
 
     pub fn top(amt: impl UiNum) -> Self {
         let mut s = Self::ZERO;
-        s.top = Px::from_num(amt);
+        s.top = amt.to_f32();
         s
     }
 
     pub fn bottom(amt: impl UiNum) -> Self {
         let mut s = Self::ZERO;
-        s.bottom = Px::from_num(amt);
+        s.bottom = amt.to_f32();
         s
     }
 
     pub fn left(amt: impl UiNum) -> Self {
         let mut s = Self::ZERO;
-        s.left = Px::from_num(amt);
+        s.left = amt.to_f32();
         s
     }
 
     pub fn right(amt: impl UiNum) -> Self {
         let mut s = Self::ZERO;
-        s.right = Px::from_num(amt);
+        s.right = amt.to_f32();
         s
     }
 
     pub fn with_top(mut self, amt: impl UiNum) -> Self {
-        self.top = Px::from_num(amt);
+        self.top = amt.to_f32();
         self
     }
 
     pub fn with_bottom(mut self, amt: impl UiNum) -> Self {
-        self.bottom = Px::from_num(amt);
+        self.bottom = amt.to_f32();
         self
     }
 
     pub fn with_left(mut self, amt: impl UiNum) -> Self {
-        self.left = Px::from_num(amt);
+        self.left = amt.to_f32();
         self
     }
 
     pub fn with_right(mut self, amt: impl UiNum) -> Self {
-        self.right = Px::from_num(amt);
+        self.right = amt.to_f32();
         self
     }
 }
 
 impl<T: UiNum> From<T> for Padding {
     fn from(amt: T) -> Self {
-        Self::uniform(amt)
+        Self::uniform(amt.to_f32())
     }
 }

src/widget/position/scroll.rs

@@ -3,76 +3,36 @@ use crate::prelude::*;
 pub struct Scroll {
     inner: StrongWidget,
     axis: Axis,
-    amt: Px,
+    amt: f32,
     snap_end: bool,
-    container_len: Px,
+    container_len: f32,
-    content_len: Px,
+    content_len: f32,
 }
 
 impl Widget for Scroll {
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        let container_len = painter.px_len(self.axis);
+        let output_len = painter.output_size().axis(self.axis);
-        // Asked in the whole viewport, then put at the scrolled offset.
+        let container_len = painter.region().axis(self.axis).len();
-        let answer_len = painter
+        // Drawn in the whole container to learn its length, then placed at
-            .widget_at(&self.inner, PlaceDesc::WHOLE.fills())
+        // the scrolled offset.
-            .len(self.axis);
+        let child = painter.widget(&self.inner).size();
-        let answer_px = painter.to_px(answer_len.without_leftover(), self.axis);
+        let content_len = child
-        self.container_len = container_len;
+            .axis(self.axis)
-        self.content_len = answer_px.max(container_len);
+            .apply_rest()
+            .within_len(container_len)
+            .to_abs(output_len);
+        self.container_len = container_len.to_abs(output_len);
+        self.content_len = content_len;
 
         if self.snap_end {
             self.amt = self.content_len - self.container_len;
         }
         self.update_amt();
-        // Reading the box in pixels above holds this drawing to that one
-        // length, so these two say where it holds more widely.
-        //
-        // Content of a fixed length that fits is handed the whole box below,
-        // and nothing here reads the box again, so every longer box gives the
-        // same drawing: it holds from the length the content needs upwards,
-        // and shrinking past that is what changes it. Where it sits in a box
-        // longer than itself is not this widget's to say -- placing its
-        // answer in the whole box is its own alignment, and that placement is
-        // a fraction of the box, so it holds at every length too.
-        //
-        // 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 answer_is_px = answer_len.is_px();
-        if answer_is_px && self.content_len <= self.container_len {
-            painter.holds(self.axis, answer_px..=Px::MAX);
-        } else if answer_is_px && !self.snap_end {
-            let left = self.content_len - self.amt;
-            painter.holds(self.axis, Px::MIN..=left);
-        }
 
-        // Content that fills the viewport is the viewport, and is handed back
+        let mut region = UiRegion::FULL.offset(Vec2::from_axis(self.axis, -self.amt, 0.0));
-        // as it came -- it has nothing to scroll through, so the clamp above
+        region.axis_mut(self.axis).end = region.axis(self.axis).start.offset(self.content_len);
-        // has already put `amt` at zero. Writing the same box as its own
+        painter.widget_within(&self.inner, region);
-        // length in pixels is the same box in another form, and the two do
+        child
-        // not round alike: a part centred in `rel 1` lands a step from one
-        // centred in `px 900`, since halving a difference is not halving each
-        // part of it.
-        let content = match self.content_len > self.container_len {
-            true => {
-                let start = Len::from_parts(Rel::ZERO, -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
-        // 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.on_axis(self.axis).fills());
-        // 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)
     }
 }
 
@@ -81,24 +41,22 @@ impl Scroll {
         Self {
             inner,
             axis,
-            amt: Px::ZERO,
+            amt: 0.0,
             snap_end: true,
-            container_len: Px::ZERO,
+            container_len: 0.0,
-            content_len: Px::ZERO,
+            content_len: 0.0,
         }
     }
 
     pub fn update_amt(&mut self) {
-        self.amt = self.amt.max(Px::ZERO);
+        self.amt = self.amt.max(0.0);
-        let len = (self.content_len - self.container_len).max(Px::ZERO);
+        let len = (self.content_len - self.container_len).max(0.0);
         self.amt = self.amt.min(len);
         self.snap_end = self.amt == len;
     }
 
-    /// Scrolled by a distance the platform measures, which is the last place
-    /// a wheel notch or a finger is a float.
     pub fn scroll(&mut self, amt: f32) {
-        self.amt -= Px::from_f32(amt);
+        self.amt -= amt;
         self.update_amt();
     }
 }

src/widget/position/set_size.rs

@@ -0,0 +1,26 @@
+use crate::prelude::*;
+
+pub struct SetSize {
+    pub inner: StrongWidget,
+    pub x: Option<Len>,
+    pub y: Option<Len>,
+}
+
+impl Widget for SetSize {
+    fn draw(&mut self, painter: &mut Painter) -> Size {
+        let child = painter.widget(&self.inner).size();
+        Size {
+            x: self.x.unwrap_or(child.x),
+            y: self.y.unwrap_or(child.y),
+        }
+    }
+
+    /// A declared axis is known without looking at the child, which is what
+    /// lets a span lay out around `.height(rest(1))` without drawing it.
+    fn size_hint(&self, axis: Axis) -> Option<Len> {
+        match axis {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
+}

src/widget/position/span.rs

@@ -4,224 +4,73 @@ use std::marker::PhantomData;
 pub struct Span {
     pub children: Vec<StrongWidget>,
     pub dir: Dir,
-    pub gap: Px,
+    pub gap: f32,
 }
 
 impl Widget for Span {
-    fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
-        if axis != self.dir.axis {
-            // A share can be hidden when the other axis has no room. Its
-            // cross-axis length then contributes nothing to the drawn answer.
-            return None;
-        }
-        let mut total = RequestedLen::from(Len::from_parts(
-            Rel::ZERO,
-            self.gap
-                .mul_int(self.children.len().saturating_sub(1) as i32),
-        ));
-        for child in &self.children {
-            let child = requests.widget(child, axis)?;
-            total = requests.sum(total, child);
-        }
-        Some(total)
-    }
-
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter.with_requests(|painter, lens, values| self.layout(painter, lens, values))
-    }
-}
-
-impl Span {
-    fn layout(
-        &self,
-        painter: &mut Painter,
-        lens: &mut Vec<RequestedLen>,
-        values: &mut Vec<Px>,
-    ) -> Size {
         let axis = self.dir.axis;
-        // The row this span lays its children out along, as a length of the
+        // A length for every child before any is placed: from its own hint
-        // rel base they are laid out against. Where it starts is nothing's
+        // where it has one, and from drawing it where it does not.
-        // business -- a slot is a length from there -- so what this reads is
+        let lens: Vec<Len> = self
-        // the length alone.
+            .children
-        let row = painter.region_len(axis);
-        self.collect(painter, row, lens, true);
-        let gaps = self
-            .gap
-            .mul_int(self.children.len().saturating_sub(1) as i32);
-        let fixed = lens
             .iter()
-            .try_fold(Len::from_parts(Rel::ZERO, gaps), |sum, len| {
+            .map(|child| match painter.size_hint(child, axis) {
-                Some(sum + len.linear()?.without_leftover())
+                Some(len) => len,
-            });
+                None => painter.widget(child).len(axis),
-        if let Some(fixed) = fixed
+            })
-            && lens.iter().any(|len| len.has_leftover())
+            .collect();
-            && !painter.longer_than(row, fixed, axis)
-        {
-            // With no share to assign, intrinsic drawings keep the remaining
-            // offer, including overflow. Their answer is only moved into a slot.
-            self.collect(painter, row, lens, false);
-        }
-        let nonlinear = lens.iter().any(|len| len.linear().is_none());
-        if nonlinear {
-            painter.allocate(lens, row - Len::from_parts(Rel::ZERO, gaps), axis, values);
-        }
-        let allocated = nonlinear.then_some(&values);
-        let total = match &allocated {
-            Some(allocated) => LayoutLen {
-                px: allocated.iter().fold(gaps, |sum, len| sum + *len),
-                ..LayoutLen::ZERO
-            },
-            None => lens.iter().fold(
-                LayoutLen {
-                    px: gaps,
-                    ..LayoutLen::ZERO
-                },
-                |sum, len| sum + len.linear().unwrap(),
-            ),
-        };
-        let all_fixed = total.without_leftover();
-        let room = row - all_fixed;
-        let any_leftover = total.leftover > Weight::ZERO;
-        let has_room = any_leftover && painter.longer_than(row, all_fixed, axis);
 
-        // Across itself a span is as long as its longest child -- unless a
+        let gap = self.gap * self.children.len().saturating_sub(1) as f32;
-        // rule beside it gives that length outright, and then reading them
+        let total = lens.iter().fold(Len::abs(gap), |sum, len| sum + *len);
-        // answers nothing and makes its size depend on theirs for it. A rule
+
-        // that only bounds the length does not count: the answer is still
+        let mut start = UiScalar::rel_min();
-        // this span's to give.
+        let mut ortho = Len::ZERO;
-        let shrinks = !painter.has_exact_size(!axis);
+        for (child, len) in self.children.iter().zip(&lens) {
-        // What the fixed parts and the gaps before here take, which is a sum
+            let mut span = UiSpan::FULL;
-        // of lengths and exact, and how much of the leftover weight is
+            span.start = start;
-        // spoken for. Both ends of a slot are read from those two rather
+            if len.rest > 0.0 {
-        // than stepped from the last child: the share of the room is
+                let offset = UiScalar::new(total.rel, total.abs);
-        // rounded, and taking each end from the one before it would carry
+                let rel_end = UiScalar::rel(len.rest / total.rest);
-        // every rounding along the row.
+                let end = (UiScalar::rel_max() + start) - offset;
-        let mut fixed = Len::ZERO;
+                start = rel_end.within(&start.to(end));
-        let mut taken = Weight::ZERO;
-        let mut ortho = LayoutLen::ZERO;
-        // Nothing divides the room where no child asked for any of it, and a
-        // ratio of a whole of nothing has no answer.
-        let reached = |fixed: Len, taken: Weight| match any_leftover {
-            false => fixed,
-            true => fixed + room.scale(Rel::ratio(taken, total.leftover)),
-        };
-        for (index, (child, request)) in self.children.iter().zip(lens.iter()).enumerate() {
-            let len = match &allocated {
-                Some(allocated) => LayoutLen {
-                    px: allocated[index],
-                    ..LayoutLen::ZERO
-                },
-                None => request.linear().unwrap(),
-            };
-            let shares = match &allocated {
-                Some(_) => request.has_leftover(),
-                None => len.leftover > Weight::ZERO && has_room,
-            };
-            // 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() && !has_room)
-                || (allocated.is_some() && shares && len.px == Px::ZERO)
-            {
-                painter.undraw(child);
-                fixed.px += self.gap;
-                continue;
             }
-            let from = reached(fixed, taken);
+            start.abs += len.abs;
-            if shares {
+            start.rel += len.rel;
-                taken += len.leftover;
+            span.end = start;
+            let mut region = UiRegion::from_axis(axis, span, UiSpan::FULL);
+            if self.dir.sign == Sign::Neg {
+                region.flip(axis);
             }
-            fixed += len.without_leftover();
+            let used = painter.widget_within(child, region).size().axis(!axis);
-            let to = reached(fixed, taken);
+            // TODO: rel shouldn't do this, but no easy way before actually calculating pixels
-            // Along the row the span says where the child goes, and that slot
+            if used.rel > 0.0 || used.rest > 0.0 {
-            // is the child's box outright rather than something to place an
+                ortho = Len::REST;
-            // answer inside again. A share is decided here and nowhere
+            } else if ortho.rest == 0.0 {
-            // else: its slot narrows its rel base, and the child is asked in
+                ortho.abs = ortho.abs.max(used.abs);
-            // 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 = self.slot(row, from, to);
-            let mut place = slot.shifted_desc().allocated().on_axis(axis);
-            if shares {
-                place = place.rel_base(axis, slot.len());
             }
-            let used = painter.place_at(child, place).len(!axis);
+            start.abs += self.gap;
-            if shrinks {
-                // Choosing between a fixed and a relative length from the
-                // span's own eventual width admits multiple fixed points.
-                // A scalable child therefore makes the span scalable too;
-                // only fixed children are compared with one another.
-                if !used.is_px() {
-                    ortho = LayoutLen::LEFTOVER;
-                } else if ortho.leftover == Weight::ZERO {
-                    ortho.px = ortho.px.max(used.px);
-                }
-            }
-            fixed.px += self.gap;
         }
 
-        // Discovery carries nested requests to the allocating ancestor. The
+        let along = match total.rest == 0.0 && total.rel == 0.0 {
-        // draw still returns an ordinary Size for callers measuring content.
+            true => total,
-        let ortho = match shrinks {
+            false => Len::default(),
-            true => ortho,
-            false => LayoutLen::rel(1.0),
         };
-        Size::from_axis(axis, total, ortho)
+        Size::from_axis(axis, along, ortho)
     }
 }
 
 impl Span {
-    fn collect(
-        &self,
-        painter: &mut Painter,
-        row: Len,
-        lens: &mut Vec<RequestedLen>,
-        discover: bool,
-    ) {
-        let axis = self.dir.axis;
-        let mut cursor = Len::ZERO;
-        lens.clear();
-        for child in &self.children {
-            let request = if discover {
-                painter.size_request(child, axis)
-            } else {
-                painter.size_hint(child, axis).map(Into::into)
-            };
-            let len = match request {
-                Some(len) => len,
-                None => {
-                    let room = self.slot(row, cursor, row).shifted_desc().on_axis(axis);
-                    let len = painter.widget_at(child, room).len(axis);
-                    painter.measured_request(child, axis, len)
-                }
-            };
-            cursor += painter.minimum_request(&len, axis);
-            cursor.px += self.gap;
-            lens.push(len);
-        }
-    }
-
-    /// The stretch of the row between two distances from where this span
-    /// starts laying children out, as a span of its own box. A negative
-    /// direction lays out from the far end, so the same two distances mirror
-    /// in a row `row` long.
-    fn slot(&self, row: Len, from: Len, to: Len) -> UiSpan {
-        match self.dir.sign {
-            Sign::Pos => from.to(to),
-            Sign::Neg => (row - to).to(row - from),
-        }
-    }
-
     pub fn empty(dir: Dir) -> Self {
         Self {
             children: Vec::new(),
             dir,
-            gap: Px::ZERO,
+            gap: 0.0,
         }
     }
 
     pub fn gap(mut self, gap: impl UiNum) -> Self {
-        self.gap = Px::from_num(gap);
+        self.gap = gap.to_f32();
         self
     }
 
@@ -237,7 +86,7 @@ impl Span {
 pub struct SpanBuilder<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag> {
     pub children: Wa,
     pub dir: Dir,
-    pub gap: Px,
+    pub gap: f32,
     _pd: PhantomData<(State, Tag)>,
 }
 
@@ -263,13 +112,13 @@ impl<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag>
         Self {
             children,
             dir,
-            gap: Px::ZERO,
+            gap: 0.0,
             _pd: PhantomData,
         }
     }
 
     pub fn gap(mut self, gap: impl UiNum) -> Self {
-        self.gap = Px::from_num(gap);
+        self.gap = gap.to_f32();
         self
     }
 }

src/widget/position/stack.rs

@@ -8,64 +8,26 @@ pub struct Stack {
 }
 
 impl Widget for Stack {
-    fn size_request(&self, requests: &mut SizeRequests, axis: Axis) -> Option<RequestedLen> {
-        match self.size {
-            StackSize::Default => Some(LayoutLen::LEFTOVER.into()),
-            StackSize::Child(i) => match self.children.get(i) {
-                Some(child) => requests.widget(child, axis),
-                None => Some(LayoutLen::LEFTOVER.into()),
-            },
-        }
-    }
-
     fn draw(&mut self, painter: &mut Painter) -> Size {
         let sizing = match self.size {
             StackSize::Default => None,
             StackSize::Child(i) => Some(i),
         };
-        // Whichever child sizes the stack is given the stack's whole box --
+        let mut size = Size::default();
-        // the stack is the length that child asked for, so placing that
-        // answer inside the box it decided would apply it twice.
-        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()
-            }
-            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::from_axes(|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() {
+            match i {
+                0 => painter.child_layer(),
+                _ => painter.next_layer(),
+            }
+            let drawn = painter.widget(child);
+            // Only the child that sizes the stack is read, so the others
+            // changing size does not redraw it.
             if sizing == Some(i) {
-                continue;
+                size = drawn.size();
             }
-            painter.child_layer_at(i);
-            painter.widget_at(child, place);
         }
         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/ptr.rs

@@ -1,20 +1,11 @@
 use crate::prelude::*;
 use std::marker::Unsize;
 
-/// One widget in a box of its own, doing as little as possible on the way:
+pub struct WidgetPtr {
-/// it draws its child in the whole of its box and reports back what the child
-/// said. It exists because a length and an alignment are properties of one
-/// widget, so a widget cannot both be 100 wide and take two shares of a row
-/// -- the two lengths need two widgets, and this is the smaller one.
-///
-/// Its child is optional so it can also be the swappable slot a tab bar
-/// needs, which is what it was written for.
-#[derive(Default)]
-pub struct Wrapper {
     pub inner: Option<StrongWidget>,
 }
 
-impl Widget for Wrapper {
+impl Widget for WidgetPtr {
     fn draw(&mut self, painter: &mut Painter) -> Size {
         match &self.inner {
             Some(id) => painter.widget(id).size(),
@@ -23,11 +14,15 @@ impl Widget for Wrapper {
     }
 }
 
-impl Wrapper {
+impl WidgetPtr {
     pub fn new() -> Self {
         Self::default()
     }
-
+    pub fn empty() -> Self {
+        Self {
+            inner: Default::default(),
+        }
+    }
     pub fn set<W: ?Sized + Unsize<dyn Widget>>(&mut self, to: StrongWidget<W>) {
         self.inner = Some(to)
     }
@@ -39,3 +34,9 @@ impl Wrapper {
         self.inner.replace(to)
     }
 }
+
+impl Default for WidgetPtr {
+    fn default() -> Self {
+        Self::empty()
+    }
+}

src/widget/rect.rs

@@ -35,11 +35,16 @@ impl Widget for Rect {
             thickness: self.thickness,
             inner_radius: self.inner_radius,
         });
-        Size::LEFTOVER
+        Size::REST
     }
 
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
+    fn size_hint(&self, _: Axis) -> Option<Len> {
-        Some(LayoutLen::LEFTOVER)
+        Some(Len::REST)
+    }
+
+    /// Its box is its primitive's own region, so a new one is written there.
+    fn on_resize(&self, _: Axis) -> OnResize {
+        OnResize::Scale
     }
 }
 

src/widget/text/edit.rs

@@ -93,6 +93,10 @@ impl Widget for TextEdit {
         );
         size
     }
+
+    fn on_resize(&self, axis: Axis) -> OnResize {
+        self.view.on_resize(axis)
+    }
 }
 
 const CARET_WIDTH: f32 = 1.0;
@@ -126,6 +130,7 @@ impl<'a> TextEditCtx<'a> {
     pub fn set(&mut self, text: &str) {
         let text = self.string(text);
         self.text.view.buf.set_text(text);
+        self.text.view.buf.changed = true;
         self.text.selection = None;
     }
 
@@ -172,6 +177,7 @@ impl<'a> TextEditCtx<'a> {
         };
         let at = at.min(self.text.view.buf.text().len());
         self.text.view.buf.edit().insert_str(at, text);
+        self.text.view.buf.changed = true;
         self.set_caret(at + text.len());
     }
 
@@ -184,6 +190,7 @@ impl<'a> TextEditCtx<'a> {
         }
         let range = sel.text_range();
         self.text.view.buf.edit().replace_range(range.clone(), "");
+        self.text.view.buf.changed = true;
         self.set_caret(range.start);
         true
     }
@@ -261,6 +268,7 @@ impl<'a> TextEditCtx<'a> {
 
     fn delete_range(&mut self, start: usize, end: usize) {
         self.text.view.buf.edit().replace_range(start..end, "");
+        self.text.view.buf.changed = true;
         self.set_caret(start);
     }
 
@@ -276,13 +284,7 @@ impl<'a> TextEditCtx<'a> {
     }
 
     pub fn select(&mut self, pos: Vec2, size: Vec2, drag: bool, recent: bool) {
-        let pos = pos
+        let pos = pos - self.text.region().top_left().to_abs(size);
-            - self
-                .text
-                .region()
-                .top_left()
-                .to_px(PxVec2::from_f32(size))
-                .to_f32();
         let prev_sel = self.text.selection;
         let prev_hit = self.text.double_hit;
 
@@ -321,10 +323,12 @@ impl<'a> TextEditCtx<'a> {
         let old = (self.text.view.buf.text().to_string(), self.text.selection);
         let mut undo = false;
         let res = self.apply_event_inner(event, modifiers, &mut undo);
-        if undo && let Some((old, selection)) = self.text.history.pop() {
+        if undo {
-            self.set(&old);
+            if let Some((old, selection)) = self.text.history.pop() {
-            self.text.selection = selection;
+                self.set(&old);
-            self.clamp_selection_to_layout();
+                self.text.selection = selection;
+                self.clamp_selection_to_layout();
+            }
         } else if self.text.view.buf.text() != old.0 {
             self.text.history.push(old);
         }

src/widget/text/mod.rs

@@ -14,8 +14,11 @@ pub struct Text {
 }
 
 pub struct TextView {
-    pub attrs: TextAttrs,
+    pub attrs: MutDetect<TextAttrs>,
-    pub buf: TextBuffer,
+    pub buf: MutDetect<TextBuffer>,
+    // cache
+    tex: Option<RenderedText>,
+    width: Option<f32>,
     pub hint: Option<StrongWidget>,
 }
 
@@ -25,13 +28,19 @@ impl TextView {
     }
 
     pub fn wrap_width(&self) -> Option<f32> {
-        self.buf.wrap_width()
+        self.width
     }
 }
 
 impl TextView {
     pub fn new(buf: TextBuffer, attrs: TextAttrs, hint: Option<StrongWidget>) -> Self {
-        Self { attrs, buf, hint }
+        Self {
+            attrs: attrs.into(),
+            buf: buf.into(),
+            tex: None,
+            width: None,
+            hint,
+        }
     }
 
     /// region where the text should be draw
@@ -43,22 +52,22 @@ impl TextView {
             .align(self.align)
     }
 
-    /// The text shaped for the width it is drawn in. The buffer keeps its
-    /// answers under the attrs too, so changing those asks a new question
-    /// rather than invalidating anything.
     fn render(&mut self, painter: &mut Painter) -> &RenderedText {
-        let width = self.attrs.wrap.then(|| painter.px_len(Axis::X));
+        let width = if self.attrs.wrap {
-        // The shaper measures in floats, which is where a glyph advance comes
+            Some(painter.px_size().x)
-        // from; what it answers goes back on the grid.
+        } else {
-        painter.render_text(&mut self.buf, &self.attrs, width.map(Px::to_f32));
+            None
-        if width.is_some() {
+        };
-            painter.holds(Axis::X, self.buf.width_holds());
+        if width != self.width || self.tex.is_none() || self.attrs.changed || self.buf.changed {
+            self.width = width;
+            self.tex = Some(painter.render_text(&mut self.buf, &self.attrs, width));
+            self.attrs.changed = false;
+            self.buf.changed = false;
         }
-        self.buf.rendered().expect("render_text placed the glyphs")
+        self.tex.as_ref().unwrap()
     }
-
     pub fn tex(&self) -> Option<&RenderedText> {
-        self.buf.rendered()
+        self.tex.as_ref()
     }
     /// Draws the text, and says where the glyphs went and what they use.
     pub fn draw(&mut self, painter: &mut Painter) -> (UiRegion, Size) {
@@ -74,16 +83,28 @@ impl TextView {
 
         let tex = self.render(painter);
         let region = tex.size.align(align);
-        // The step at or above what the shaper measured, so a parent that
+        let size = Size::abs(tex.size);
-        // hands back the length this reports hands back a box the longest
+        let within = region.within(&painter.region());
-        // line fits in. Rounded to the nearest step it is half the time a
+        painter.glyphs(tex, within);
-        // 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);
         (region, size)
     }
 
+    /// Wrapping reads the width it is offered, so a wider box reshapes it and
+    /// a taller one does not. Alignment matters too, and separately: glyphs
+    /// anchored to the start of an axis stay put when that extent changes,
+    /// but centred or end-aligned ones move even though the shaping stands.
+    pub fn on_resize(&self, axis: Axis) -> OnResize {
+        let reshapes = axis == Axis::X && self.attrs.wrap;
+        let anchored = match axis {
+            Axis::X => self.align.x,
+            Axis::Y => self.align.y,
+        } == AxisAlign::Neg;
+        match reshapes || !anchored {
+            true => OnResize::Redraw,
+            false => OnResize::Translate,
+        }
+    }
+
     pub fn content(&self) -> String {
         self.buf.text().to_string()
     }
@@ -110,6 +131,10 @@ impl Widget for Text {
         self.update_buf();
         self.view.draw(painter).1
     }
+
+    fn on_resize(&self, axis: Axis) -> OnResize {
+        self.view.on_resize(axis)
+    }
 }
 
 impl Deref for Text {

src/widget/trait_fns.rs

@@ -12,23 +12,14 @@ widget_trait! {
         }
     }
 
-    fn align(self, align: impl Into<Align>) -> impl WidgetIdFn<Rsc, WL::Widget> {
+    fn align(self, align: impl Into<Align>) -> impl WidgetFn<Rsc, Aligned> {
-        // An axis left out keeps whatever it had, which is centered unless
+        move |state| Aligned {
-        // something else set it.
+            inner: self.add_strong(state),
-        let align = align.into();
+            align: align.into(),
-        move |state| {
-            let id = self.add(state);
-            let widgets = &mut state.ui_mut().widgets;
-            for axis in Axis::BOTH {
-                if let Some(align) = align[axis] {
-                    widgets.set_alignment(id, axis, align);
-                }
-            }
-            id
         }
     }
 
-    fn center(self) -> impl WidgetIdFn<Rsc, WL::Widget> {
+    fn center(self) -> impl WidgetFn<Rsc, Aligned> {
         self.align(Align::CENTER)
     }
 
@@ -40,63 +31,15 @@ widget_trait! {
         }
     }
 
-    fn region_node(self) -> impl WidgetIdFn<Rsc, WL::Widget> {
+    fn sized(self, size: impl Into<Size>) -> impl WidgetFn<Rsc, SetSize> {
-        |state| {
-            let id = self.add(state);
-            state.ui_mut().widgets.set_region_node(id, true);
-            id
-        }
-    }
-
-    fn sized(self, size: impl Into<Size>) -> impl WidgetIdFn<Rsc, WL::Widget> {
         let size = size.into();
-        move |state| {
+        move |state| SetSize {
-            let id = self.add(state);
+            inner: self.add_strong(state),
-            let widgets = &mut state.ui_mut().widgets;
+            x: Some(size.x),
-            widgets.set_size_rule(id, Axis::X, SizeRule::Exact(size.x));
+            y: Some(size.y),
-            widgets.set_size_rule(id, Axis::Y, SizeRule::Exact(size.y));
-            id
         }
     }
 
-    fn width(self, len: impl Into<SizeRequest>) -> impl WidgetIdFn<Rsc, WL::Widget> {
-        let len = len.into();
-        move |state| {
-            let id = self.add(state);
-            state
-                .ui_mut()
-                .widgets
-                .set_size_rule(id, Axis::X, SizeRule::from(len));
-            id
-        }
-    }
-
-    /// Answers at least this wide, whatever it drew: a rule beside the
-    /// widget, so what a row gives it is at least this even where the widget
-    /// itself wanted less. The box it draws in is untouched -- for that, see
-    /// [`MaxSize`].
-    fn min_width(self, len: impl Into<Len>) -> impl WidgetIdFn<Rsc, WL::Widget> {
-        let len = len.into();
-        move |state| {
-            let id = self.add(state);
-            state.ui_mut().widgets.set_min_len(id, Axis::X, len);
-            id
-        }
-    }
-
-    fn min_height(self, len: impl Into<Len>) -> impl WidgetIdFn<Rsc, WL::Widget> {
-        let len = len.into();
-        move |state| {
-            let id = self.add(state);
-            state.ui_mut().widgets.set_min_len(id, Axis::Y, len);
-            id
-        }
-    }
-
-    /// Puts this in a [`MaxSize`]: it is asked in the shorter of the cap and
-    /// the box that widget was given, and is as long as it used, held to the
-    /// cap. A widget rather than a rule because the box is whoever asked's to
-    /// decide -- see [`MaxSize`].
     fn max_width(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, MaxSize> {
         let len = len.into();
         move |state| MaxSize {
@@ -115,15 +58,21 @@ widget_trait! {
         }
     }
 
-    fn height(self, len: impl Into<SizeRequest>) -> impl WidgetIdFn<Rsc, WL::Widget> {
+    fn width(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, SetSize> {
         let len = len.into();
-        move |state| {
+        move |state| SetSize {
-            let id = self.add(state);
+            inner: self.add_strong(state),
-            state
+            x: Some(len),
-                .ui_mut()
+            y: None,
-                .widgets
+        }
-                .set_size_rule(id, Axis::Y, SizeRule::from(len));
+    }
-            id
+
+    fn height(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, SetSize> {
+        let len = len.into();
+        move |state| SetSize {
+            inner: self.add_strong(state),
+            x: None,
+            y: Some(len),
         }
     }
 
@@ -136,9 +85,7 @@ widget_trait! {
 
     fn scrollable(self) -> impl WidgetIdFn<Rsc, Scroll> where Rsc: HasEvents {
         move |state| {
-            let inner = self.add(state);
+            Scroll::new(self.add_strong(state), Axis::Y)
-            state.ui_mut().widgets.set_region_node(inner, true);
-            Scroll::new(inner.upgrade(state), Axis::Y)
                 .on(CursorSense::Scroll, |ctx, rsc| {
                     let delta = ctx.data.scroll_delta.y * 50.0;
                     ctx.widget(rsc).scroll(delta);
@@ -178,13 +125,9 @@ widget_trait! {
         |state| self.add(state)
     }
 
-    // Named for the type it makes rather than as `wrapped`, which would read
+    fn set_ptr(self, ptr: WeakWidget<WidgetPtr>, state: &mut Rsc) {
-    // as the text setting. `widget_trait!` takes no attributes, so what it is
+        let id = self.add_strong(state);
-    // for is on `Wrapper` itself.
+        state.ui_mut().widgets[ptr].inner = Some(id);
-    fn wrapper(self) -> impl WidgetFn<Rsc, Wrapper> {
-        |state| Wrapper {
-            inner: Some(self.add_strong(state)),
-        }
     }
 }
 

tests/allocation_cost.rs

@@ -1,80 +0,0 @@
-use iris::{harness::Harness, prelude::*};
-use std::{
-    alloc::{GlobalAlloc, Layout, System},
-    cell::Cell,
-};
-
-struct Counting;
-thread_local! {
-    static COUNT: Cell<Option<usize>> = const { Cell::new(None) };
-}
-fn count() {
-    COUNT.with(|count| {
-        if let Some(n) = count.get() {
-            count.set(Some(n + 1));
-        }
-    });
-}
-// The wrapper preserves System's allocation and deallocation contracts;
-// observing calls here also counts allocations hidden inside layout helpers.
-unsafe impl GlobalAlloc for Counting {
-    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        count();
-        unsafe { System.alloc(layout) }
-    }
-    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        unsafe { System.dealloc(ptr, layout) }
-    }
-    unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, size: usize) -> *mut u8 {
-        count();
-        unsafe { System.realloc(ptr, layout, size) }
-    }
-}
-#[global_allocator]
-static ALLOCATOR: Counting = Counting;
-
-#[test]
-fn unchanged_tree_reuses_layout_storage() {
-    for deferred in [false, true] {
-        let mut h = Harness::new((600, 200));
-        let mut children: Vec<StrongWidget> = Vec::new();
-        for _ in 0..8 {
-            let a = rect(Color::RED).add(&mut h.rsc);
-            if deferred {
-                h.rsc
-                    .widgets_mut()
-                    .set_size_rule(a, Axis::X, leftover(1).clamp(20, 80).into());
-            }
-            let row = (a, rect(Color::BLUE))
-                .span(Dir::RIGHT)
-                .add_strong(&mut h.rsc);
-            children.push(row);
-        }
-        let root = h.rsc.widgets_mut().add_strong(Span {
-            children,
-            dir: Dir::DOWN,
-            gap: Px::ZERO,
-        });
-        h.state.root = Some(root);
-        h.frame();
-        let ids: Vec<_> = h.render.active.keys().copied().collect();
-        for frame in 0..8 {
-            for &id in &ids {
-                h.rsc.widgets_mut().mark_for_redraw(id);
-            }
-            h.resize((600 + frame % 2, 200));
-            h.frame();
-        }
-        COUNT.set(Some(0));
-        for frame in 0..100 {
-            for &id in &ids {
-                h.rsc.widgets_mut().mark_for_redraw(id);
-            }
-            h.resize((600 + frame % 2, 200));
-            h.frame();
-        }
-        let allocations = COUNT.replace(None).unwrap();
-        println!("deferred={deferred}: {allocations} allocations over 100 resize frames");
-        assert_eq!(allocations, 0);
-    }
-}

tests/cases/deferred.rs

@@ -1,381 +0,0 @@
-use std::{cell::Cell, rc::Rc};
-
-use iris::harness::{Harness, assert_corners};
-use iris::prelude::*;
-
-struct Counted {
-    draws: Rc<Cell<usize>>,
-}
-
-impl Widget for Counted {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        self.draws.set(self.draws.get() + 1);
-        painter.px_size();
-        painter.primitive(RectPrimitive::color(Color::RED));
-        Size::LEFTOVER
-    }
-
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
-        Some(LayoutLen::LEFTOVER)
-    }
-}
-
-#[test]
-fn a_capped_share_returns_room_to_its_sibling() {
-    let mut h = Harness::new((300, 100));
-    let first = rect(Color::RED).max_width(80).add(&mut h.rsc);
-    let second = rect(Color::BLUE).add(&mut h.rsc);
-    h.set_root((first, second).span(Dir::RIGHT));
-    assert_corners!(h, first, (0, 0), (80, 100));
-    assert_corners!(h, second, (80, 0), (300, 100));
-    h.resize((100, 100));
-    h.frame();
-    assert_corners!(h, first, (0, 0), (50, 100));
-    assert_corners!(h, second, (50, 0), (100, 100));
-    h.resize((300, 100));
-    h.frame();
-    assert_corners!(h, first, (0, 0), (80, 100));
-    assert_corners!(h, second, (80, 0), (300, 100));
-}
-
-#[test]
-fn nested_shares_are_discovered_without_provisional_paint() {
-    let mut h = Harness::new((400, 100));
-    let draws = Rc::new(Cell::new(0));
-    let leaf = h.rsc.ui_mut().widgets.add_strong(Counted {
-        draws: draws.clone(),
-    });
-    let leaf_id = leaf.id();
-    let mut inner: StrongWidget = leaf;
-    for _ in 0..8 {
-        let sibling = rect(Color::BLUE).add_strong(&mut h.rsc);
-        inner = h.rsc.ui_mut().widgets.add_strong(Span {
-            children: vec![inner, sibling],
-            dir: Dir::RIGHT,
-            gap: Px::ZERO,
-        });
-    }
-    h.state.root = Some(inner);
-    h.frame();
-    assert_eq!(draws.get(), 1);
-    assert!(h.region(&leaf_id).is_some());
-    h.resize((800, 100));
-    h.frame();
-    assert_eq!(draws.get(), 2);
-}
-
-#[test]
-fn nested_bounds_are_resolved_in_the_outer_allocation() {
-    let mut h = Harness::new((300, 100));
-    let a = rect(Color::RED).max_width(40).add(&mut h.rsc);
-    let b = rect(Color::GREEN).max_width(60).add(&mut h.rsc);
-    let inner = (a, b).span(Dir::RIGHT).add(&mut h.rsc);
-    let tail = rect(Color::BLUE).add(&mut h.rsc);
-    h.set_root((inner, tail).span(Dir::RIGHT));
-    assert_corners!(h, a, (0, 0), (40, 100));
-    assert_corners!(h, b, (40, 0), (100, 100));
-    assert_corners!(h, tail, (100, 0), (300, 100));
-}
-
-#[test]
-fn request_edits_in_a_nested_child_reach_the_allocator() {
-    let mut h = Harness::new((300, 100));
-    let a = rect(Color::RED).max_width(80).add(&mut h.rsc);
-    let inner = (a,).span(Dir::RIGHT).add(&mut h.rsc);
-    let tail = rect(Color::BLUE).add(&mut h.rsc);
-    h.set_root((inner, tail).span(Dir::RIGHT));
-    h.rsc.ui_mut().widgets.get_mut(&a).unwrap().x = Some(Len::px(40.0));
-    h.frame();
-    assert_corners!(h, a, (0, 0), (40, 100));
-    assert_corners!(h, tail, (40, 0), (300, 100));
-}
-
-#[test]
-fn adding_a_bound_to_a_previously_unbounded_share_reallocates_the_row() {
-    let mut h = Harness::new((300, 100));
-    let a = rect(Color::RED).add(&mut h.rsc);
-    let b = rect(Color::BLUE).add(&mut h.rsc);
-    h.set_root((a, b).span(Dir::RIGHT));
-    h.resize((400, 100));
-    h.frame();
-    h.rsc
-        .widgets_mut()
-        .set_size_rule(a, Axis::X, SizeRule::Max(Len::px(80.0)));
-    h.frame();
-    assert_corners!(h, a, (0, 0), (80, 100));
-    assert_corners!(h, b, (80, 0), (400, 100));
-}
-
-#[test]
-fn a_deferred_comparison_can_compare_two_different_weights() {
-    let a = SizeRequest::from(leftover(1.0) + px(30.0)).min(leftover(2.0));
-    let b = SizeRequest::from(leftover(1.0)).clamp(px(20.0), px(100.0));
-    let mut h = Harness::new((60, 100));
-    let a = rect(Color::RED).width(a).add(&mut h.rsc);
-    let b = rect(Color::BLUE).width(b).add(&mut h.rsc);
-    h.set_root((a, b).span(Dir::RIGHT));
-    assert_corners!(h, a, (0, 0), (40, 100));
-    assert_corners!(h, b, (40, 0), (60, 100));
-    h.resize((300, 100));
-    h.frame();
-    assert_corners!(h, a, (0, 0), (200, 100));
-    assert_corners!(h, b, (200, 0), (300, 100));
-}
-
-#[test]
-fn a_length_expression_is_resolved_before_wrapping_text() {
-    let mut h = Harness::new((300, 500));
-    let text = wtext("one two three four five six seven eight nine ten")
-        .size(16)
-        .wrap(true)
-        .width(leftover(1).clamp(40, 80))
-        .add(&mut h.rsc);
-    let other = rect(Color::BLUE).add(&mut h.rsc);
-    h.set_root((text, other).span(Dir::RIGHT));
-    let box_ = h.region(&text).unwrap();
-    assert_eq!(box_.top_left.x, Px::ZERO);
-    assert_eq!(box_.bot_right.x, Px::from_int(80));
-    assert!(box_.bot_right.y - box_.top_left.y > Px::from_int(30));
-    assert_corners!(h, other, (80, 0), (300, 500));
-}
-
-#[test]
-fn relative_bounds_keep_the_allocators_base() {
-    let mut h = Harness::new((300, 100));
-    let head = rect(Color::BLUE).width(30).add(&mut h.rsc);
-    let bounded = rect(Color::RED)
-        .width(leftover(1).min(rel(0.25)))
-        .add(&mut h.rsc);
-    let tail = rect(Color::GREEN).add(&mut h.rsc);
-    h.set_root((head, bounded, tail).span(Dir::RIGHT));
-    assert_corners!(h, bounded, (30, 0), (105, 100));
-    assert_corners!(h, tail, (105, 0), (300, 100));
-    h.resize((400, 100));
-    h.frame();
-    assert_corners!(h, bounded, (30, 0), (130, 100));
-    assert_corners!(h, tail, (130, 0), (400, 100));
-}
-
-#[test]
-fn the_root_resolves_a_deferred_request_again_after_resize() {
-    let mut h = Harness::new((300, 100));
-    let bounded = rect(Color::RED)
-        .width(leftover(1).min(rel(0.25)))
-        .add(&mut h.rsc);
-    h.set_root(bounded);
-    assert_corners!(h, bounded, (112.5, 0), (187.5, 100));
-    h.resize((400, 100));
-    h.frame();
-    assert_corners!(h, bounded, (150, 0), (250, 100));
-}
-
-#[test]
-fn filling_a_stack_does_not_mean_its_sizing_child_was_already_allocated() {
-    let mut h = Harness::new((300, 100));
-    let child = rect(Color::RED).width(leftover(1).min(80)).add(&mut h.rsc);
-    let overlay = rect(Color::BLUE).add(&mut h.rsc);
-    let children: Vec<StrongWidget> =
-        vec![child.add_strong(&mut h.rsc), overlay.add_strong(&mut h.rsc)];
-    h.set_root(Stack {
-        children,
-        size: StackSize::Child(0),
-    });
-    assert_corners!(h, child, (110, 0), (190, 100));
-    assert_corners!(h, overlay, (110, 0), (190, 100));
-}
-
-struct Unhinted;
-impl Widget for Unhinted {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter.px_size();
-        painter.primitive(RectPrimitive::color(Color::RED));
-        Size::LEFTOVER
-    }
-}
-
-#[test]
-fn bounds_also_apply_to_shares_discovered_by_drawing() {
-    let mut h = Harness::new((300, 100));
-    let a = h.rsc.widgets_mut().add_strong(Unhinted);
-    h.rsc
-        .widgets_mut()
-        .set_size_rule(a.id(), Axis::X, SizeRule::Max(Len::px(80.0)));
-    let id = a.id();
-    let b = rect(Color::BLUE).add_strong(&mut h.rsc);
-    let b_id = b.id();
-    h.state.root = Some(h.rsc.widgets_mut().add_strong(Span {
-        children: vec![a, b],
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }));
-    h.frame();
-    assert_corners!(h, id, (0, 0), (80, 100));
-    assert_corners!(h, b_id, (80, 0), (300, 100));
-    h.resize((100, 100));
-    h.frame();
-    assert_corners!(h, id, (0, 0), (50, 100));
-    assert_corners!(h, b_id, (50, 0), (100, 100));
-}
-
-#[test]
-fn comparisons_with_a_known_order_remain_plain_lengths() {
-    assert_eq!(leftover(2).max(leftover(5)), SizeRequest::from(leftover(5)));
-    assert_eq!(leftover(2).min(leftover(5)), SizeRequest::from(leftover(2)));
-    assert_eq!(
-        (px(10) + rel(0.5)).max(px(30) + rel(0.5)),
-        SizeRequest::from(px(30) + rel(0.5))
-    );
-    assert_eq!(LayoutLen::px(10).clamp(20, 80), SizeRequest::from(20));
-}
-
-#[test]
-fn a_measured_nested_share_keeps_its_comparison_for_the_outer_span() {
-    let mut h = Harness::new((300, 100));
-    let a = h.rsc.widgets_mut().add_strong(Unhinted);
-    let a_id = a.id();
-    h.rsc
-        .widgets_mut()
-        .set_size_rule(a_id, Axis::X, SizeRule::Max(Len::px(80.0)));
-    let b = rect(Color::BLUE).add_strong(&mut h.rsc);
-    let b_id = b.id();
-    let inner = h.rsc.widgets_mut().add_strong(Span {
-        children: vec![a, b],
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    });
-    let c = rect(Color::GREEN).add_strong(&mut h.rsc);
-    let c_id = c.id();
-    h.state.root = Some(h.rsc.widgets_mut().add_strong(Span {
-        children: vec![inner, c],
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }));
-    h.frame();
-    assert_corners!(h, a_id, (0, 0), (80, 100));
-    assert_corners!(h, b_id, (80, 0), (190, 100));
-    assert_corners!(h, c_id, (190, 0), (300, 100));
-    h.rsc
-        .widgets_mut()
-        .mark_for_redraw(h.state.root.as_ref().unwrap().id());
-    h.frame();
-    assert_corners!(h, c_id, (190, 0), (300, 100));
-}
-
-struct Natural;
-impl Widget for Natural {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter.primitive(RectPrimitive::color(Color::RED));
-        Size::from_axis(Axis::X, LayoutLen::px(64), LayoutLen::px(64))
-    }
-    fn size_hint(&self, _: Axis) -> Option<LayoutLen> {
-        Some(LayoutLen::px(64))
-    }
-}
-
-#[test]
-fn relative_bounds_on_a_hinted_child_track_the_offer_before_its_declared_size() {
-    fn tree(h: &mut Harness) -> WidgetId {
-        let natural = h.rsc.widgets_mut().add_strong(Natural);
-        let id = natural.id();
-        h.rsc
-            .widgets_mut()
-            .set_size_rule(id, Axis::X, SizeRule::Max(Len::rel(0.75)));
-        h.rsc.widgets_mut().set_size_rule(
-            id,
-            Axis::Y,
-            SizeRule::Clamp {
-                min: Len::rel(0.25),
-                max: Len::rel(0.75),
-            },
-        );
-        let inner = h.rsc.widgets_mut().add_strong(Stack {
-            children: vec![natural],
-            size: StackSize::Child(0),
-        });
-        let inner_id = inner.id();
-        let fill = rect(Color::BLUE).add_strong(&mut h.rsc);
-        let overlay = h.rsc.widgets_mut().add_strong(Stack {
-            children: vec![fill, inner],
-            size: StackSize::Child(0),
-        });
-        let share = rect(Color::GREEN).add_strong(&mut h.rsc);
-        let bounded = rect(Color::GREEN).add_strong(&mut h.rsc);
-        h.rsc.widgets_mut().set_size_rule(
-            bounded.id(),
-            Axis::X,
-            SizeRule::Clamp {
-                min: Len::rel(0.25),
-                max: Len::rel(0.75),
-            },
-        );
-        let fixed = wtext("one line, overflowing whatever it is given")
-            .size(16)
-            .wrap(false)
-            .add_strong(&mut h.rsc);
-        h.state.root = Some(h.rsc.widgets_mut().add_strong(Span {
-            children: vec![share, bounded, fixed, overlay],
-            dir: Dir::LEFT,
-            gap: Px::from_int(8),
-        }));
-        h.rsc.widgets_mut().set_size_rule(
-            h.state.root.as_ref().unwrap().id(),
-            Axis::Y,
-            LayoutLen::rel(1).into(),
-        );
-        h.frame();
-        inner_id
-    }
-    let mut warm = Harness::new((1920, 1200));
-    let a = tree(&mut warm);
-    warm.resize((640, 900));
-    warm.frame();
-    let mut cold = Harness::new((640, 900));
-    let b = tree(&mut cold);
-    assert_eq!(warm.region(&a), cold.region(&b));
-}
-
-#[test]
-fn a_bound_can_extend_an_explicit_share_request() {
-    let mut h = Harness::new((300, 100));
-    let a = rect(Color::RED)
-        .width(leftover(1))
-        .min_width(100)
-        .add(&mut h.rsc);
-    let b = rect(Color::BLUE).add(&mut h.rsc);
-    h.set_root((a, b).span(Dir::RIGHT));
-    assert_corners!(h, a, (0, 0), (150, 100));
-    h.resize((120, 100));
-    h.frame();
-    assert_corners!(h, a, (0, 0), (100, 100));
-    assert_corners!(h, b, (100, 0), (120, 100));
-}
-
-#[test]
-fn moving_scroll_content_preserves_its_resolved_expression_size() {
-    let mut h = Harness::new((300, 300));
-    let leaf = rect(Color::BLUE).add_strong(&mut h.rsc);
-    let leaf_id = leaf.id();
-    let content = h.rsc.widgets_mut().add_strong(Stack {
-        children: vec![leaf],
-        size: StackSize::Child(0),
-    });
-    let content_id = content.id();
-    h.rsc
-        .widgets_mut()
-        .set_size_rule(content_id, Axis::Y, leftover(1).min(120).into());
-    let scroll = h
-        .rsc
-        .widgets_mut()
-        .add_strong(Scroll::new(content, Axis::Y));
-    let scroll_id = scroll.id();
-    h.state.root = Some(scroll);
-    for _ in 0..3 {
-        h.rsc.widgets_mut().mark_for_redraw(scroll_id);
-        h.frame();
-        assert_corners!(h, content_id, (0, 90), (300, 210));
-        assert_corners!(h, leaf_id, (0, 90), (300, 210));
-    }
-    h.resize((300, 600));
-    h.frame();
-    assert_corners!(h, leaf_id, (0, 240), (300, 360));
-}

tests/cases/determinism.rs

@@ -1,103 +0,0 @@
-//! A measurement that decides control flow.
-//!
-//! Comparing boxes catches a widget that moved. It does not catch a widget
-//! that measured a child, believed a different answer from the one a cold
-//! start would give, and took the other branch -- which is the same defect
-//! arriving somewhere it cannot be ignored. A widget here branches on what it
-//! measured, so a disagreement shows up as a different tree.
-
-use iris::harness::Harness;
-use iris::prelude::*;
-
-/// Measures `probe` across `axis` and draws one of two children on the
-/// answer. Its own configuration never changes, so which child is drawn is a
-/// property of the layout alone.
-struct BranchesOnMeasurement {
-    probe: StrongWidget,
-    wide: StrongWidget,
-    narrow: StrongWidget,
-    threshold: f32,
-}
-
-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.on_axis(Axis::Y))
-            .len(Axis::X);
-        let px = painter.to_px(measured.apply_leftover(), Axis::X);
-
-        let below = UiSpan::new(cut, painter.region_len(Axis::Y)).shifted_desc();
-        let place = below.on_axis(Axis::Y);
-        match px > Px::from_f32(self.threshold) {
-            true => painter.widget_at(&self.wide, place),
-            false => painter.widget_at(&self.narrow, place),
-        };
-        Size::LEFTOVER
-    }
-}
-
-fn plant(h: &mut Harness, threshold: f32) -> (WidgetId, WidgetId) {
-    let words = "the quick brown fox jumps over the lazy dog and keeps running";
-    let probe = wtext(words).size(16).wrap(true).add(&mut h.rsc);
-    let wide = rect(Color::RED).add(&mut h.rsc);
-    let narrow = rect(Color::BLUE).add(&mut h.rsc);
-    let branch = BranchesOnMeasurement {
-        probe: probe.add_strong(&mut h.rsc),
-        wide: wide.add_strong(&mut h.rsc),
-        narrow: narrow.add_strong(&mut h.rsc),
-        threshold,
-    }
-    .add(&mut h.rsc);
-    let side = rect(Color::GREEN).width(120).add(&mut h.rsc);
-    h.set_root((side, branch).span(Dir::RIGHT));
-    (wide.id(), narrow.id())
-}
-
-/// Which of the two branches drew, as a pair a test can compare.
-fn taken(h: &Harness, wide: WidgetId, narrow: WidgetId) -> (bool, bool) {
-    (h.region(&wide).is_some(), h.region(&narrow).is_some())
-}
-
-#[test]
-fn a_branch_taken_on_a_measurement_holds_across_repaints() {
-    for threshold in [0.0, 200.0, 400.0, 600.0, 779.0, 780.0, 781.0, 2000.0] {
-        let mut h = Harness::new((900, 600));
-        let (wide, narrow) = plant(&mut h, threshold);
-        let first = taken(&h, wide, narrow);
-        assert_ne!(first, (false, false), "threshold {threshold}: neither drew");
-
-        for frame in 0..4 {
-            h.rsc.widgets_mut().mark_for_redraw(wide);
-            h.rsc.widgets_mut().mark_for_redraw(narrow);
-            h.frame();
-            assert_eq!(
-                taken(&h, wide, narrow),
-                first,
-                "threshold {threshold}, repaint {frame}: the branch moved when nothing did"
-            );
-        }
-    }
-}
-
-#[test]
-fn a_branch_taken_on_a_measurement_is_the_one_a_cold_start_takes() {
-    for threshold in [0.0, 200.0, 400.0, 600.0, 779.0, 780.0, 781.0, 2000.0] {
-        let mut warm = Harness::new((900, 600));
-        let (wide, narrow) = plant(&mut warm, threshold);
-        warm.resize((640, 480));
-        warm.frame();
-        warm.rsc.widgets_mut().mark_for_redraw(wide);
-        warm.frame();
-
-        let mut cold = Harness::new((640, 480));
-        let (cwide, cnarrow) = plant(&mut cold, threshold);
-
-        assert_eq!(
-            taken(&warm, wide, narrow),
-            taken(&cold, cwide, cnarrow),
-            "threshold {threshold}: warm and cold took different branches"
-        );
-    }
-}

tests/cases/drift.rs

@@ -1,45 +0,0 @@
-//! What a retained drawing costs in accuracy when it is moved instead of made
-//! again. A subtree's stored regions are the only record of where it is, so a
-//! move that works from the last answer rather than from the box it is now in
-//! integrates its own rounding, and nothing later recomputes it. Re-expressing
-//! each part as the same fraction of the new box is what keeps a long-lived
-//! layout on the one a cold start produces.
-
-use iris::harness::Harness;
-use iris::prelude::*;
-
-/// A row of a fixed height under a bar, so changing the bar's height moves the
-/// row without changing the box it is given: the move path, repeatedly.
-fn plant(h: &mut Harness, bar_height: f32) -> (WeakWidget<Rect>, WeakWidget<Rect>) {
-    let bar = rect(Color::RED).height(bar_height).add(&mut h.rsc);
-    let inner = rect(Color::BLUE).add(&mut h.rsc);
-    let row = (inner, rect(Color::GREEN)).span(Dir::RIGHT).height(100);
-    h.set_root((bar, row).span(Dir::DOWN));
-    (bar, inner)
-}
-
-/// Enough moves to pass the 0.05 physical pixels layout treats as the same
-/// place, for a move that adds an offset to the last answer. Measured on this
-/// fixture on 2026-09-15: adding the offset to both ends of a span shortened
-/// the row by 0.071 over this many moves and by 0.712 over ten times as many,
-/// growing with the count rather than settling. Placing the far end from the
-/// near one instead left 0.069, because the length is re-derived either way.
-const MOVES: usize = 20_000;
-
-#[test]
-fn a_subtree_moved_many_times_stays_where_a_cold_layout_puts_it() {
-    let mut warm = Harness::new((640, 900));
-    let (bar, inner) = plant(&mut warm, 40.0);
-    let mut height = 40.0;
-    for step in 0..MOVES {
-        height = 40.0 + (step % 300) as f32 * 0.37;
-        warm.set_len(bar, Axis::Y, height);
-        warm.frame();
-    }
-
-    let mut cold = Harness::new((640, 900));
-    let (_, cold_inner) = plant(&mut cold, height);
-    cold.frame();
-
-    assert_eq!(warm.region(&inner), cold.region(&cold_inner));
-}

tests/cases/idempotence.rs

@@ -1,29 +0,0 @@
-//! Whether measuring a widget and then giving it the length it reported is a
-//! fixed point, which is what a span that sizes to its children needs.
-
-use iris::harness::Harness;
-use iris::prelude::*;
-
-#[test]
-fn a_wrapping_text_in_a_span_settles_on_one_width() {
-    let mut h = Harness::new((900, 600));
-    let words = "the quick brown fox jumps over the lazy dog and keeps on running \
-                 until it reaches the end of a rather long line of text";
-    let t = wtext(words).size(16).wrap(true).add(&mut h.rsc);
-    let filler = rect(Color::BLUE).add(&mut h.rsc);
-    h.set_root((t, filler).span(Dir::RIGHT));
-
-    let mut widths = Vec::new();
-    for _ in 0..6 {
-        let r = h.region(&t.id()).unwrap();
-        widths.push(r.bot_right.x - r.top_left.x);
-        // Redrawing it changes nothing about the state, so nothing may move.
-        h.rsc.widgets_mut().mark_for_redraw(t.id());
-        h.frame();
-    }
-    println!("widths over six frames: {widths:?}");
-    assert!(
-        widths.windows(2).all(|w| w[0] == w[1]),
-        "a repaint that changed nothing moved it: {widths:?}"
-    );
-}

tests/cases/plan.rs

@@ -1,156 +0,0 @@
-//! The tree a seed describes, as a value rather than as widgets.
-//!
-//! Two things have to hold for a plan to be worth having. Editing a plan has
-//! to mean what growing with those edits means, or a scenario reads one thing
-//! and the oracle another. And reducing a plan has to end, or a shrinker
-//! searching for the smallest counterexample never returns.
-
-use iris::harness::Harness;
-use iris::prelude::*;
-use iris::random::{Edits, Kind, Plan, Rng, SpanEdit, grow, plan};
-use std::collections::HashMap;
-
-fn some_edits(seed: u64, of: &Plan) -> Edits {
-    let mut rng = Rng::new(seed);
-    let (mut sized, mut aligned, mut nodes, mut spans) = (0, 0, 0, 0);
-    let mut of = of.clone();
-    of.walk_mut(&mut |p| {
-        if matches!(p.kind, Kind::Span { .. }) {
-            spans += 1;
-        }
-        sized += p.size.is_some() as usize;
-        aligned += p.align.is_some() as usize;
-        nodes += p.region_node.is_some() as usize;
-    });
-    let pick =
-        |n: usize, rng: &mut Rng| -> Vec<usize> { (0..n).filter(|_| rng.chance()).collect() };
-    Edits {
-        sizes: pick(sized, &mut rng)
-            .into_iter()
-            .map(|i| {
-                (
-                    i,
-                    SizeRules {
-                        x: SizeRule::Exact(LayoutLen::LEFTOVER),
-                        y: SizeRule::Free,
-                    },
-                )
-            })
-            .collect(),
-        aligns: pick(aligned, &mut rng)
-            .into_iter()
-            .map(|i| {
-                (
-                    i,
-                    Align {
-                        x: Some(AxisAlign::POS),
-                        y: None,
-                    },
-                )
-            })
-            .collect(),
-        nodes: pick(nodes, &mut rng)
-            .into_iter()
-            .map(|i| (i, true))
-            .collect(),
-        spans: pick(spans, &mut rng)
-            .into_iter()
-            .map(|i| {
-                (
-                    i,
-                    SpanEdit {
-                        detach: vec![0],
-                        attach: 2,
-                    },
-                )
-            })
-            .collect::<HashMap<_, _>>(),
-        fixed_branches: false,
-    }
-}
-
-/// The two routes to an edited tree are one tree. `plan` resolves edits out
-/// of the random stream as it draws; `edited` puts them on a tree that
-/// already exists, which is the only route a shrunk plan has, since no seed
-/// grows one. A scenario written against either has to read the same.
-#[test]
-fn editing_a_plan_is_growing_one_with_those_edits() {
-    for seed in 1..=60 {
-        let bare = plan(seed, 5, &Edits::default());
-        let edits = some_edits(seed, &bare);
-        assert_eq!(
-            bare.edited(&edits),
-            plan(seed, 5, &edits),
-            "seed {seed}: edited and grown-with-edits disagree"
-        );
-    }
-}
-
-/// No simplification is larger, which is the half of "the shrinker stops" a
-/// widget count can see. Most are not smaller either -- a dropped alignment
-/// and a simpler leaf both keep the count -- so what rules out circling is
-/// that those are one-way too: a `Some` becomes a `None`, and a kind steps
-/// down a ladder with no way back up.
-#[test]
-fn no_simplification_of_a_plan_is_larger_than_it() {
-    for seed in 1..=60 {
-        let tree = plan(seed, 4, &Edits::default());
-        let mut queue = vec![tree];
-        let mut seen = 0;
-        while let Some(node) = queue.pop() {
-            seen += 1;
-            if seen > 400 {
-                break;
-            }
-            for small in node.smaller() {
-                assert!(
-                    small.size() <= node.size(),
-                    "seed {seed}: a simplification grew from {} to {}",
-                    node.size(),
-                    small.size()
-                );
-                if small.size() < node.size() {
-                    queue.push(small);
-                }
-            }
-        }
-    }
-}
-
-/// Reducing until nothing reduces ends, and ends at something small enough to
-/// read rather than at the tree it started from.
-#[test]
-fn reducing_a_plan_all_the_way_ends() {
-    for seed in 1..=30 {
-        let mut node = plan(seed, 5, &Edits::default());
-        let grown = node.size();
-        let mut steps = 0;
-        while let Some(next) = node.smaller().into_iter().next() {
-            node = next;
-            steps += 1;
-            assert!(steps < 10_000, "seed {seed}: reducing did not end");
-        }
-        assert!(
-            node.size() < grown.max(2),
-            "seed {seed}: reduced {grown} widgets to {}",
-            node.size()
-        );
-    }
-}
-
-/// Every image in a tree is the same picture, and a handle is a reference to
-/// the texture rather than a copy of it, so one upload and one slot serve all
-/// of them however many a tree grows -- and the trees are grown in hundreds.
-#[test]
-fn a_tree_of_images_uploads_one_texture() {
-    let mut images = 0;
-    let mut tree = plan(1, 4, &Edits::default());
-    tree.walk_mut(&mut |p| images += (p.kind == Kind::Image) as usize);
-    assert!(images > 1, "a tree of {images} images tests nothing");
-
-    let mut h = Harness::new((900, 1200));
-    let (root, _) = grow(&mut h.rsc, 1, 4, &Edits::default());
-    h.state.root = Some(root);
-    h.frame();
-    assert_eq!(h.rsc.ui().textures.count(), 1);
-}

tests/cases/scroll.rs

@@ -1,186 +0,0 @@
-//! Scrolling moves content and stops at its ends.
-
-use iris::harness::{Harness, assert_corners};
-use iris::prelude::*;
-
-#[test]
-fn scrollable_enables_a_region_node_but_raw_scroll_does_not() {
-    let mut h = Harness::new((100, 100));
-    let default_child = ().add(&mut h.rsc);
-    let _default = default_child.scrollable().add(&mut h.rsc);
-    assert!(h.rsc.widgets().is_region_node(default_child));
-    h.rsc.widgets_mut().set_region_node(default_child, false);
-    assert!(!h.rsc.widgets().is_region_node(default_child));
-
-    let raw_child = ().add(&mut h.rsc);
-    let _raw = Scroll::new(raw_child.add_strong(&mut h.rsc), Axis::Y).add(&mut h.rsc);
-    assert!(!h.rsc.widgets().is_region_node(raw_child));
-
-    let explicit = ().region_node().add(&mut h.rsc);
-    assert!(h.rsc.widgets().is_region_node(explicit));
-}
-
-#[test]
-fn a_scrollable_child_can_drop_its_region_node() {
-    let mut h = Harness::new((400, 200));
-    let top = rect(Color::RED).height(200).add(&mut h.rsc);
-    let bottom = rect(Color::BLUE).height(200).add(&mut h.rsc);
-    let content = (top, bottom).span(Dir::DOWN).add(&mut h.rsc);
-    h.set_root(content.scrollable());
-    h.rsc.widgets_mut().set_region_node(content, false);
-    h.frame();
-
-    h.move_to((200, 100));
-    h.scroll((0, 1));
-    h.frame();
-
-    assert!(!h.rsc.widgets().is_region_node(content));
-    assert_corners!(h, top, (0, -150), (400, 50));
-}
-
-#[test]
-fn a_wheel_scrolls_the_content_and_stops_at_its_end() {
-    let mut h = Harness::new((400, 200));
-    // Twice the window's height, so there is 200 to scroll.
-    let top = rect(Color::RED).height(200).add(&mut h.rsc);
-    let bottom = rect(Color::BLUE).height(200).add(&mut h.rsc);
-    h.set_root((top, bottom).span(Dir::DOWN).scrollable());
-    h.move_to((200, 100));
-
-    // `Scroll` starts snapped to the end.
-    assert_corners!(h, top, (0, -200), (400, 0));
-
-    // The handler scales a wheel line by 50.
-    h.scroll((0, 1));
-    h.frame();
-    assert_corners!(h, top, (0, -150), (400, 50));
-
-    h.scroll((0, 10));
-    h.frame();
-    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().mark_for_redraw(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
-/// after `Scroll`, and the assertion in `draw_at` is what says so.
-#[test]
-#[should_panic = "clips to"]
-fn a_clipping_widget_reporting_more_than_its_box_is_caught() {
-    struct Clipper(StrongWidget);
-
-    impl Widget for Clipper {
-        fn draw(&mut self, painter: &mut Painter) -> Size {
-            painter.set_mask(UiRegion::FULL);
-            painter.widget(&self.0).size()
-        }
-    }
-
-    let mut h = Harness::new((100, 100));
-    let tall = rect(Color::RED).height(400).add_strong(&mut h.rsc);
-    let clipper = Clipper(tall).add(&mut h.rsc);
-    // `set_root` lays the tree out, so this is where it is caught.
-    h.set_root(clipper);
-}
-
-/// 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));
-}
-
-/// A cap narrows the box the widget is asked in, which is what a scroll
-/// measures its viewport from: the content scrolls within the cap rather than
-/// within the room the cap was cut from.
-#[test]
-fn a_capped_scroll_takes_its_viewport_from_the_cap() {
-    let mut h = Harness::new((400, 200));
-    let top = rect(Color::RED).height(200).add(&mut h.rsc);
-    let bottom = rect(Color::BLUE).height(200).add(&mut h.rsc);
-    let scroll = (top, bottom).span(Dir::DOWN).scrollable().add(&mut h.rsc);
-    let capped = scroll.max_height(100).add(&mut h.rsc);
-    h.set_root(capped);
-    h.move_to((200, 50));
-
-    // 400 of content in a viewport of 100, so 300 to scroll and the end
-    // showing: the top is 300 above the box, which the window centres.
-    assert_eq!(h.region(&scroll).unwrap().size().y, Px::from_int(100));
-    assert_corners!(h, top, (0, -250), (400, -50));
-
-    h.scroll((0, 1));
-    h.frame();
-    assert_corners!(h, top, (0, -200), (400, 0));
-}

tests/chain_cost.rs

@@ -1,199 +0,0 @@
-//! What the vertex shader's move-chain walk costs, against how many nested
-//! region nodes a primitive resolves through.
-//!
-//!     cargo test --release --test chain_cost -- --ignored --nocapture
-//!
-//! Timed on the GPU with timestamp queries rather than by the clock: wall time
-//! here varied by 2x between runs of one unchanged binary. The pass is
-//! submitted and waited on, so this is the GPU's cost and not the recording
-//! loop's -- which is what `draw_cost.rs` measures instead.
-//!
-//! The instances are two pixels wide so that vertex work dominates; a chain
-//! walk that does not show up against small quads will not show up against
-//! anything.
-
-use iris::prelude::*;
-use iris_core::{
-    Len, MaskIdx, MoveIdx, PrimitiveInst, RectPrimitive, UiData, UiRegion, UiRenderNode,
-    UiRenderState, UiSpan,
-};
-use wgpu::{Color as GpuColor, *};
-
-#[path = "gpu/mod.rs"]
-mod gpu;
-
-const SIZE: u32 = 1024;
-const INSTANCES: usize = 200_000;
-const FRAMES: u32 = 20;
-/// Reported as the best of this many batches, since the mean moves by more
-/// than the thing being measured.
-const BATCHES: u32 = 8;
-
-fn gpu() -> Option<(Device, Queue, f32)> {
-    let adapter = gpu::adapter()?;
-    if !adapter.features().contains(Features::TIMESTAMP_QUERY) {
-        println!("no timestamp queries on {:?}", adapter.get_info().name);
-        return None;
-    }
-    println!("adapter: {:?}", adapter.get_info().name);
-    let (device, queue) = pollster::block_on(adapter.request_device(&DeviceDescriptor {
-        required_features: Features::TIMESTAMP_QUERY,
-        ..Default::default()
-    }))
-    .ok()?;
-    let period = queue.get_timestamp_period();
-    Some((device, queue, period))
-}
-
-/// A chain `depth` slots long, and instances that all resolve through its end.
-fn fill(ui: &mut UiData, render: &mut UiRenderState, depth: usize) {
-    let kind = ui.primitives.kind::<RectPrimitive>();
-    let id = ui.widgets.add_strong(Rect::new(UiColor::WHITE)).id();
-
-    let mut slot = MoveIdx::NONE;
-    for _ in 0..depth {
-        slot = render.moves.push(slot, UiRegion::FULL);
-    }
-
-    let px = |v: f32| Len::px(v);
-    for i in 0..INSTANCES {
-        let x = (i % (SIZE as usize / 2)) as f32 * 2.0;
-        let y = (i / (SIZE as usize / 2)) as f32;
-        render.layers.write(
-            0,
-            PrimitiveInst {
-                kind,
-                id,
-                primitive: RectPrimitive::color(UiColor::WHITE),
-                region: UiRegion::new(
-                    UiSpan::new(px(x), px(x + 2.0)),
-                    UiSpan::new(px(y), px(y + 1.0)),
-                ),
-                mask_idx: MaskIdx::NONE,
-                move_idx: slot,
-            },
-        );
-    }
-}
-
-/// Nanoseconds the pass took on the GPU, best of `BATCHES`.
-fn pass_cost(device: &Device, queue: &Queue, period: f32, depth: usize) -> f64 {
-    let format = TextureFormat::Bgra8Unorm;
-    let mut node = UiRenderNode::new(device, &gpu::config(format, SIZE));
-    let mut ui = UiData::default();
-    let mut render = UiRenderState::new();
-    fill(&mut ui, &mut render, depth);
-    node.update(device, queue, &mut ui, &mut render);
-
-    let target = device.create_texture(&TextureDescriptor {
-        label: Some("chain cost"),
-        size: Extent3d {
-            width: SIZE,
-            height: SIZE,
-            depth_or_array_layers: 1,
-        },
-        mip_level_count: 1,
-        sample_count: 1,
-        dimension: TextureDimension::D2,
-        format,
-        usage: TextureUsages::RENDER_ATTACHMENT,
-        view_formats: &[],
-    });
-    let view = target.create_view(&TextureViewDescriptor::default());
-
-    let queries = device.create_query_set(&QuerySetDescriptor {
-        label: Some("chain cost"),
-        ty: QueryType::Timestamp,
-        count: 2,
-    });
-    let resolved = device.create_buffer(&BufferDescriptor {
-        label: Some("resolved"),
-        size: 16,
-        usage: BufferUsages::QUERY_RESOLVE | BufferUsages::COPY_SRC,
-        mapped_at_creation: false,
-    });
-    let readback = device.create_buffer(&BufferDescriptor {
-        label: Some("readback"),
-        size: 16,
-        usage: BufferUsages::MAP_READ | BufferUsages::COPY_DST,
-        mapped_at_creation: false,
-    });
-
-    let frame = || {
-        let mut encoder = device.create_command_encoder(&CommandEncoderDescriptor::default());
-        {
-            let pass = &mut encoder.begin_render_pass(&RenderPassDescriptor {
-                label: None,
-                color_attachments: &[Some(RenderPassColorAttachment {
-                    view: &view,
-                    resolve_target: None,
-                    ops: Operations {
-                        load: LoadOp::Clear(GpuColor::BLACK),
-                        store: StoreOp::Store,
-                    },
-                    depth_slice: None,
-                })],
-                depth_stencil_attachment: None,
-                timestamp_writes: Some(RenderPassTimestampWrites {
-                    query_set: &queries,
-                    beginning_of_pass_write_index: Some(0),
-                    end_of_pass_write_index: Some(1),
-                }),
-                occlusion_query_set: None,
-                multiview_mask: None,
-            });
-            node.draw(pass);
-        }
-        encoder.resolve_query_set(&queries, 0..2, &resolved, 0);
-        encoder.copy_buffer_to_buffer(&resolved, 0, &readback, 0, 16);
-        queue.submit(Some(encoder.finish()));
-
-        let slice = readback.slice(..);
-        slice.map_async(MapMode::Read, |_| {});
-        let _ = device.poll(PollType::Wait {
-            submission_index: None,
-            timeout: None,
-        });
-        let ns = {
-            let view = slice.get_mapped_range().expect("timestamps did not map");
-            let stamps: [u64; 2] = [
-                u64::from_le_bytes(view[..8].try_into().unwrap()),
-                u64::from_le_bytes(view[8..16].try_into().unwrap()),
-            ];
-            (stamps[1].saturating_sub(stamps[0])) as f64 * period as f64
-        };
-        readback.unmap();
-        ns
-    };
-
-    frame();
-    let mut best = f64::MAX;
-    for _ in 0..BATCHES {
-        let mut total = 0.0;
-        for _ in 0..FRAMES {
-            total += frame();
-        }
-        best = best.min(total / FRAMES as f64);
-    }
-    best
-}
-
-#[test]
-#[ignore = "measurement, not a check"]
-fn chain_cost_by_depth() {
-    let Some((device, queue, period)) = gpu() else {
-        println!("no gpu with timestamps; nothing measured");
-        return;
-    };
-    println!("{INSTANCES} instances, {SIZE}x{SIZE}, best of {BATCHES} batches");
-    let mut base = None;
-    for depth in [1, 2, 4, 8, 16, 32, 64] {
-        let ns = pass_cost(&device, &queue, period, depth);
-        let base = *base.get_or_insert(ns);
-        println!(
-            "depth {depth:>3}: {:>9.1} us   {:+6.1}% against depth 1",
-            ns / 1000.0,
-            (ns - base) / base * 100.0
-        );
-    }
-}

tests/deferred_generated.rs

@@ -1,67 +0,0 @@
-#[path = "scenario/mod.rs"]
-mod scenario;
-
-use iris::prelude::*;
-use iris::random::{Edits, Plan, plan};
-
-fn check_requests(edit: impl Fn(&mut Plan) + Sync) {
-    let count = scenario::env("IRIS_DEFERRED_SEEDS", 20_u64);
-    let depth = scenario::env("IRIS_DEFERRED_DEPTH", 4_usize);
-    let seeds = std::env::var("IRIS_DEFERRED_SEED")
-        .ok()
-        .and_then(|seed| seed.parse().ok())
-        .map_or_else(|| (1..=count).collect(), |seed| vec![seed]);
-    scenario::over_seeds(seeds, |seed| {
-        let mut grown = plan(seed, depth, &Edits::default());
-        edit(&mut grown);
-        for case in scenario::ALL {
-            if let Some(how) = scenario::diverges(&grown, case, seed) {
-                panic!(
-                    "request seed {seed} depth {depth} after {}: {how}",
-                    case.name()
-                );
-            }
-        }
-    });
-}
-
-#[test]
-fn deferred_requests_agree_warm_and_cold() {
-    check_requests(|grown| {
-        let mut index = 0;
-        grown.walk_mut(&mut |node| {
-            if let Some(rules) = &mut node.size {
-                for axis in Axis::BOTH {
-                    index += 1;
-                    rules[axis] = match index % 7 {
-                        0 => leftover(1).clamp(20, 120).into(),
-                        1 => leftover(1).min(rel(0.5)).into(),
-                        2 => (leftover(1) + px(30)).min(leftover(2)).into(),
-                        _ => rules[axis].clone(),
-                    };
-                }
-            }
-        });
-    });
-}
-
-#[test]
-fn relative_intrinsic_bounds_agree_warm_and_cold() {
-    check_requests(|grown| {
-        grown.walk_mut(&mut |node| {
-            if let Some(rules) = &mut node.size {
-                for axis in Axis::BOTH {
-                    rules[axis] = match rules[axis] {
-                        SizeRule::Min(_) => SizeRule::Min(Len::rel(0.25)),
-                        SizeRule::Max(_) => SizeRule::Max(Len::rel(0.75)),
-                        SizeRule::Clamp { .. } => SizeRule::Clamp {
-                            min: Len::rel(0.25),
-                            max: Len::rel(0.75),
-                        },
-                        ref rule => rule.clone(),
-                    };
-                }
-            }
-        });
-    });
-}

tests/draw_cost.rs

@@ -13,19 +13,20 @@
 //! That is how `PrimitiveRender` was measured against a match in the renderer:
 //! 6 instructions per list drawn, against the ~5,400 wgpu spends recording
 //! one.
+//!
+//! The instance is leaked deliberately. A Vulkan loader may unload the driver
+//! when the last one drops, which can fault as a thread that used it exits --
+//! and every test runs on a spawned thread.
 
 use std::time::Instant;
 
 use iris::prelude::*;
 use iris_core::{
-    GlyphPrimitive, MaskIdx, MoveIdx, PrimitiveInst, RectPrimitive, TextureHandle,
+    GlyphPrimitive, MaskIdx, PrimitiveInst, RectPrimitive, TextureHandle, TexturePrimitive, UiData,
-    TexturePrimitive, UiData, UiRegion, UiRenderNode, UiRenderState,
+    UiRegion, UiRenderNode, UiRenderState,
 };
 use wgpu::{Color as GpuColor, *};
 
-#[path = "gpu/mod.rs"]
-mod gpu;
-
 const SIZE: u32 = 1024;
 const FRAMES: u32 = 200;
 /// Reported as the best of this many batches, since the mean moves by more
@@ -33,11 +34,39 @@ const FRAMES: u32 = 200;
 const BATCHES: u32 = 8;
 
 fn gpu() -> Option<(Device, Queue)> {
-    let adapter = gpu::adapter()?;
+    // Probed rather than assumed: there may be no Vulkan adapter, and GL is
+    // what is left when there is not.
+    let all = Instance::new(InstanceDescriptor::new_without_display_handle());
+    let instance = match pollster::block_on(all.request_adapter(&RequestAdapterOptions::default()))
+    {
+        Ok(_) => all,
+        Err(_) => Instance::new(InstanceDescriptor {
+            backends: Backends::GL,
+            ..InstanceDescriptor::new_without_display_handle()
+        }),
+    };
+    // Leaked rather than dropped: see the note at the top of the file.
+    let instance: &'static Instance = Box::leak(Box::new(instance));
+    let adapter =
+        pollster::block_on(instance.request_adapter(&RequestAdapterOptions::default())).ok()?;
     println!("adapter: {:?}", adapter.get_info());
     pollster::block_on(adapter.request_device(&DeviceDescriptor::default())).ok()
 }
 
+fn config(format: TextureFormat) -> SurfaceConfiguration {
+    SurfaceConfiguration {
+        usage: TextureUsages::RENDER_ATTACHMENT,
+        format,
+        color_space: SurfaceColorSpace::Auto,
+        width: SIZE,
+        height: SIZE,
+        present_mode: PresentMode::Fifo,
+        desired_maximum_frame_latency: 2,
+        alpha_mode: CompositeAlphaMode::Auto,
+        view_formats: vec![],
+    }
+}
+
 /// Every layer draws all three primitives, so the renderer takes a different
 /// path for each list it walks -- which is the case a single-primitive layer
 /// would never exercise. Images are bound per instance, so there are few.
@@ -66,7 +95,6 @@ fn fill(
                     primitive: RectPrimitive::color(UiColor::WHITE),
                     region: UiRegion::FULL,
                     mask_idx: MaskIdx::NONE,
-                    move_idx: MoveIdx::NONE,
                 },
             );
             render.layers.write(
@@ -83,7 +111,6 @@ fn fill(
                     },
                     region: UiRegion::FULL,
                     mask_idx: MaskIdx::NONE,
-                    move_idx: MoveIdx::NONE,
                 },
             );
         }
@@ -96,7 +123,6 @@ fn fill(
                     primitive: TexturePrimitive::from(h),
                     region: UiRegion::FULL,
                     mask_idx: MaskIdx::NONE,
-                    move_idx: MoveIdx::NONE,
                 },
             );
         }
@@ -107,7 +133,7 @@ fn fill(
 
 fn frame_cost(device: &Device, queue: &Queue, layers: usize, per_layer: usize) -> f64 {
     let format = TextureFormat::Bgra8Unorm;
-    let mut node = UiRenderNode::new(device, &gpu::config(format, SIZE));
+    let mut node = UiRenderNode::new(device, &config(format));
     let mut ui = UiData::default();
     let mut render = UiRenderState::new();
     let _handles = fill(&mut ui, &mut render, layers, per_layer);

tests/generated.rs

@@ -1,127 +0,0 @@
-//! Laying a tree out again has to land where growing it that way would.
-//!
-//! Every case is one of `scenario`'s, over the trees `iris::random` grows
-//! from a seed. The fast test takes a handful of seeds and the ignored one
-//! takes as many as it is asked for; both run the same cases the shrinker
-//! does over the same trees, so a seed that fails here is reduced by
-//!
-//!     SHRINK_SEED=<seed> SHRINK_DEPTH=<depth> SHRINK_CASE=<case> \
-//!       cargo test --release --test shrink -- --ignored --nocapture
-//!
-//! `IRIS_GENERATED_SEED`, `IRIS_GENERATED_SEEDS` and `IRIS_GENERATED_DEPTH`
-//! select what the long run covers.
-
-#[path = "scenario/mod.rs"]
-mod scenario;
-
-use iris::random::{Edits, Plan, plan};
-use scenario::{ALL, Case, diverges, env, over_seeds};
-
-/// How deep the generator branches. The generator widens two to four ways per
-/// level, so depth is exponential in width and a deep narrow tree is not
-/// reachable by raising this -- it buys more overlap between dependency
-/// paths, not more ancestry.
-fn depth() -> usize {
-    env("IRIS_GENERATED_DEPTH", 4)
-}
-
-/// The seeds the ordinary tests take: a corpus rather than a set of
-/// regression cases, since a seed names a tree only for as long as the
-/// generator draws the same things in the same order. Adding images to the
-/// leaves moved every one of them, so 20 and 86 -- which once caught a widget
-/// placed twice in a box its parent had already placed it in, and a `Scroll`
-/// fixed point settling differently -- no longer grow those trees. Both
-/// defects are pinned by the shrunk fixtures in `cases/unsettled.rs`, which
-/// are trees rather than numbers.
-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) {
-        panic!(
-            "seed {seed} at depth {depth} differs after {}: {how}\n\
-             reduce it with SHRINK_SEED={seed} SHRINK_DEPTH={depth} \
-             SHRINK_CASE={} cargo test --release --test shrink -- --ignored --nocapture",
-            case.name(),
-            case.name(),
-        );
-    }
-}
-
-/// A test per case, and the list of which cases have one, from the same
-/// place. A case the ordinary suite leaves out runs only in the long scan,
-/// which nobody runs by hand.
-macro_rules! cases {
-    ($($name:ident = $case:expr,)*) => {
-        $(
-            #[test]
-            fn $name() {
-                for seed in SEEDS {
-                    check(seed, depth(), $case);
-                }
-            }
-        )*
-
-        const NAMED: [Case; [$($case,)*].len()] = [$($case,)*];
-    };
-}
-
-cases! {
-    many_widgets_redrawing_at_once_leaves_every_box_where_it_was = Case::RepaintSome,
-    everything_redrawing_at_once_leaves_every_box_where_it_was = Case::Repaint,
-    a_resize_lands_where_starting_at_that_size_would = Case::Resize,
-    a_resize_and_a_repaint_land_where_starting_that_way_would = Case::ResizeRepaint,
-    a_size_change_after_a_resize_lands_the_same_way = Case::ResizeSize,
-    a_resize_after_a_size_change_lands_the_same_way = Case::SizeResize,
-    a_size_change_lands_where_growing_it_that_way_would = Case::Size,
-    every_size_changing_at_once_lands_where_growing_it_that_way_would = Case::EverySize,
-    an_alignment_change_lands_where_growing_it_that_way_would = Case::Align,
-    giving_and_taking_a_movable_region_rebuilds_what_resolves_it = Case::RegionNode,
-    reordering_a_span_lands_where_growing_it_that_way_would = Case::Reorder,
-}
-
-/// The shuffles are one test between them, so they are the only cases `ALL`
-/// may hold without a test of their own.
-#[test]
-fn every_case_runs_without_the_long_scan() {
-    for case in ALL {
-        assert!(
-            NAMED.contains(&case) || matches!(case, Case::Shuffle(_)),
-            "{} runs only in the long seed scan; give it a case here",
-            case.name()
-        );
-    }
-}
-
-#[test]
-fn adding_and_removing_span_children_lands_where_growing_it_that_way_would() {
-    for case in ALL {
-        if matches!(case, Case::Shuffle(_)) {
-            for seed in SEEDS {
-                check(seed, depth(), case);
-            }
-        }
-    }
-}
-
-#[test]
-#[ignore = "as many seeds as it is asked for, rather than the ten the others check"]
-fn a_long_run_of_seeds_agrees() {
-    let depth = depth();
-    let seeds: Vec<u64> = match std::env::var("IRIS_GENERATED_SEED")
-        .ok()
-        .and_then(|v| v.parse().ok())
-    {
-        Some(seed) => vec![seed],
-        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);
-        }
-    });
-}

tests/gpu/mod.rs

@@ -1,40 +0,0 @@
-//! The adapter and the surface configuration the GPU measurement rigs share,
-//! so the two cannot probe for a device in two different ways.
-
-use wgpu::*;
-
-/// An adapter on whatever this machine has, or `None` where there is none.
-///
-/// Probed rather than assumed: there may be no Vulkan adapter, and GL is what
-/// is left when there is not.
-///
-/// The instance is leaked deliberately. A Vulkan loader may unload the driver
-/// when the last one drops, which can fault as a thread that used it exits --
-/// and every test runs on a spawned thread.
-pub fn adapter() -> Option<Adapter> {
-    let all = Instance::new(InstanceDescriptor::new_without_display_handle());
-    let instance = match pollster::block_on(all.request_adapter(&RequestAdapterOptions::default()))
-    {
-        Ok(_) => all,
-        Err(_) => Instance::new(InstanceDescriptor {
-            backends: Backends::GL,
-            ..InstanceDescriptor::new_without_display_handle()
-        }),
-    };
-    let instance: &'static Instance = Box::leak(Box::new(instance));
-    pollster::block_on(instance.request_adapter(&RequestAdapterOptions::default())).ok()
-}
-
-pub fn config(format: TextureFormat, size: u32) -> SurfaceConfiguration {
-    SurfaceConfiguration {
-        usage: TextureUsages::RENDER_ATTACHMENT,
-        format,
-        color_space: SurfaceColorSpace::Auto,
-        width: size,
-        height: size,
-        present_mode: PresentMode::Fifo,
-        desired_maximum_frame_latency: 2,
-        alpha_mode: CompositeAlphaMode::Auto,
-        view_formats: vec![],
-    }
-}

tests/layout.rs

@@ -0,0 +1,111 @@
+//! Where a frame puts things, with no window to put them in.
+
+use iris::harness::{Harness, assert_corners};
+use iris::prelude::*;
+
+/// A fixed 100 wide, and the rest of the 400 to its neighbour.
+fn two_rects(h: &mut Harness) -> (WidgetId, WidgetId) {
+    let left = rect(Color::RED).width(100).add(&mut h.rsc);
+    let right = rect(Color::BLUE).add(&mut h.rsc);
+    h.set_root((left, right).span(Dir::RIGHT));
+    (left.id(), right.id())
+}
+
+#[test]
+fn a_span_gives_each_child_the_width_it_asked_for() {
+    let mut h = Harness::new((400, 200));
+    let (left, right) = two_rects(&mut h);
+
+    assert_corners!(h, left, (0, 0), (100, 200));
+    assert_corners!(h, right, (100, 0), (400, 200));
+}
+
+#[test]
+fn resizing_relays_out_against_the_new_output() {
+    let mut h = Harness::new((400, 200));
+    let (left, right) = two_rects(&mut h);
+
+    h.resize((800, 100));
+    assert!(h.needs_redraw());
+    h.frame();
+
+    assert_corners!(h, left, (0, 0), (100, 100));
+    assert_corners!(h, right, (100, 0), (800, 100));
+}
+
+#[test]
+fn an_empty_widget_takes_a_share_of_a_span() {
+    let mut h = Harness::new((400, 200));
+    let gap = ().add(&mut h.rsc);
+    let right = rect(Color::BLUE).width(100).add(&mut h.rsc);
+    h.set_root((gap, right).span(Dir::RIGHT));
+
+    assert_corners!(h, gap, (0, 0), (300, 200));
+    assert_corners!(h, right, (300, 0), (400, 200));
+}
+
+#[test]
+fn a_child_drawn_twice_moves_once() {
+    let mut h = Harness::new((400, 200));
+    // `Aligned` draws its child twice; listing it twice would move it twice.
+    let inner = rect(Color::BLUE).add(&mut h.rsc);
+    let centered = inner.center().width(200).add(&mut h.rsc);
+    let left = rect(Color::RED).width(100).add(&mut h.rsc);
+    h.set_root((left, centered).span(Dir::RIGHT));
+    assert_corners!(h, inner, (100, 0), (300, 200));
+
+    h.rsc[left].x = Some(Len::abs(150));
+    h.frame();
+
+    assert_corners!(h, inner, (150, 0), (350, 200));
+}
+
+#[test]
+fn a_resize_lands_where_a_cold_start_would() {
+    let build = |h: &mut Harness| {
+        let para = wtext(
+            "Wrapping shapes one source into as many lines as its container leaves room \
+             for, so the height of a paragraph is an answer rather than a setting.",
+        )
+        .size(20)
+        .wrap(true)
+        .pad(16)
+        .add(&mut h.rsc);
+        let below = rect(Color::RED).add(&mut h.rsc);
+        let root = (para, below).span(Dir::DOWN).pad(12);
+        h.set_root(root);
+        (para, below)
+    };
+
+    let mut cold = Harness::new((900, 1200));
+    let (cold_para, cold_below) = build(&mut cold);
+
+    let mut resized = Harness::new((1920, 1200));
+    let (para, below) = build(&mut resized);
+    resized.resize((900, 1200));
+    resized.frame();
+
+    assert_eq!(resized.region(&para), cold.region(&cold_para), "paragraph");
+    assert_eq!(resized.region(&below), cold.region(&cold_below), "below");
+}
+
+#[test]
+fn a_fixed_box_is_drawn_again_rather_than_stretched() {
+    let mut h = Harness::new((400, 400));
+    // The panel fills a stack sized by its sibling, so it is drawn in the
+    // whole box and then placed in the shorter one. Reusing it in that fixed
+    // box afterwards would leave it whatever height it happened to have.
+    let panel = rect(Color::BLUE).add(&mut h.rsc);
+    let leaf = rect(Color::RED).height(100).add(&mut h.rsc);
+    let stack = (panel, leaf)
+        .stack()
+        .size(StackSize::Child(1))
+        .add(&mut h.rsc);
+    h.set_root(stack.align(Align::TOP));
+    assert_corners!(h, panel, (0, 0), (400, 100));
+
+    h.rsc[leaf].y = Some(Len::abs(250));
+    h.frame();
+
+    assert_corners!(h, panel, (0, 0), (400, 250));
+}

tests/layout_diagnostics.rs

@@ -1,278 +0,0 @@
-//! Retained CPU-layout diagnostics on one reproducible random tree.
-//!
-//! Counters and phase timers:
-//!
-//!     cargo test --release --features layout-diagnostics \
-//!       --test layout_diagnostics -- --ignored --nocapture
-//!
-//! Build the uninstrumented test with `cargo test --release --test
-//! layout_diagnostics --no-run`, then run the emitted executable directly:
-//!
-//!     IRIS_PHASE=resize IRIS_FRAMES=10000 perf stat -r 7 \
-//!       -e cycles:u,instructions:u /path/to/layout_diagnostics --ignored --nocapture
-//!
-//! `IRIS_PHASE` is `cold`, `repaint`, `many`, `size`, `scroll`, `resize`, or
-//! `all`. `IRIS_SEED`, `IRIS_DEPTH`, and `IRIS_FRAMES` select the load, and
-//! `IRIS_DIRTY` how many widgets `many` marks at once.
-
-use iris::harness::Harness;
-use iris::prelude::*;
-use iris::random::{Edits, Tree, grow};
-use std::time::Instant;
-
-const OUTPUT: (f32, f32) = (1920.0, 1200.0);
-
-/// A scroll whose content fits is the same drawing in every box it still
-/// fits in, so a longer or shorter one relays out nothing. Where the content
-/// sits in that box is decided by placing its answer in the whole of it,
-/// which is a fraction of the box and holds at every length -- so the
-/// contract must not turn on the alignment. It did, and at the default
-/// alignment, which is the middle, every box change redrew the scroll.
-#[cfg(feature = "layout-diagnostics")]
-#[test]
-fn a_fitting_scroll_holds_for_every_box_its_content_fits_in() {
-    use iris::core::layout_diagnostics as diag;
-
-    for align in [Align::TOP_LEFT, Align::CENTER, Align::BOT_RIGHT] {
-        let mut harness = Harness::new((400, 200));
-        let inner = rect(Color::RED).height(50).add(&mut harness.rsc);
-        harness.set_root(inner.scrollable().align(align));
-        harness.frame();
-        let _ = diag::take();
-        // Still far longer than the 50 the content needs.
-        harness.resize((400, 180));
-        harness.frame();
-        assert_eq!(diag::take().distinct_widgets(), 0, "{align:?}");
-    }
-}
-
-#[cfg(feature = "layout-diagnostics")]
-#[test]
-fn a_selected_widget_retains_its_layout_events() {
-    use iris::core::layout_diagnostics::{self as diagnostics, TraceEvent};
-
-    diagnostics::clear_traced_widgets();
-    let _ = diagnostics::take();
-    let mut harness = Harness::new((400, 200));
-    let leaf = rect(Color::RED).region_node().add(&mut harness.rsc);
-    let other = rect(Color::BLUE).add(&mut harness.rsc);
-    let root = (leaf, other).span(Dir::RIGHT).add(&mut harness.rsc);
-    harness.set_root(root);
-    diagnostics::trace_widget(leaf.id());
-    let _ = diagnostics::take();
-
-    harness.rsc.widgets_mut().mark_for_redraw(root.id());
-    harness.rsc.widgets_mut().mark_for_redraw(leaf.id());
-    harness.frame();
-
-    let report = diagnostics::take();
-    assert!(
-        report
-            .traces()
-            .iter()
-            .any(|event| matches!(event, TraceEvent::RegionNode { id, .. } if *id == leaf.id()))
-    );
-    assert!(
-        report
-            .traces()
-            .iter()
-            .any(|event| matches!(event, TraceEvent::DrawRequest { id, .. } if *id == leaf.id()))
-    );
-    assert!(
-        report
-            .traces()
-            .iter()
-            .any(|event| matches!(event, TraceEvent::SizeRead { id, .. } if *id == leaf.id()))
-    );
-    assert!(
-        report
-            .traces()
-            .iter()
-            .any(|event| matches!(event, TraceEvent::SizeReported { id, .. } if *id == leaf.id()))
-    );
-    diagnostics::clear_traced_widgets();
-}
-
-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)
-}
-
-#[cfg(feature = "layout-diagnostics")]
-fn trace_selected(tree: &Tree) {
-    let Ok(value) = std::env::var("IRIS_TRACE_INDEX") else {
-        return;
-    };
-    let index = value
-        .parse::<usize>()
-        .expect("IRIS_TRACE_INDEX must be a tree.ids index");
-    let id = tree.ids[index];
-    iris::core::layout_diagnostics::trace_widget(id);
-    println!("tracing tree.ids[{index}] = {id:?}");
-}
-
-#[cfg(not(feature = "layout-diagnostics"))]
-fn trace_selected(_: &Tree) {}
-
-/// The shape a cost is measured on must not depend on what layout measured,
-/// or two commits are compared on two different trees. See `Edits`.
-fn rig_edits() -> Edits {
-    Edits {
-        fixed_branches: true,
-        ..Default::default()
-    }
-}
-
-fn warm(seed: u64, depth: usize) -> (Harness, Tree) {
-    let mut harness = Harness::new(OUTPUT);
-    let (root, tree) = grow(&mut harness.rsc, seed, depth, &rig_edits());
-    harness.state.root = Some(root);
-    harness.frame();
-    println!(
-        "fixture: seed {seed}, depth {depth}, {} widgets, {} active",
-        tree.ids.len(),
-        harness.render.active_widgets()
-    );
-    #[cfg(feature = "layout-diagnostics")]
-    let _ = iris::core::layout_diagnostics::take();
-    (harness, tree)
-}
-
-fn report(label: &str, mut elapsed: Vec<f64>, _harness: &Harness) {
-    elapsed.sort_by(|a, b| a.partial_cmp(b).unwrap());
-    let frames = elapsed.len();
-    // The worst frame is the stutter somebody sees, so it goes beside the
-    // median; p99 says whether it is the load or a single interruption.
-    println!(
-        "{label}: {frames} frame(s), min {:.3} ms, median {:.3} ms, p99 {:.3} ms, \
-         max {:.3} ms, total {:.1} ms",
-        elapsed[0],
-        elapsed[frames / 2],
-        elapsed[frames * 99 / 100],
-        elapsed[frames - 1],
-        elapsed.iter().sum::<f64>(),
-    );
-    #[cfg(feature = "layout-diagnostics")]
-    {
-        let diagnostics = iris::core::layout_diagnostics::take();
-        print!("{}", diagnostics.per_frame(frames));
-        for event in diagnostics.traces() {
-            println!("    {event:?}");
-        }
-        for callsite in diagnostics.hot_text().iter().take(3) {
-            let mut ancestry = Vec::new();
-            let mut id = Some(callsite.id);
-            while let Some(widget) = id {
-                ancestry.push(_harness.rsc.widgets().label(widget).as_str());
-                id = _harness
-                    .render
-                    .active
-                    .get(&widget)
-                    .and_then(|active| active.parent);
-            }
-            println!("    text ancestry: {}", ancestry.join(" < "));
-        }
-    }
-}
-
-fn run(
-    label: &str,
-    frames: usize,
-    harness: &mut Harness,
-    mut change: impl FnMut(&mut Harness, usize),
-) {
-    let mut elapsed = Vec::with_capacity(frames);
-    for frame in 0..frames {
-        change(harness, frame);
-        let start = Instant::now();
-        harness.frame();
-        elapsed.push(start.elapsed().as_secs_f64() * 1_000.0);
-    }
-    report(label, elapsed, harness);
-}
-
-#[test]
-#[ignore = "measurement, not a check"]
-fn layout_cost() {
-    let seed = env("IRIS_SEED", 1_u64);
-    let depth = env("IRIS_DEPTH", 7_usize);
-    let frames = env("IRIS_FRAMES", 100_usize);
-    assert!(frames > 0, "IRIS_FRAMES must be greater than zero");
-    let phase = env("IRIS_PHASE", String::from("all"));
-    assert!(
-        ["all", "cold", "repaint", "many", "size", "scroll", "resize"].contains(&phase.as_str()),
-        "unknown IRIS_PHASE {phase:?}"
-    );
-    let selected = |name| phase == "all" || phase == name;
-
-    if selected("cold") {
-        let mut harness = Harness::new(OUTPUT);
-        let (root, tree) = grow(&mut harness.rsc, seed, depth, &rig_edits());
-        harness.state.root = Some(root);
-        println!(
-            "fixture: seed {seed}, depth {depth}, {} widgets",
-            tree.ids.len()
-        );
-        trace_selected(&tree);
-        #[cfg(feature = "layout-diagnostics")]
-        let _ = iris::core::layout_diagnostics::take();
-        run("cold", 1, &mut harness, |_, _| {});
-    }
-
-    if selected("repaint") {
-        let (mut harness, tree) = warm(seed, depth);
-        trace_selected(&tree);
-        let leaf = tree.ids[0];
-        run("repaint", frames, &mut harness, move |harness, _| {
-            harness.rsc.widgets_mut().mark_for_redraw(leaf);
-        });
-    }
-
-    if selected("many") {
-        let (mut harness, tree) = warm(seed, depth);
-        trace_selected(&tree);
-        // Spread through the tree rather than taken from one subtree, so the
-        // dependency paths the frame settles overlap.
-        let wanted = env("IRIS_DIRTY", 32_usize).max(1);
-        let step = (tree.ids.len() / wanted).max(1);
-        let dirty: Vec<_> = tree.ids.iter().copied().step_by(step).collect();
-        println!("marking {} of {} widgets", dirty.len(), tree.ids.len());
-        run("many", frames, &mut harness, move |harness, _| {
-            for &id in &dirty {
-                harness.rsc.widgets_mut().mark_for_redraw(id);
-            }
-        });
-    }
-
-    if selected("size") {
-        let (mut harness, tree) = warm(seed, depth);
-        trace_selected(&tree);
-        let sized = tree.sized[0];
-        run("size", frames, &mut harness, move |harness, frame| {
-            let len = LayoutLen::px(100.0 + (frame % 2) as f32 * 40.0);
-            harness
-                .rsc
-                .widgets_mut()
-                .set_size_rule(sized, Axis::X, SizeRule::Exact(len));
-        });
-    }
-
-    if selected("scroll") {
-        let (mut harness, tree) = warm(seed, depth);
-        trace_selected(&tree);
-        let scroll = tree.scrolls[0];
-        run("scroll", frames, &mut harness, move |harness, frame| {
-            harness.rsc[scroll].scroll(if frame % 2 == 0 { 12.0 } else { -12.0 });
-        });
-    }
-
-    if selected("resize") {
-        let (mut harness, tree) = warm(seed, depth);
-        trace_selected(&tree);
-        run("resize", frames, &mut harness, |harness, frame| {
-            harness.resize((OUTPUT.0 - ((frame + 1) % 2) as f32 * 8.0, OUTPUT.1));
-        });
-    }
-}

tests/layout_dump.rs

@@ -1,55 +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::prelude::{Axis, Bound, SizeRule};
-use iris::random::{Edits, build, plan};
-
-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 mut plan = plan(seed, depth, &Edits::default());
-        if std::env::var_os("IRIS_DUMP_UNBOUNDED").is_some() {
-            plan.walk_mut(&mut |node| {
-                if let Some(rules) = &mut node.size {
-                    for axis in Axis::BOTH {
-                        if rules[axis].bound() != Bound::ANY {
-                            rules[axis] = SizeRule::Free;
-                        }
-                    }
-                }
-            });
-        }
-        let (root, tree) = build(&mut harness.rsc, &plan);
-        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/remap.rs

@@ -0,0 +1,27 @@
+//! What a drawing can be taken out of, and what it cannot.
+
+use iris::core::{Remap, UiRegion, UiScalar, UiSpan};
+
+/// A box `size` tall whose top is `rel` of the way down the window.
+fn fixed(rel: f32, size: f32) -> UiRegion {
+    UiRegion::new(
+        UiSpan::FULL,
+        UiSpan::new(UiScalar { rel, abs: 0.0 }, UiScalar { rel, abs: size }),
+    )
+}
+
+#[test]
+fn a_fixed_box_can_be_carried_but_not_stretched() {
+    let from = fixed(0.0, 164.0);
+    assert!(Remap::new(from, UiRegion::FULL).is_none());
+    assert!(Remap::new(from, fixed(0.5, 164.0)).is_some());
+    assert!(Remap::new(from, fixed(0.0, 98.0)).is_none());
+}
+
+#[test]
+fn a_relative_box_can_be_stretched_to_any_other() {
+    let remap = Remap::new(UiRegion::FULL, fixed(0.0, 98.0)).expect("relative boxes remap");
+    // A part that filled the window keeps filling what replaced it, which is
+    // exactly what `outside` could not say for a box of a fixed length.
+    assert_eq!(remap.apply(UiRegion::FULL), fixed(0.0, 98.0));
+}

tests/replace_cost.rs

@@ -1,41 +0,0 @@
-//! What remapping a subtree costs per frame, as a load for a counter rather
-//! than a check. A span of 200 fixed-height rows, five primitives each, with
-//! the row above them changing height every frame, so every row below is
-//! offered a box the same shape somewhere else.
-//!
-//!     cargo test --release --test replace_cost -- --ignored
-//!     perf stat -e instructions:u target/release/.../replace_cost-* --ignored
-//!
-//! Wall time is the wrong number here; see `draw_cost.rs`.
-
-use iris::harness::Harness;
-use iris::prelude::*;
-
-const ROWS: usize = 200;
-const FRAMES: usize = 200;
-
-#[test]
-#[ignore = "measurement, not a check"]
-fn remapping_rows_every_frame() {
-    let mut h = Harness::new((1920, 1200));
-    let first = rect(Color::RED).height(40).add(&mut h.rsc);
-    let mut span = Span::empty(Dir::DOWN);
-    span.push(first.add_strong(&mut h.rsc));
-    for i in 0..ROWS {
-        let row = (
-            rect(Color::BLUE.darker(i as f32 / (ROWS * 2) as f32)),
-            rect(Color::GREEN).pad(2),
-            wtext("row").size(16).pad(2),
-        )
-            .span(Dir::RIGHT)
-            .pad(4)
-            .height(40)
-            .add(&mut h.rsc);
-        span.push(row.add_strong(&mut h.rsc));
-    }
-    h.set_root(span);
-    for i in 0..FRAMES {
-        h.set_len(first, Axis::Y, 40.0 + (i % 2) as f32);
-        h.frame();
-    }
-}

tests/retained.rs

@@ -0,0 +1,252 @@
+//! What a second frame draws again, and what it keeps.
+
+use std::{cell::Cell, rc::Rc};
+
+use iris::harness::{Harness, assert_corners};
+use iris::prelude::*;
+
+/// A leaf that counts its draws and reports whatever size it is given, so a
+/// test can see what the retained path skipped.
+struct Counted {
+    draws: Rc<Cell<usize>>,
+    size: Size,
+    dependence: OnResize,
+}
+
+impl Widget for Counted {
+    fn draw(&mut self, _: &mut Painter) -> Size {
+        self.draws.set(self.draws.get() + 1);
+        self.size
+    }
+
+    fn on_resize(&self, _: Axis) -> OnResize {
+        self.dependence
+    }
+}
+
+struct Counts(Rc<Cell<usize>>);
+
+impl Counts {
+    fn get(&self) -> usize {
+        self.0.get()
+    }
+}
+
+fn counted(h: &mut Harness, size: Size, dependence: OnResize) -> (WeakWidget<Counted>, Counts) {
+    let draws = Rc::new(Cell::new(0));
+    let id = Counted {
+        draws: draws.clone(),
+        size,
+        dependence,
+    }
+    .add(&mut h.rsc);
+    (id, Counts(draws))
+}
+
+/// A fixed-width leaf beside one that takes the rest, so changing the first
+/// hands the second a different box without the output changing.
+fn pair(h: &mut Harness, rest: OnResize) -> (WeakWidget<Counted>, Counts, WidgetId) {
+    let (first, _) = counted(h, Size::from((100, 200)), OnResize::Translate);
+    let (second, draws) = counted(h, Size::REST, rest);
+    h.set_root((first, second).span(Dir::RIGHT));
+    (first, draws, second.id())
+}
+
+#[test]
+fn a_leaf_that_ignores_its_box_is_not_drawn_again_when_the_box_changes() {
+    let mut h = Harness::new((400, 200));
+    let (first, draws, second) = pair(&mut h, OnResize::Scale);
+    let settled = draws.get();
+    assert_corners!(h, second, (100, 0), (400, 200));
+
+    h.rsc[first].size = Size::from((150, 200));
+    h.frame();
+
+    assert_eq!(
+        draws.get(),
+        settled,
+        "its box is a field to write, not a reason to draw"
+    );
+    assert_corners!(h, second, (150, 0), (400, 200));
+}
+
+#[test]
+fn a_leaf_that_depends_on_its_box_is_drawn_again_when_the_box_changes() {
+    let mut h = Harness::new((400, 200));
+    let (first, draws, second) = pair(&mut h, OnResize::Redraw);
+    let settled = draws.get();
+
+    h.rsc[first].size = Size::from((150, 200));
+    h.frame();
+
+    // Twice: once for the span to measure it, once for its real box. A child
+    // that can hint its length is spared the first, and a smaller number here
+    // means someone has made that cheaper rather than broken it.
+    assert_eq!(draws.get(), settled + 2);
+    assert_corners!(h, second, (150, 0), (400, 200));
+}
+
+#[test]
+fn a_span_child_that_declares_its_length_is_drawn_once() {
+    let mut h = Harness::new((400, 200));
+    let (told, told_draws) = counted(&mut h, Size::from((100, 200)), OnResize::Translate);
+    let (asked, asked_draws) = counted(&mut h, Size::from((100, 200)), OnResize::Translate);
+    // The span takes one child's length from its hint and has to draw the
+    // other to find out, so only the second is drawn before it is placed.
+    let hinted = told.width(100).add(&mut h.rsc);
+    h.set_root((hinted, asked).span(Dir::RIGHT));
+
+    assert_eq!(told_draws.get(), 1);
+    assert_eq!(
+        asked_draws.get(),
+        2,
+        "drawn to be measured, then again to be placed"
+    );
+}
+
+#[test]
+fn a_span_relays_out_when_a_child_it_measured_changes() {
+    let mut h = Harness::new((400, 200));
+    let (first, _, second) = pair(&mut h, OnResize::Translate);
+
+    h.rsc[first].size = Size::from((250, 200));
+    h.frame();
+
+    assert_corners!(h, first, (0, 0), (250, 200));
+    assert_corners!(h, second, (250, 0), (400, 200));
+}
+
+#[test]
+fn a_placed_child_survives_the_next_frame() {
+    let mut h = Harness::new((400, 200));
+    // Both children declare a length, so the span places them from their hints
+    // rather than drawing them to find out.
+    let top = rect(Color::RED).height(80).add(&mut h.rsc);
+    let bottom = rect(Color::BLUE).height(120).add(&mut h.rsc);
+    h.set_root((top, bottom).span(Dir::DOWN));
+
+    h.rsc.widgets_mut().get_dyn_mut(top.id());
+    h.frame();
+
+    assert_corners!(h, top, (0, 0), (400, 80));
+    assert_corners!(h, bottom, (0, 80), (400, 200));
+}
+
+/// Lays its child out from the hint alone, never reading what it drew.
+struct FromHint {
+    inner: StrongWidget,
+}
+
+impl Widget for FromHint {
+    fn draw(&mut self, painter: &mut Painter) -> Size {
+        let len = painter.size_hint(&self.inner, Axis::Y).unwrap();
+        let mut region = UiRegion::FULL;
+        region.y.end = region.y.start.offset(len.abs);
+        painter.widget_within(&self.inner, region);
+        Size::REST
+    }
+}
+
+#[test]
+fn a_parent_that_only_read_a_hint_relays_out_when_the_hint_changes() {
+    let mut h = Harness::new((400, 200));
+    let inner = rect(Color::RED).height(80).add(&mut h.rsc);
+    let parent = FromHint {
+        inner: inner.add_strong(&mut h.rsc),
+    }
+    .add(&mut h.rsc);
+    h.set_root(parent);
+    assert_corners!(h, inner, (0, 0), (400, 80));
+
+    h.rsc[inner].y = Some(Len::abs(120));
+    h.frame();
+
+    assert_corners!(h, inner, (0, 0), (400, 120));
+}
+
+/// Reads the output's size, which nothing but its own draw can put right.
+struct ReadsOutput {
+    draws: Rc<Cell<usize>>,
+}
+
+impl Widget for ReadsOutput {
+    fn draw(&mut self, painter: &mut Painter) -> Size {
+        self.draws.set(self.draws.get() + 1);
+        Size::abs(painter.output_size() / 4.0)
+    }
+}
+
+#[test]
+fn a_resize_does_not_redraw_what_the_shader_can_move() {
+    let mut h = Harness::new((400, 200));
+    let (leaf, draws) = counted(&mut h, Size::REST, OnResize::Redraw);
+    h.set_root(leaf);
+    let settled = draws.get();
+
+    h.resize((800, 100));
+    assert!(h.needs_redraw());
+    h.frame();
+
+    assert_eq!(
+        draws.get(),
+        settled,
+        "its box is the same fraction of a different output"
+    );
+    assert_corners!(h, leaf, (0, 0), (800, 100));
+}
+
+#[test]
+fn a_resize_redraws_what_read_the_output() {
+    let mut h = Harness::new((400, 200));
+    let draws = Rc::new(Cell::new(0));
+    let leaf = ReadsOutput {
+        draws: draws.clone(),
+    }
+    .add(&mut h.rsc);
+    h.set_root(leaf);
+    let settled = draws.get();
+
+    h.resize((800, 100));
+    h.frame();
+
+    assert_eq!(draws.get(), settled + 1);
+}
+
+#[test]
+fn narrowing_the_output_reflows_text_and_relays_out_around_it() {
+    let mut h = Harness::new((600, 400));
+    let para = wtext(
+        "Wrapping shapes one source into as many lines as its container leaves \
+        room for, so the height of a paragraph is an answer rather than a setting.",
+    )
+    .size(20)
+    .wrap(true)
+    .add(&mut h.rsc);
+    let below = rect(Color::RED).add(&mut h.rsc);
+    h.set_root((para, below).span(Dir::DOWN));
+    let top = h.region(&below).expect("drew nothing").top_left.y;
+
+    h.resize((300, 400));
+    h.frame();
+
+    let lower = h.region(&below).expect("drew nothing").top_left.y;
+    assert!(lower > top, "same words, half the width: {top} -> {lower}");
+}
+
+#[test]
+fn a_change_two_levels_under_its_reader_still_reaches_it() {
+    let mut h = Harness::new((400, 400));
+    // Every wrapper up to the outer pad read the size below it, so the outer
+    // pad is what draws again -- and the span it hands the box to is the same
+    // size as before, which is what lets a draw reuse its way past the leaf.
+    let (leaf, _) = counted(&mut h, Size::abs((100, 100).into()), OnResize::Redraw);
+    let padded = leaf.pad(10).add(&mut h.rsc);
+    let below = rect(Color::RED).add(&mut h.rsc);
+    h.set_root((padded, below).span(Dir::DOWN).pad(12));
+    assert_corners!(h, below, (12, 132), (388, 388));
+
+    h.rsc[leaf].size = Size::abs((100, 200).into());
+    h.frame();
+
+    assert_corners!(h, below, (12, 232), (388, 388));
+}

tests/revision_cost.rs

@@ -1,205 +0,0 @@
-//! What a resize frame costs and what it holds, on a tree the revision before
-//! #16 also builds.
-//!
-//! Deliberately written in the API subset `43ce8c7` and this branch share, so
-//! the same source can be dropped into an old worktree and measured there:
-//! that is the only like-for-like comparison with the code the retained
-//! layout replaced. The random tree cannot carry one, because the generator
-//! itself changed with the work.
-//!
-//!     ROWS=40 FRAMES=500 cargo test --release --test revision_cost \
-//!       -- --ignored --nocapture resize_cost
-//!     ROWS=2000 cargo test --release --test revision_cost \
-//!       -- --ignored --nocapture text_memory
-//!
-//! Wall time on this machine varies with CPU frequency; take the number from
-//! `perf stat -e instructions:u` on the test binary directly.
-
-use iris::harness::Harness;
-use iris::prelude::*;
-use std::time::Instant;
-
-/// xorshift64, so one seed is one set of paragraphs on any machine.
-struct Rng(u64);
-
-impl Rng {
-    fn bits(&mut self) -> u64 {
-        self.0 ^= self.0 << 13;
-        self.0 ^= self.0 >> 7;
-        self.0 ^= self.0 << 17;
-        self.0
-    }
-
-    fn below(&mut self, n: usize) -> usize {
-        (self.bits() % n as u64) as usize
-    }
-}
-
-const WORDS: [&str; 24] = [
-    "wrapping",
-    "shapes",
-    "one",
-    "source",
-    "into",
-    "as",
-    "many",
-    "lines",
-    "as",
-    "the",
-    "box",
-    "leaves",
-    "room",
-    "for",
-    "paragraph",
-    "height",
-    "answer",
-    "setting",
-    "container",
-    "width",
-    "before",
-    "knows",
-    "measured",
-    "again",
-];
-
-/// A run of its own words, so nothing here is fast for two texts being the
-/// same string.
-fn words(rng: &mut Rng, least: usize, most: usize) -> String {
-    let words = least + rng.below(most - least);
-    let mut out = String::new();
-    for _ in 0..words {
-        if !out.is_empty() {
-            out.push(' ');
-        }
-        out.push_str(WORDS[rng.below(WORDS.len())]);
-    }
-    out
-}
-
-const OUTPUT: (f32, f32) = (900.0, 1200.0);
-
-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)
-}
-
-/// A row of a fixed-width rect beside a column of one wrapping and one
-/// overflowing text: the shape that makes a container measure a child in a
-/// box it will not keep.
-fn build(h: &mut Harness, rows: usize) -> Vec<WidgetId> {
-    let mut rng = Rng(1);
-    let mut paragraphs = Vec::new();
-    let mut col = Span::empty(Dir::DOWN);
-    for _ in 0..rows {
-        let mut row = Span::empty(Dir::RIGHT);
-        row.push(
-            rect(Color::RED)
-                .width(LayoutLen::px(40.0))
-                .add_strong(&mut h.rsc),
-        );
-        let mut body = Span::empty(Dir::DOWN);
-        let para = wtext(words(&mut rng, 12, 52))
-            .size(16)
-            .wrap(true)
-            .add_strong(&mut h.rsc);
-        paragraphs.push(para.id());
-        body.push(para);
-        body.push(
-            // Short, or its unwrapped width decides the row and the
-            // paragraph beside it never wraps.
-            wtext(words(&mut rng, 2, 6))
-                .size(16)
-                .wrap(false)
-                .add_strong(&mut h.rsc),
-        );
-        row.push(body.add_strong(&mut h.rsc));
-        col.push(row.add_strong(&mut h.rsc));
-    }
-    let root = col.add(&mut h.rsc);
-    h.set_root(root);
-    paragraphs
-}
-
-#[test]
-#[ignore = "measurement, not a check"]
-fn resize_cost() {
-    let rows = env("ROWS", 40_usize);
-    let frames = env("FRAMES", 500_usize);
-    let mut h = Harness::new(OUTPUT);
-    let paragraphs = build(&mut h, rows);
-    // What it cost is only half the comparison: the old code is cheaper
-    // partly because it wraps at the container's whole width rather than the
-    // part left beside the rect, and draws past the edge of the output.
-    println!("output width {}", OUTPUT.0);
-    for (at, id) in paragraphs.iter().enumerate().take(3) {
-        println!("paragraph {at}: {:?}", h.region(id));
-    }
-
-    // Two widths in turn is the friendly case for anything that remembers an
-    // answer, so `SWEEP=1` never repeats one -- a drag rather than a toggle.
-    let sweep = env("SWEEP", 0_usize) != 0;
-    let mut elapsed = Vec::with_capacity(frames);
-    for frame in 0..frames {
-        let narrower = match sweep {
-            true => (frame % 256) as f32,
-            false => ((frame + 1) % 2) as f32 * 8.0,
-        };
-        h.resize((OUTPUT.0 - narrower, OUTPUT.1));
-        let start = Instant::now();
-        h.frame();
-        elapsed.push(start.elapsed().as_secs_f64() * 1000.0);
-    }
-    elapsed.sort_by(|a, b| a.partial_cmp(b).unwrap());
-    println!(
-        "resize: {frames} frames, min {:.3} ms, median {:.3} ms, p99 {:.3} ms, \
-         max {:.3} ms, total {:.1} ms",
-        elapsed[0],
-        elapsed[frames / 2],
-        elapsed[frames * 99 / 100],
-        elapsed[frames - 1],
-        elapsed.iter().sum::<f64>()
-    );
-}
-
-fn kb(field: &str) -> u64 {
-    std::fs::read_to_string("/proc/self/status")
-        .unwrap()
-        .lines()
-        .find(|line| line.starts_with(field))
-        .and_then(|line| line.split_whitespace().nth(1)?.parse().ok())
-        .unwrap()
-}
-
-fn report(label: &str) {
-    println!(
-        "{label:24} rss {:>7} kB   peak {:>7} kB",
-        kb("VmRSS:"),
-        kb("VmHWM:")
-    );
-}
-
-/// Run this one on its own: the figures are the whole process's.
-#[test]
-#[ignore = "measurement, not a check"]
-fn text_memory() {
-    let rows = env("ROWS", 2000_usize);
-    report("before");
-    let mut h = Harness::new(OUTPUT);
-    let paragraphs = build(&mut h, rows);
-    report("after cold frame");
-    for frame in 0..40 {
-        h.resize((OUTPUT.0 - ((frame + 1) % 2) as f32 * 8.0, OUTPUT.1));
-        h.frame();
-    }
-    report("after 40 resizes");
-    // Settled: the output holds still and one leaf repaints per frame. Marked
-    // by taking it mutably because the revision at the top of this file has no
-    // `mark_for_redraw`, and the same source has to build against both.
-    for _ in 0..10 {
-        let _ = h.rsc.widgets_mut().get_dyn_mut(paragraphs[0]);
-        h.frame();
-    }
-    report("after settling");
-}

tests/scenario/mod.rs

@@ -1,515 +0,0 @@
-//! The scenarios both fuzzers run, over the tree a [`Plan`] describes.
-//!
-//! One implementation rather than two. The oracle grew its trees from a seed
-//! and the shrinker grew its own, with every scenario written out on each
-//! side, so a failure the oracle found could not be handed to the shrinker:
-//! there was no tree to pass it, only a seed, and a seed cannot be made
-//! smaller. Both take a plan now, so whatever finds a counterexample can also
-//! reduce it.
-//!
-//! Each target compiles this for itself, so what only one of them calls is
-//! dead code in the other.
-#![allow(dead_code)]
-
-use iris::harness::Harness;
-use iris::prelude::*;
-use iris::random::{Edits, Kind, Plan, Rng, SpanEdit, Tree, build};
-use std::collections::HashMap;
-
-/// A seed per thread but one, since a seed grows, lays out and drops its tree
-/// alone. A failing seed still shrinks and panics on its own thread.
-pub fn over_seeds(seeds: Vec<u64>, run: impl Fn(u64) + Sync) {
-    let threads =
-        std::thread::available_parallelism().map_or(1, |n| n.get().saturating_sub(1).max(1));
-    let chunk = seeds.len().div_ceil(threads).max(1);
-    std::thread::scope(|scope| {
-        for part in seeds.chunks(chunk) {
-            let run = &run;
-            scope.spawn(move || part.iter().for_each(|&seed| run(seed)));
-        }
-    });
-}
-
-pub fn env<T: std::str::FromStr>(name: &str, fallback: T) -> T {
-    std::env::var(name)
-        .ok()
-        .and_then(|v| v.parse().ok())
-        .unwrap_or(fallback)
-}
-
-/// The window a tree is grown in, and the one a resize takes it to.
-const OUTER: (f32, f32) = (1920.0, 1200.0);
-const INNER: (f32, f32) = (640.0, 900.0);
-const STILL: (f32, f32) = (900.0, 1200.0);
-
-/// A way of changing what a span holds. Each is a shape worth its own case:
-/// taking a child out of the middle is not the same as emptying a span, and
-/// adding one is not the same as adding three.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Shuffle {
-    /// Every other child, so what is left is interleaved with what went.
-    EveryOther,
-    /// Everything but the first, which is the last step before empty.
-    AllButFirst,
-    /// Three more on the end at once.
-    AddThree,
-    /// The first out and three more on, so the count moves both ways.
-    SwapForThree,
-    /// One out of the middle and one on the end.
-    TradeOne,
-}
-
-impl Shuffle {
-    fn of(self, grown: usize) -> SpanEdit {
-        let all = |step: usize, from: usize| (from..grown).step_by(step).collect();
-        match self {
-            Self::EveryOther => SpanEdit {
-                detach: all(2, 0),
-                attach: 0,
-            },
-            Self::AllButFirst => SpanEdit {
-                detach: all(1, 1),
-                attach: 0,
-            },
-            Self::AddThree => SpanEdit {
-                detach: Vec::new(),
-                attach: 3,
-            },
-            Self::SwapForThree => SpanEdit {
-                detach: vec![0],
-                attach: 3,
-            },
-            Self::TradeOne => SpanEdit {
-                detach: vec![grown / 2],
-                attach: 1,
-            },
-        }
-    }
-}
-
-/// What a warm tree is put through before it is compared with a cold one
-/// grown the way it was left.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Case {
-    /// Nothing changes, so no box may either. What this exercises is the
-    /// order a frame settles a dirty set in.
-    Repaint,
-    /// Every fifth widget rather than all of them: marking all of them
-    /// redraws the whole tree, which is a cold start reached the long way,
-    /// where the mixed case leaves a redrawn subtree beside a retained one.
-    RepaintSome,
-    Resize,
-    ResizeRepaint,
-    /// 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
-    /// descendant in the same frame and the whole dirty set settles together.
-    EverySize,
-    Align,
-    /// Giving a widget a movable region of its own, or taking it away, is a
-    /// structural change: every primitive under it changes which chain
-    /// resolves it.
-    RegionNode,
-    /// The same children in a different order, which moves every one of them
-    /// without changing what any of them is.
-    Reorder,
-    Shuffle(Shuffle),
-}
-
-pub const ALL: [Case; 16] = [
-    Case::Repaint,
-    Case::RepaintSome,
-    Case::Resize,
-    Case::ResizeRepaint,
-    Case::ResizeSize,
-    Case::SizeResize,
-    Case::Size,
-    Case::EverySize,
-    Case::Align,
-    Case::RegionNode,
-    Case::Reorder,
-    Case::Shuffle(Shuffle::EveryOther),
-    Case::Shuffle(Shuffle::AllButFirst),
-    Case::Shuffle(Shuffle::AddThree),
-    Case::Shuffle(Shuffle::SwapForThree),
-    Case::Shuffle(Shuffle::TradeOne),
-];
-
-impl Case {
-    /// The name `CASE` selects it by, and the one a failure prints.
-    pub fn name(self) -> &'static str {
-        match self {
-            Self::Repaint => "repaint",
-            Self::RepaintSome => "repaint-some",
-            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",
-            Self::RegionNode => "region-node",
-            Self::Reorder => "reorder",
-            Self::Shuffle(Shuffle::EveryOther) => "shuffle-every-other",
-            Self::Shuffle(Shuffle::AllButFirst) => "shuffle-all-but-first",
-            Self::Shuffle(Shuffle::AddThree) => "shuffle-add-three",
-            Self::Shuffle(Shuffle::SwapForThree) => "shuffle-swap-for-three",
-            Self::Shuffle(Shuffle::TradeOne) => "shuffle-trade-one",
-        }
-    }
-
-    pub fn named(name: &str) -> Option<Self> {
-        ALL.into_iter().find(|case| case.name() == name)
-    }
-
-    /// Grown in the first, compared in the second.
-    fn window(self) -> ((f32, f32), (f32, f32)) {
-        match self {
-            Self::Resize | Self::ResizeRepaint | Self::ResizeSize => (OUTER, INNER),
-            _ => (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) {
-    for &id in tree.ids.iter().step_by(step) {
-        warm.rsc.widgets_mut().mark_for_redraw(id);
-    }
-}
-
-/// A length in pixels, or a cap over one: a rule that reads the box it is
-/// given is the one a resize can change the effect of without changing the
-/// rule, so a tree that never grows one leaves that unexercised.
-fn a_rule(rng: &mut Rng) -> SizeRule {
-    let len = Len::px(20.0 + rng.below(180) as f32);
-    match rng.below(4) {
-        0 => SizeRule::Max(len),
-        1 => SizeRule::Min(len),
-        _ => LayoutLen::from(len).into(),
-    }
-}
-
-fn resize_one(warm: &mut Harness, tree: &Tree, idx: usize, rng: &mut Rng) -> SizeRules {
-    let lens = SizeRules {
-        x: a_rule(rng),
-        y: a_rule(rng),
-    };
-    warm.rsc
-        .widgets_mut()
-        .set_size_rules(tree.sized[idx], lens.x.clone(), lens.y.clone());
-    lens
-}
-
-fn realign_one(warm: &mut Harness, tree: &Tree, idx: usize, rng: &mut Rng) -> Align {
-    let side = |rng: &mut Rng| match rng.below(4) {
-        0 => None,
-        1 => Some(AxisAlign::NEG),
-        2 => Some(AxisAlign::CENTER),
-        _ => Some(AxisAlign::POS),
-    };
-    let align = Align {
-        x: side(rng),
-        y: side(rng),
-    };
-    let id = tree.aligned[idx];
-    let taken = RegionAlign::from(align);
-    for axis in Axis::BOTH {
-        warm.rsc.widgets_mut().set_alignment(id, axis, taken[axis]);
-    }
-    align
-}
-
-/// Every span's children in a different order, said both to the warm tree and
-/// to the plan the cold one is grown from.
-fn reorder(warm: &mut Harness, tree: &Tree, plan: &Plan) -> Plan {
-    for span in &tree.spans {
-        let children = &mut warm.rsc[span.id].children;
-        if !children.is_empty() {
-            children.rotate_left(1);
-        }
-    }
-    let mut out = plan.clone();
-    out.walk_mut(&mut |node| {
-        if let Kind::Span { order, .. } = &mut node.kind
-            && !order.is_empty()
-        {
-            order.rotate_left(1);
-        }
-    });
-    out
-}
-
-/// Applies `shuffle` to every third span. What it takes out is given back to
-/// the span's spares: the last share of a widget must outlive the comparison,
-/// or its id is handed to something else and the two trees stop lining up.
-fn reshuffle(warm: &mut Harness, tree: &mut Tree, shuffle: Shuffle) -> HashMap<usize, SpanEdit> {
-    let mut edits = HashMap::new();
-    for (idx, span) in tree.spans.iter_mut().enumerate().step_by(3) {
-        let edit = shuffle.of(span.grown);
-        let mut take = edit.detach.clone();
-        take.sort_unstable();
-        let children = &mut warm.rsc[span.id].children;
-        // Highest first, so an index means the same child however many of its
-        // neighbours are going too.
-        for j in take.into_iter().rev() {
-            if j < children.len() {
-                span.spares.push(children.remove(j));
-            }
-        }
-        let attach = edit.attach.min(span.spares.len());
-        let moved: Vec<_> = span.spares.drain(..attach).collect();
-        warm.rsc[span.id].children.extend(moved);
-        edits.insert(idx, edit);
-    }
-    edits
-}
-
-/// Changes the warm tree and answers with the plan a cold tree grown that way
-/// comes from. Each arm settles its own frame, so a case that changes nothing
-/// does not get a second one that could settle what the first left.
-fn change(case: Case, warm: &mut Harness, tree: &mut Tree, plan: &Plan, rng: &mut Rng) -> Plan {
-    let some_sizes = |warm: &mut Harness, tree: &Tree, rng: &mut Rng| {
-        let mut sizes = HashMap::new();
-        for _ in 0..4 {
-            if tree.sized.is_empty() {
-                break;
-            }
-            let idx = rng.below(tree.sized.len());
-            sizes.insert(idx, resize_one(warm, tree, idx, rng));
-        }
-        sizes
-    };
-    let edits = match case {
-        Case::Resize => return plan.clone(),
-        Case::Repaint | Case::ResizeRepaint => {
-            mark(warm, tree, 1);
-            warm.frame();
-            return plan.clone();
-        }
-        Case::RepaintSome => {
-            mark(warm, tree, 5);
-            warm.frame();
-            return plan.clone();
-        }
-        Case::Reorder => {
-            let out = reorder(warm, tree, plan);
-            warm.frame();
-            return out;
-        }
-        Case::Size | Case::ResizeSize | Case::SizeResize => Edits {
-            sizes: some_sizes(warm, tree, rng),
-            ..Default::default()
-        },
-        Case::EverySize => Edits {
-            sizes: (0..tree.sized.len())
-                .map(|idx| (idx, resize_one(warm, tree, idx, rng)))
-                .collect(),
-            ..Default::default()
-        },
-        Case::Align => Edits {
-            aligns: (0..tree.aligned.len())
-                .step_by(3)
-                .map(|idx| (idx, realign_one(warm, tree, idx, rng)))
-                .collect(),
-            ..Default::default()
-        },
-        Case::RegionNode => {
-            let mut nodes = HashMap::new();
-            for idx in (0..tree.nodes.len()).step_by(2) {
-                let id = tree.nodes[idx];
-                let take = !warm.rsc.widgets().is_region_node(id);
-                warm.rsc.widgets_mut().set_region_node(id, take);
-                nodes.insert(idx, take);
-            }
-            Edits {
-                nodes,
-                ..Default::default()
-            }
-        }
-        Case::Shuffle(shuffle) => Edits {
-            spans: reshuffle(warm, tree, shuffle),
-            ..Default::default()
-        },
-    };
-    warm.frame();
-    plan.edited(&edits)
-}
-
-/// What a widget was configured with, so a tree a fuzzer found can be written
-/// out by hand. A failure is a lead; the fast test that replaces it has to be
-/// buildable from what the failure printed.
-fn describe(id: WidgetId, h: &Harness) -> String {
-    let rules = h.rsc.widgets().size_rules(id);
-    // A bound prints as itself: a failure is reproduced from what it printed,
-    // and a rule shown as "no rule" cannot be written out again.
-    let rule = |r: SizeRule| match r {
-        SizeRule::Free => "-".into(),
-        SizeRule::Exact(len) => format!("{len}"),
-        SizeRule::Request(request) => format!("{request:?}"),
-        SizeRule::Min(min) => format!(">{}", LayoutLen::from(min)),
-        SizeRule::Max(max) => format!("<{}", LayoutLen::from(max)),
-        SizeRule::Clamp { min, max } => {
-            format!(">{}<{}", LayoutLen::from(min), LayoutLen::from(max))
-        }
-    };
-    let align = h.rsc.widgets().alignment(id);
-    let side = |a: AxisAlign| {
-        if a == AxisAlign::NEG {
-            "neg".into()
-        } else if a == AxisAlign::CENTER {
-            "mid".into()
-        } else if a == AxisAlign::POS {
-            "pos".into()
-        } else {
-            format!("{:.2}", a.rel())
-        }
-    };
-    // A rule and an alignment are properties of whatever carries them, so
-    // they print with that widget rather than as widgets of their own.
-    let mut out = describe_widget(id, h);
-    if rules != SizeRules::default() {
-        out += &format!("[x:{},y:{}]", rule(rules.x), rule(rules.y));
-    }
-    if align != RegionAlign::default() {
-        out += &format!("@{},{}", side(align.x), side(align.y));
-    }
-    out
-}
-
-fn describe_widget(id: WidgetId, h: &Harness) -> String {
-    let label = h.rsc.widgets().label(id).to_string();
-    let Some(widget) = h.rsc.widgets().get_dyn(id) else {
-        return label;
-    };
-    let any: &dyn std::any::Any = widget;
-    if let Some(w) = any.downcast_ref::<Span>() {
-        let sign = if w.dir.sign == Sign::Neg { "-" } else { "+" };
-        return format!(
-            "Span{{dir:{:?}{sign},gap:{},n:{}}}",
-            w.dir.axis,
-            w.gap,
-            w.children.len()
-        );
-    }
-    if let Some(w) = any.downcast_ref::<Pad>() {
-        let p = &w.padding;
-        return format!(
-            "Pad{{l:{},r:{},t:{},b:{}}}",
-            p.left, p.right, p.top, p.bottom
-        );
-    }
-    if let Some(w) = any.downcast_ref::<Stack>() {
-        return format!("Stack{{n:{}}}", w.children.len());
-    }
-    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.
-pub fn diverges(plan: &Plan, case: Case, seed: u64) -> Option<String> {
-    let (start, end) = case.window();
-    let mut warm = Harness::new(start);
-    let (root, mut tree) = build(&mut warm.rsc, plan);
-    warm.state.root = Some(root);
-    // The frame that makes it warm: without it nothing is retained and the
-    // comparison is two cold starts agreeing with each other.
-    warm.frame();
-    if start != end {
-        warm.resize(end);
-        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);
-    cold.state.root = Some(root);
-    cold.frame();
-
-    let mut drawn = 0;
-    for (i, (&w, &c)) in tree.ids.iter().zip(&cold_tree.ids).enumerate() {
-        let (got, want) = (warm.region(&w), cold.region(&c));
-        drawn += got.is_some() as usize;
-        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];
-            let node = match active.move_idx == active.parent_move {
-                true => "",
-                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"),
-        ));
-    }
-    match drawn {
-        0 => Some("nothing was drawn".into()),
-        _ => None,
-    }
-}

tests/scroll.rs

@@ -0,0 +1,26 @@
+//! Scrolling moves content and stops at its ends.
+
+use iris::harness::{Harness, assert_corners};
+use iris::prelude::*;
+
+#[test]
+fn a_wheel_scrolls_the_content_and_stops_at_its_end() {
+    let mut h = Harness::new((400, 200));
+    // Twice the window's height, so there is 200 to scroll.
+    let top = rect(Color::RED).height(200).add(&mut h.rsc);
+    let bottom = rect(Color::BLUE).height(200).add(&mut h.rsc);
+    h.set_root((top, bottom).span(Dir::DOWN).scrollable());
+    h.move_to((200, 100));
+
+    // `Scroll` starts snapped to the end.
+    assert_corners!(h, top, (0, -200), (400, 0));
+
+    // The handler scales a wheel line by 50.
+    h.scroll((0, 1));
+    h.frame();
+    assert_corners!(h, top, (0, -150), (400, 50));
+
+    h.scroll((0, 10));
+    h.frame();
+    assert_corners!(h, top, (0, 0), (400, 200));
+}

tests/shrink.rs

@@ -1,103 +0,0 @@
-//! A fuzzer that reduces its own counterexample.
-//!
-//! A seed is not a lead anybody can read: the tree is hundreds of widgets,
-//! and reconstructing the part that matters by hand has failed every time it
-//! has been tried. This grows the trees `iris::random` describes, takes them
-//! apart, and prints the smallest one that still fails as something to write
-//! a fast test from.
-//!
-//!     cargo test --release --test shrink -- --ignored --nocapture
-//!
-//! `SHRINK_SEEDS` how many trees to try, `SHRINK_DEPTH` how deep to grow
-//! them, `SHRINK_CASE` which scenario or `all` for every one. `SHRINK_SEED`
-//! takes a single seed, which is how a failure `generated` printed is handed
-//! straight here: the two run the same cases over the same trees, so a seed
-//! that fails there fails here and is reduced.
-//!
-//! It is a fuzzer: run it once the ordinary tests pass, and turn what it
-//! finds into a test of its own rather than leaving a seed as the record.
-
-#[path = "scenario/mod.rs"]
-mod scenario;
-
-use iris::random::{Edits, Plan, plan};
-use scenario::{ALL, Case, diverges, env, over_seeds};
-
-/// Takes the first simplification that still fails, until none does. The
-/// simplifications come biggest first, so this walks down rather than
-/// nibbling: a six-hundred-widget tree reaches single figures in a few
-/// hundred builds.
-fn shrink(mut node: Plan, case: Case, seed: u64) -> Plan {
-    loop {
-        let Some(next) = node
-            .smaller()
-            .into_iter()
-            .find(|small| diverges(small, case, seed).is_some())
-        else {
-            return node;
-        };
-        node = next;
-    }
-}
-
-fn cases() -> Vec<Case> {
-    match env("SHRINK_CASE", String::from("all")).as_str() {
-        "all" => ALL.to_vec(),
-        name => match Case::named(name) {
-            Some(case) => vec![case],
-            None => panic!(
-                "unknown SHRINK_CASE {name:?}; one of all, {}",
-                ALL.map(Case::name).join(", ")
-            ),
-        },
-    }
-}
-
-#[test]
-#[ignore = "a fuzzer; run it once the ordinary tests pass"]
-fn no_grown_tree_lays_out_differently_warm_than_cold() {
-    let depth: usize = env("SHRINK_DEPTH", 5);
-    let cases = cases();
-    let seeds: Vec<u64> = match std::env::var("SHRINK_SEED")
-        .ok()
-        .and_then(|v| v.parse().ok())
-    {
-        Some(seed) => vec![seed],
-        None => (1..=env("SHRINK_SEEDS", 400_u64)).collect(),
-    };
-    let count = seeds.len();
-
-    over_seeds(seeds, |seed| {
-        let grown = plan(seed, depth, &Edits::default());
-        for &case in &cases {
-            if diverges(&grown, case, seed).is_none() {
-                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(),
-                grown.size(),
-                small.size()
-            );
-            panic!(
-                "seed {seed} lays out differently warm than cold after {}",
-                case.name()
-            );
-        }
-    });
-
-    let sizes: Vec<usize> = (1..=count as u64)
-        .map(|seed| plan(seed, depth, &Edits::default()).size())
-        .collect();
-    println!(
-        "{count} trees at depth {depth} agree over {} case(s): {} widgets total, largest {}",
-        cases.len(),
-        sizes.iter().sum::<usize>(),
-        sizes.iter().max().copied().unwrap_or(0)
-    );
-}

tests/suite.rs

@@ -1,37 +0,0 @@
-//! Every ordinary correctness test, as modules of one target.
-//!
-//! One binary rather than a dozen: each `tests/*.rs` links the whole
-//! dependency graph again, which is most of what `cargo test` spends its time
-//! on here. Libtest still runs the cases in parallel, and a filter still
-//! selects them -- `cargo test --test suite layout::` for one module.
-//!
-//! The rigs stay their own targets: `shrink` and `generated` are fuzzers run
-//! on their own, and the `*_cost` and `*_diagnostics` ones are measurements.
-
-#[path = "cases/determinism.rs"]
-mod determinism;
-#[path = "cases/drift.rs"]
-mod drift;
-#[path = "cases/idempotence.rs"]
-mod idempotence;
-#[path = "cases/layout.rs"]
-mod layout;
-#[path = "cases/plan.rs"]
-mod plan;
-#[path = "cases/pointer.rs"]
-mod pointer;
-#[path = "cases/pointer_routing.rs"]
-mod pointer_routing;
-#[path = "cases/retained.rs"]
-mod retained;
-#[path = "cases/scroll.rs"]
-mod scroll;
-#[path = "cases/tasks.rs"]
-mod tasks;
-#[path = "cases/text_edit.rs"]
-mod text_edit;
-#[path = "cases/unsettled.rs"]
-mod unsettled;
-
-#[path = "cases/deferred.rs"]
-mod deferred;

tests/trace_unsettled.rs

@@ -1,126 +0,0 @@
-//! Traces the four-widget trees in `unsettled.rs`, to see what box their text
-//! is actually drawn in on a first frame against a settled one.
-
-#![cfg(feature = "layout-diagnostics")]
-
-use iris::core::layout_diagnostics::{self as diag, TraceEvent};
-use iris::harness::Harness;
-use iris::prelude::*;
-
-fn plant(h: &mut Harness) -> Vec<WidgetId> {
-    let plain = wtext("Wrapping").size(16).wrap(false).add(&mut h.rsc);
-    let wrapped = wtext("Wrapping shapes")
-        .size(16)
-        .wrap(true)
-        .width(76)
-        .add(&mut h.rsc);
-    h.rsc
-        .widgets_mut()
-        .set_alignment(wrapped, Axis::X, AxisAlign::POS);
-    h.rsc
-        .widgets_mut()
-        .set_alignment(wrapped, Axis::Y, AxisAlign::POS);
-    let stack = Stack {
-        children: vec![plain.add_strong(&mut h.rsc), wrapped.add_strong(&mut h.rsc)],
-        size: StackSize::Child(0),
-    }
-    .add(&mut h.rsc);
-    let root = (stack,).span(Dir::RIGHT).add(&mut h.rsc);
-    h.state.root = Some(root.add_strong(&mut h.rsc));
-    vec![plain.id(), wrapped.id(), stack.id(), root.id()]
-}
-
-fn dump(label: &str, report: &diag::Report, text: WidgetId) {
-    println!("--- {label} ---");
-    for event in report.traces() {
-        match event {
-            TraceEvent::DrawRequest {
-                id,
-                region,
-                region_px,
-                ..
-            } if *id == text => {
-                println!(
-                    "  draw in {:.2}x{:.2}  region {region:?}",
-                    region_px.x, region_px.y
-                )
-            }
-            TraceEvent::SizeReported { id, size } if *id == text => {
-                println!("  reported {size}")
-            }
-            TraceEvent::SizeRead { id, reader, size } if *id == text => {
-                println!("  size read by {reader:?}: {size}")
-            }
-            TraceEvent::RegionNode { id, parent, region } if *id == text => {
-                println!("  region node under {parent:?} at {region:?}")
-            }
-            TraceEvent::Reuse { id, outcome } if *id == text => println!("  reuse: {outcome:?}"),
-            _ => {}
-        }
-    }
-}
-
-#[test]
-#[ignore = "a diagnostic, not a check"]
-fn what_box_the_text_is_drawn_in() {
-    diag::clear_traced_widgets();
-    let _ = diag::take();
-    let mut h = Harness::new((640, 900));
-    let ids = plant(&mut h);
-    let text = ids[1];
-    diag::trace_widget(text);
-    let _ = diag::take();
-
-    h.frame();
-    dump("first frame", &diag::take(), text);
-
-    for _ in 0..2 {
-        for &id in &ids {
-            h.rsc.widgets_mut().mark_for_redraw(id);
-        }
-        let _ = diag::take();
-        h.frame();
-        dump("repaint", &diag::take(), text);
-    }
-    diag::clear_traced_widgets();
-}
-
-fn plant_fixed(h: &mut Harness) -> Vec<WidgetId> {
-    let words = "Wrapping shapes one source into as many lines as the box leaves";
-    let text = wtext(words).size(16).wrap(true).add(&mut h.rsc);
-    h.rsc
-        .widgets_mut()
-        .set_alignment(text, Axis::X, AxisAlign::NEG);
-    let inner = (text,).span(Dir::RIGHT).sized((189, 176)).add(&mut h.rsc);
-    let filler = rect(Color::RED).add(&mut h.rsc);
-    let root = (filler, inner).span(Dir::RIGHT).add(&mut h.rsc);
-    h.state.root = Some(root.add_strong(&mut h.rsc));
-    vec![text.id(), inner.id(), filler.id(), root.id()]
-}
-
-#[test]
-#[ignore = "a diagnostic, not a check"]
-fn what_box_the_fixed_text_is_drawn_in() {
-    diag::clear_traced_widgets();
-    let _ = diag::take();
-    let mut h = Harness::new((1920, 1200));
-    let ids = plant_fixed(&mut h);
-    let text = ids[0];
-    diag::trace_widget(text);
-    let _ = diag::take();
-
-    h.frame();
-    dump("first frame at 1920", &diag::take(), text);
-    h.resize((640, 900));
-    h.frame();
-    dump("after resize to 640", &diag::take(), text);
-
-    let mut cold = Harness::new((640, 900));
-    let cids = plant_fixed(&mut cold);
-    diag::clear_traced_widgets();
-    diag::trace_widget(cids[0]);
-    let _ = diag::take();
-    cold.frame();
-    dump("cold at 640", &diag::take(), cids[0]);
-    diag::clear_traced_widgets();
-}