Compare regions, not four loose numbers

`PixelRegion` derives `PartialEq`, `Clone` and `Copy`, so `assert_corners!`
compares one against another instead of flattening both to a tuple whose
order there was nothing to check. A failure now prints two regions.

Cargo.lock

@@ -567,9 +567,9 @@ dependencies = [
 
 [[package]]
 name = "dlib"
-version = "0.5.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8ecd87370524b461f8557c119c405552c396ed91fc0a8eec68679eab26f94a"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
  "libloading",
 ]
@@ -2158,9 +2158,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quick-xml"
-version = "0.41.0"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
 dependencies = [
  "memchr",
 ]
@@ -2353,15 +2353,6 @@ version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
 
-[[package]]
-name = "rig-input"
-version = "0.1.0"
-dependencies = [
- "iris",
- "wayland-client",
- "wayland-protocols-wlr",
-]
-
 [[package]]
 name = "roxmltree"
 version = "0.21.1"
@@ -2918,9 +2909,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.17"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38a91b4eaddff87b1cd1074985e3713da4af2c49742d1b356b2c01670a67a078"
+checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
 dependencies = [
  "cc",
  "downcast-rs",
@@ -2932,9 +2923,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.15"
+version = "0.31.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073"
+checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
 dependencies = [
  "bitflags 2.10.0",
  "rustix 1.1.3",
@@ -2966,9 +2957,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.13"
+version = "0.32.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
+checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -2991,9 +2982,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.12"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
+checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -3004,9 +2995,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.11"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
+checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -3015,9 +3006,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.11"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
 dependencies = [
  "dlib",
  "log",

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]
@@ -23,13 +20,7 @@ tokio = { workspace = true, features = ["sync", "rt", "rt-multi-thread"] }
 tokio = { workspace = true, features = ["sync", "rt", "rt-multi-thread", "time"] }
 
 [workspace]
-members = ["core", "macro", "rig-input"]
-
-[profile.dev]
-debug = 1
-
-[profile.test]
-debug = "line-tables-only"
+members = ["core", "macro"]
 
 [workspace.package]
 version = "0.1.0"
@@ -49,5 +40,3 @@ arboard = "3.6.1"
 iris-core = { path = "core" }
 iris-macro = { path = "macro" }
 tokio = "1.49.0"
-wayland-client = "0.31.15"
-wayland-protocols-wlr = { version = "0.3.12", features = ["client"] }

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/event/manager.rs

@@ -79,7 +79,6 @@ type EventData<Rsc, E> = (E, Rc<dyn for<'a> EventFn<Rsc, <E as Event>::Data<'a>>
 pub struct TypeEventManager<Rsc: HasEvents, E: Event> {
     // TODO: reduce visiblity!!
     pub active: HashMap<LayerId, HashMap<WidgetId, E::State>>,
-    pub global: E::Global,
     map: HashMap<WidgetId, Vec<EventData<Rsc, E>>>,
 }
 
@@ -108,7 +107,6 @@ impl<Rsc: HasEvents, E: Event> Default for TypeEventManager<Rsc, E> {
     fn default() -> Self {
         Self {
             active: Default::default(),
-            global: Default::default(),
             map: Default::default(),
         }
     }
@@ -140,13 +138,11 @@ impl<Rsc: HasEvents + 'static, E: Event> TypeEventManager<Rsc, E> {
     pub fn run_fn<'a>(
         &mut self,
         id: impl IdLike,
-    ) -> impl for<'b> FnOnce(EventCtx<'_, Rsc, E::Data<'b>>, &mut Rsc) -> bool + 'a {
+    ) -> impl for<'b> FnOnce(EventCtx<'_, Rsc, E::Data<'b>>, &mut Rsc) + 'a {
         let fs = self.map.get(&id.id()).cloned().unwrap_or_default();
         move |ctx, rsc| {
-            let mut consumed = false;
             for (e, f) in fs {
                 if let Some(data) = e.should_run(&ctx.data) {
-                    consumed |= e.consumes(&data);
                     f(
                         EventCtx {
                             state: ctx.state,
@@ -156,7 +152,6 @@ impl<Rsc: HasEvents + 'static, E: Event> TypeEventManager<Rsc, E> {
                     )
                 }
             }
-            consumed
         }
     }
 }

core/src/event/mod.rs

@@ -9,19 +9,10 @@ pub use rsc::*;
 pub trait Event: Sized + 'static + Clone {
     type Data<'a>: Clone = ();
     type State: Default = ();
-    /// State the whole event type keeps, rather than one copy per widget.
-    type Global: Default = ();
     #[allow(unused_variables)]
     fn should_run<'a>(&self, data: &Self::Data<'a>) -> Option<Self::Data<'a>> {
         Some(data.clone())
     }
-
-    /// Whether having run on this data uses up whatever triggered it, so
-    /// nothing further should see it.
-    #[allow(unused_variables)]
-    fn consumes(&self, data: &Self::Data<'_>) -> bool {
-        false
-    }
 }
 
 pub trait EventLike {

core/src/event/rsc.rs

@@ -21,13 +21,12 @@ pub trait HasEvents: Sized + UiRsc + HasState {
 }
 
 pub trait RunEvents: HasEvents {
-    /// Whether anything that ran used up what triggered it.
     fn run_event<E: EventLike>(
         &mut self,
         id: impl IdLike,
         data: <E::Event as Event>::Data<'_>,
         state: &mut Self::State,
-    ) -> bool {
+    ) {
         let f = self.events_mut().get_type::<E>().run_fn(id);
         f(EventCtx { state, data }, self)
     }

core/src/fixed.rs

@@ -1,512 +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 and only a
-/// multiply or a conversion rounds, back onto the same steps, so two routes
-/// that come within half a step 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.
-#[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, to a sixty-fourth. Finer than anything
-/// a display can show, and exact in `f32` up to 262,144 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, since arithmetic saturates
-    /// here rather than wrapping 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.saturating_mul(Self::one().0))
-    }
-
-    /// Rounds to the nearest step, and saturates rather than wrapping. 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,
-        })
-    }
-
-    /// 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
-    }
-
-    /// The same value on another grid, rounded where the new one is coarser.
-    pub const fn to_scale<const TO: u32>(self) -> Fixed<TO> {
-        Fixed(match TO >= SHIFT {
-            true => narrow((self.0 as i64) << (TO - SHIFT)),
-            false => narrow(shift_round(self.0 as i64, SHIFT - TO)),
-        })
-    }
-
-    pub const fn add(self, rhs: Self) -> Self {
-        Self(self.0.saturating_add(rhs.0))
-    }
-
-    pub const fn sub(self, rhs: Self) -> Self {
-        Self(self.0.saturating_sub(rhs.0))
-    }
-
-    pub const fn neg(self) -> Self {
-        Self(self.0.saturating_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.
-    pub const fn mul<const BY: u32>(self, by: Fixed<BY>) -> Self {
-        Self(narrow(shift_round(self.0 as i64 * by.0 as i64, BY)))
-    }
-
-    /// Repeated a whole number of times, which no grid rounds.
-    pub const fn mul_int(self, by: i32) -> Self {
-        Self(narrow(self.0 as i64 * by as i64))
-    }
-
-    /// 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(narrow(div_round(self.0 as i64, by as i64)))
-    }
-
-    /// 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 saturates 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(narrow(div_round((self.0 as i64) << BY, by.0 as i64)))
-    }
-
-    /// `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(narrow(div_round((num.0 as i64) << SHIFT, den.0 as i64)))
-    }
-
-    /// `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.saturating_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.saturating_add(1))
-    }
-
-    pub const fn next_down(self) -> Self {
-        Self(self.0.saturating_sub(1))
-    }
-}
-
-/// Back to a single step, rounding halves away from zero so that a value and
-/// its negation round to the same distance.
-const fn shift_round(v: i64, bits: u32) -> i64 {
-    let half = (1i64 << bits) >> 1;
-    match v < 0 {
-        true => -((-v + half) >> bits),
-        false => (v + half) >> bits,
-    }
-}
-
-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,
-    }
-}
-
-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))
-    }
-
-    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);
-    }
-
-    #[test]
-    fn halves_round_away_from_zero_either_side() {
-        // 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(2));
-        assert_eq!(Px::ONE.neg() * step_and_a_half, Px::from_raw(-2));
-    }
-
-    #[test]
-    fn dividing_by_a_fraction_undoes_multiplying_by_it() {
-        let third = Rel::ONE / Rel::from_int(3);
-        let len = Px::from_int(300);
-        assert_eq!(len * third / third, len);
-        assert_eq!(Px::from_int(100) / Rel::from_f32(0.5), Px::from_int(200));
-    }
-
-    #[test]
-    fn arithmetic_saturates_rather_than_wrapping() {
-        assert_eq!(Px::MAX + Px::ONE, Px::MAX);
-        assert_eq!(Px::MIN - Px::ONE, Px::MIN);
-        assert_eq!(Px::from_f32(1e12), Px::MAX);
-        assert_eq!(Px::from_f32(-1e12), Px::MIN);
-        assert_eq!(Px::from_int(i32::MAX), Px::MAX);
-    }
-
-    #[test]
-    fn a_coarser_grid_rounds_and_a_finer_one_does_not() {
-        // A third, which neither grid holds exactly.
-        let third = Rel::ONE / Rel::from_int(3);
-        assert_eq!(third.to_scale::<6>(), Fixed::<6>::from_raw(21));
-        let coarse = Fixed::<6>::from_raw(21);
-        assert_eq!(coarse.to_scale::<24>().to_scale::<6>(), coarse);
-    }
-
-    #[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,483 +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, Len, PxVec2, Size, UiRegion, WidgetId};
-use std::{
-    cell::RefCell,
-    collections::{HashMap, HashSet},
-    fmt::Write,
-    time::Instant,
-};
-
-#[derive(Clone, Copy)]
-pub(crate) enum Counter {
-    Updates,
-    DrawRequests,
-    WidgetDraws,
-    RegionNodeDraws,
-    SizeReads,
-    HintHits,
-    HintMisses,
-    RetainedSizeHits,
-    ReuseAttempts,
-    ReuseExact,
-    ReuseMoved,
-    ReuseDirty,
-    ReuseWrongParent,
-    ReuseRemapped,
-    ReuseOutside,
-    ReuseWrongLayer,
-    ReuseWrongNode,
-    PlaceRedraws,
-    QueuePops,
-    DepthReads,
-    LocalRedraws,
-    SizeChanges,
-    ReaderEdges,
-    PrimitiveWrites,
-    TextRenders,
-    TextShapeHits,
-    TextShapes,
-    TextBreaks,
-    GlyphPlacements,
-}
-
-impl Counter {
-    const COUNT: usize = Self::GlyphPlacements as usize + 1;
-
-    const NAMES: [&'static str; Self::COUNT] = [
-        "updates",
-        "draw requests",
-        "widget draws",
-        "region-node draws",
-        "draw-result size reads",
-        "hint hits",
-        "hint misses",
-        "retained size hits",
-        "reuse attempts",
-        "reuse exact",
-        "reuse moved",
-        "reuse: dirty",
-        "reuse: wrong parent",
-        "reuse remapped",
-        "reuse: outside what it holds for",
-        "reuse: another layer",
-        "reuse: region-node choice changed",
-        "placed by redrawing",
-        "redraw queue pops",
-        "depth reads",
-        "local redraws",
-        "size changes",
-        "reader edges",
-        "primitive writes",
-        "text renders",
-        "text shape hits",
-        "text shapes",
-        "text line breaks",
-        "glyph placements",
-    ];
-}
-
-#[derive(Clone, Copy)]
-pub(crate) enum TimerKind {
-    Update,
-    FullLayout,
-    IncrementalLayout,
-    TextRender,
-    TextShape,
-    TextBreak,
-    GlyphPlacement,
-}
-
-impl TimerKind {
-    const COUNT: usize = Self::GlyphPlacement as usize + 1;
-
-    const NAMES: [&'static str; Self::COUNT] = [
-        "update total",
-        "full layout",
-        "incremental layout",
-        "text render",
-        "text shape",
-        "text line break",
-        "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,
-    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,
-        pixel_size: 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<Len>,
-    },
-    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,
-    pixel_size: PxVec2,
-    region_node: bool,
-) {
-    trace(
-        id,
-        TraceEvent::DrawRequest {
-            id,
-            parent,
-            region,
-            pixel_size,
-            region_node,
-        },
-    );
-}
-
-pub(crate) fn reuse(id: WidgetId, outcome: ReuseOutcome) {
-    trace(id, TraceEvent::Reuse { id, outcome });
-}
-
-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<Len>) {
-    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

@@ -10,12 +10,8 @@
 #![feature(coerce_unsized)]
 #![feature(option_into_flat_iter)]
 
-#[cfg(feature = "layout-diagnostics")]
-pub mod layout_diagnostics;
-
 mod attr;
 mod event;
-mod fixed;
 mod num;
 mod orientation;
 mod primitive;
@@ -27,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,8 +1,8 @@
-use crate::{Px, Rel};
+use crate::vec2;
 
 use super::*;
 
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub struct Align {
     pub x: Option<AxisAlign>,
     pub y: Option<AxisAlign>,
@@ -30,32 +30,20 @@ impl Align {
     }
 }
 
-/// Where a widget sits in a box longer than it is. The default is the middle,
-/// because the two edges are the ones that assume a direction: which of them
-/// is the near one depends on the writing system and on which way a container
-/// runs, and the middle is the same either way.
-#[derive(Debug, Clone, Copy, PartialEq)]
-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
-    }
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum AxisAlign {
+    Neg,
+    Center,
+    Pos,
 }
 
-impl Default for AxisAlign {
-    fn default() -> Self {
-        Self::CENTER
+impl AxisAlign {
+    pub const fn rel(&self) -> f32 {
+        match self {
+            Self::Neg => 0.0,
+            Self::Center => 0.5,
+            Self::Pos => 1.0,
+        }
     }
 }
 
@@ -65,61 +53,41 @@ pub struct CardinalAlign {
 }
 
 impl CardinalAlign {
-    pub const LEFT: Self = Self::new(Axis::X, AxisAlign::NEG);
-    pub const H_CENTER: Self = Self::new(Axis::X, AxisAlign::CENTER);
-    pub const RIGHT: Self = Self::new(Axis::X, AxisAlign::POS);
-    pub const TOP: Self = Self::new(Axis::Y, AxisAlign::NEG);
-    pub const V_CENTER: Self = Self::new(Axis::Y, AxisAlign::CENTER);
-    pub const BOT: Self = Self::new(Axis::Y, AxisAlign::POS);
+    pub const LEFT: Self = Self::new(Axis::X, AxisAlign::Neg);
+    pub const H_CENTER: Self = Self::new(Axis::X, AxisAlign::Center);
+    pub const RIGHT: Self = Self::new(Axis::X, AxisAlign::Pos);
+    pub const TOP: Self = Self::new(Axis::Y, AxisAlign::Neg);
+    pub const V_CENTER: Self = Self::new(Axis::Y, AxisAlign::Center);
+    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 {
-    /// Both axes at the near edge. What a container passes as an override for
-    /// a child it is going to position itself.
-    pub const NEAR: Self = Self {
-        x: AxisAlign::NEG,
-        y: AxisAlign::NEG,
-    };
-
-    pub fn axis(&self, axis: Axis) -> AxisAlign {
-        match axis {
-            Axis::X => self.x,
-            Axis::Y => self.y,
-        }
-    }
-
-    pub fn axis_mut(&mut self, axis: Axis) -> &mut AxisAlign {
-        match axis {
-            Axis::X => &mut self.x,
-            Axis::Y => &mut self.y,
-        }
-    }
-}
-
-impl RegionAlign {
-    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_RIGHT: Self = Self::new(AxisAlign::POS, AxisAlign::NEG);
-    pub const CENTER_LEFT: Self = Self::new(AxisAlign::NEG, 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 BOT_LEFT: Self = Self::new(AxisAlign::NEG, 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 TOP_LEFT: Self = Self::new(AxisAlign::Neg, 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 CENTER_LEFT: Self = Self::new(AxisAlign::Neg, 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 BOT_LEFT: Self = Self::new(AxisAlign::Neg, 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 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 {
@@ -175,12 +143,13 @@ impl Vec2 {
 impl UiScalar {
     pub const fn align(&self, align: AxisAlign) -> UiSpan {
         let rel = align.rel();
-        let rest = Rel::ONE.sub(rel);
-        let at = UiScalar::from_parts(rel, Px::ZERO);
-        UiSpan {
-            start: UiScalar::from_parts(at.rel.sub(self.rel.mul(rel)), at.px.sub(self.px.mul(rel))),
-            end: UiScalar::from_parts(at.rel.add(self.rel.mul(rest)), at.px.add(self.px.mul(rest))),
-        }
+        let mut start = UiScalar::rel(rel);
+        start.abs -= self.abs * rel;
+        start.rel -= self.rel * rel;
+        let mut end = UiScalar::rel(rel);
+        end.abs += self.abs * (1.0 - rel);
+        end.rel += self.rel * (1.0 - rel);
+        UiSpan { start, end }
     }
 }
 
@@ -196,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),
-            y: align.y.unwrap_or(AxisAlign::CENTER),
+            x: align.x.unwrap_or(AxisAlign::Center),
+            y: align.y.unwrap_or(AxisAlign::Center),
         }
     }
 }
@@ -220,10 +189,7 @@ impl From<CardinalAlign> for Align {
 
 const impl From<RegionAlign> for UiVec2 {
     fn from(align: RegionAlign) -> Self {
-        Self::new(
-            UiScalar::from_parts(align.x.rel(), Px::ZERO),
-            UiScalar::from_parts(align.y.rel(), Px::ZERO),
-        )
+        Self::rel(align.rel())
     }
 }
 

core/src/orientation/axis.rs

@@ -1,7 +1,6 @@
 use super::*;
-use crate::{Fixed, FixedVec2};
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+#[derive(Copy, Clone, Eq, PartialEq)]
 pub enum Axis {
     X,
     Y,
@@ -41,29 +40,6 @@ pub enum Sign {
     Pos,
 }
 
-impl<const SHIFT: u32> FixedVec2<SHIFT> {
-    pub const fn axis(&self, axis: Axis) -> Fixed<SHIFT> {
-        match axis {
-            Axis::X => self.x,
-            Axis::Y => self.y,
-        }
-    }
-
-    pub const fn axis_mut(&mut self, axis: Axis) -> &mut Fixed<SHIFT> {
-        match axis {
-            Axis::X => &mut self.x,
-            Axis::Y => &mut self.y,
-        }
-    }
-
-    pub const fn from_axis(axis: Axis, aligned: Fixed<SHIFT>, ortho: Fixed<SHIFT>) -> Self {
-        match axis {
-            Axis::X => Self::new(aligned, ortho),
-            Axis::Y => Self::new(ortho, aligned),
-        }
-    }
-}
-
 impl Vec2 {
     pub fn axis(&self, axis: Axis) -> f32 {
         match axis {

core/src/orientation/len.rs

@@ -1,5 +1,5 @@
 use super::*;
-use crate::{Px, PxVec2, Rel, UiNum, Weight, util::impl_op};
+use crate::{UiNum, util::impl_op};
 
 #[derive(Debug, Default, Clone, Copy, PartialEq)]
 pub struct Size {
@@ -7,19 +7,16 @@ pub struct Size {
     pub y: Len,
 }
 
-/// What a widget asks for along one axis: pixels, a fraction of the box it
-/// is given, and a share of whatever is left over once everything fixed has
-/// been taken. The three add up rather than choosing between one another.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Len {
-    pub px: Px,
-    pub rel: Rel,
-    pub leftover: Weight,
+    pub abs: f32,
+    pub rel: f32,
+    pub rest: f32,
 }
 
 impl<N: UiNum> From<N> for Len {
     fn from(value: N) -> Self {
-        Len::px(value.to_f32())
+        Len::abs(value.to_f32())
     }
 }
 
@@ -44,27 +41,15 @@ impl Size {
         y: Len::ZERO,
     };
 
-    pub const LEFTOVER: Self = Self {
-        x: Len::LEFTOVER,
-        y: Len::LEFTOVER,
+    pub const REST: Self = Self {
+        x: Len::REST,
+        y: Len::REST,
     };
 
-    /// From something measured outside layout -- a texture, a shaped line --
-    /// 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 {
+    pub fn abs(v: Vec2) -> Self {
         Self {
-            x: Len {
-                px: v.x,
-                ..Len::ZERO
-            },
-            y: Len {
-                px: v.y,
-                ..Len::ZERO
-            },
+            x: Len::abs(v.x),
+            y: Len::abs(v.y),
         }
     }
 
@@ -75,17 +60,17 @@ impl Size {
         }
     }
 
-    pub fn leftover(v: Vec2) -> Self {
+    pub fn rest(v: Vec2) -> Self {
         Self {
-            x: Len::leftover(v.x),
-            y: Len::leftover(v.y),
+            x: Len::rest(v.x),
+            y: Len::rest(v.y),
         }
     }
 
     pub fn to_uivec2(self) -> UiVec2 {
         UiVec2 {
-            x: self.x.apply_leftover(),
-            y: self.y.apply_leftover(),
+            x: self.x.apply_rest(),
+            y: self.y.apply_rest(),
         }
     }
 
@@ -112,44 +97,43 @@ impl Size {
 
 impl Len {
     pub const ZERO: Self = Self {
-        px: Px::ZERO,
-        rel: Rel::ZERO,
-        leftover: Weight::ZERO,
+        abs: 0.0,
+        rel: 0.0,
+        rest: 0.0,
     };
 
-    pub const LEFTOVER: Self = Self {
-        px: Px::ZERO,
-        rel: Rel::ZERO,
-        leftover: Weight::ONE,
+    pub const REST: Self = Self {
+        abs: 0.0,
+        rel: 0.0,
+        rest: 1.0,
     };
 
-    /// The whole of what is left over counts as the whole box, which is what
-    /// a length means to something that is not dividing a box between
-    /// siblings -- a scroll asking how long its content is.
-    pub fn apply_leftover(&self) -> UiScalar {
-        let share = match self.leftover > Weight::ZERO {
-            true => Rel::ONE,
-            false => Rel::ZERO,
-        };
-        UiScalar::from_parts(self.rel.add(share), self.px)
+    pub fn apply_rest(&self) -> UiScalar {
+        UiScalar {
+            rel: self.rel + if self.rest > 0.0 { 1.0 } else { 0.0 },
+            abs: self.abs,
+        }
     }
 
-    pub fn px(px: impl UiNum) -> Self {
+    pub fn abs(abs: impl UiNum) -> Self {
         Self {
-            px: Px::from_num(px),
-            ..Self::ZERO
+            abs: abs.to_f32(),
+            rel: 0.0,
+            rest: 0.0,
         }
     }
     pub fn rel(rel: impl UiNum) -> Self {
         Self {
-            rel: Rel::from_num(rel),
-            ..Self::ZERO
+            abs: 0.0,
+            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),
-            ..Self::ZERO
+            abs: 0.0,
+            rel: 0.0,
+            rest: ratio.to_f32(),
         }
     }
 }
@@ -157,26 +141,38 @@ impl Len {
 pub mod len_fns {
     use super::*;
 
-    pub fn px(px: impl UiNum) -> Len {
-        Len::px(px)
+    pub fn abs(abs: impl UiNum) -> Len {
+        Len {
+            abs: abs.to_f32(),
+            rel: 0.0,
+            rest: 0.0,
+        }
     }
     pub fn rel(rel: impl UiNum) -> Len {
-        Len::rel(rel)
+        Len {
+            abs: 0.0,
+            rel: rel.to_f32(),
+            rest: 0.0,
+        }
+    }
+    pub fn rest(ratio: impl UiNum) -> Len {
+        Len {
+            abs: 0.0,
+            rel: 0.0,
+            rest: ratio.to_f32(),
         }
-    pub fn leftover(ratio: impl UiNum) -> Len {
-        Len::leftover(ratio)
     }
 }
 
-impl_op!(same Len Add add; px rel leftover);
-impl_op!(same Len Sub sub; px rel leftover);
+impl_op!(Len Add add; abs rel rest);
+impl_op!(Len Sub sub; abs rel rest);
 
-impl_op!(same Size Add add; x y);
-impl_op!(same Size Sub sub; x y);
+impl_op!(Size Add add; x y);
+impl_op!(Size Sub sub; x y);
 
 impl Default for Len {
     fn default() -> Self {
-        Self::leftover(1.0)
+        Self::rest(1.0)
     }
 }
 
@@ -188,14 +184,14 @@ impl std::fmt::Display for Size {
 
 impl std::fmt::Display for Len {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.px != Px::ZERO {
-            write!(f, "{} px;", self.px)?;
+        if self.abs != 0.0 {
+            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 {
-            write!(f, "{} leftover;", self.leftover)?;
+        if self.rest != 0.0 {
+            write!(f, "{} rest;", self.rest)?;
         }
         Ok(())
     }

core/src/orientation/pos.rs

@@ -1,7 +1,10 @@
-use std::{fmt::Display, marker::Destruct};
+use std::{fmt::Display, hash::Hash, 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)]
@@ -20,19 +23,11 @@ impl UiVec2 {
         Self { x, y }
     }
 
-    pub const fn px(px: impl const Into<Vec2>) -> Self {
-        let px = px.into();
+    pub const fn abs(abs: impl const Into<Vec2>) -> Self {
+        let abs = abs.into();
         Self {
-            x: UiScalar::px(px.x),
-            y: UiScalar::px(px.y),
-        }
-    }
-
-    /// From lengths already on the grid, with no fraction of a box.
-    pub const fn from_px(px: PxVec2) -> Self {
-        Self {
-            x: UiScalar::from_parts(Rel::ZERO, px.x),
-            y: UiScalar::from_parts(Rel::ZERO, px.y),
+            x: UiScalar::abs(abs.x),
+            y: UiScalar::abs(abs.y),
         }
     }
 
@@ -61,6 +56,13 @@ impl UiVec2 {
         }
     }
 
+    pub const fn outside(&self, region: &UiRegion) -> UiVec2 {
+        UiVec2 {
+            x: self.x.outside(&region.x),
+            y: self.y.outside(&region.y),
+        }
+    }
+
     pub fn axis_mut(&mut self, axis: Axis) -> &mut UiScalar {
         match axis {
             Axis::X => &mut self.x,
@@ -75,10 +77,11 @@ impl UiVec2 {
         }
     }
 
-    /// Resolved against a box of `size`, which is where a fraction stops
-    /// being one and becomes a place.
-    pub fn to_px(&self, size: PxVec2) -> PxVec2 {
-        PxVec2::new(self.x.to_px(size.x), self.y.to_px(size.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);
@@ -96,27 +99,34 @@ impl UiVec2 {
         }
     }
 
-    pub fn get_px(&self) -> Vec2 {
-        (self.x.px.to_f32(), self.y.px.to_f32()).into()
+    pub fn get_abs(&self) -> Vec2 {
+        (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!(same UiVec2 Sub sub; x y);
+impl_op!(UiVec2 Add add; x y);
+impl_op!(UiVec2 Sub sub; x y);
 
 const impl From<Vec2> for UiVec2 {
-    fn from(px: Vec2) -> Self {
-        Self::px(px)
+    fn from(abs: Vec2) -> Self {
+        Self::abs(abs)
     }
 }
 
@@ -124,97 +134,87 @@ const impl<T: const UiNum, U: const UiNum> From<(T, U)> for UiVec2
 where
     (T, U): const Destruct,
 {
-    fn from(px: (T, U)) -> Self {
-        Self::px(px)
+    fn from(abs: (T, U)) -> Self {
+        Self::abs(abs)
     }
 }
 
-/// A position along one axis, as a fraction of the box it sits in plus an
-/// offset: `rel * len + px`. 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.
 #[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 UiScalar {
-    pub rel: Rel,
-    pub px: Px,
+    pub rel: f32,
+    pub abs: f32,
 }
 
-impl_op!(same UiScalar Add add; rel px);
-impl_op!(same UiScalar Sub sub; rel px);
+impl Eq for UiScalar {}
+impl Hash for UiScalar {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        state.write_u32(self.rel.to_bits());
+        state.write_u32(self.abs.to_bits());
+    }
+}
+
+impl_op!(UiScalar Add add; rel abs);
+impl_op!(UiScalar Sub sub; rel abs);
 
 impl UiScalar {
-    pub const ZERO: Self = Self {
-        rel: Rel::ZERO,
-        px: Px::ZERO,
-    };
-    pub const FULL: Self = Self {
-        rel: Rel::ONE,
-        px: Px::ZERO,
-    };
+    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, 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.
-    pub const fn from_parts(rel: Rel, px: Px) -> Self {
-        Self { rel, px }
+    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 {
-        Self::from_parts(Rel::ZERO, Px::from_f32(px))
+    pub const fn abs(abs: f32) -> Self {
+        Self { rel: 0.0, abs }
     }
 
     pub const fn rel_min() -> Self {
-        Self::ZERO
+        Self::new(0.0, 0.0)
     }
 
     pub const fn rel_max() -> Self {
-        Self::FULL
+        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 channels by the same factor, which is what a fraction of a
-    /// length means when the length is part pixels and part a share.
-    /// Both channels by the same fraction, which is what a part of a length
-    /// means when the length is part pixels and part a share.
-    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);
+    pub const fn offset(mut self, amt: f32) -> Self {
+        self.abs += 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),
-            px: self.px.add(self.rel.lerp(span.start.px, span.end.px)),
+            rel: anchor,
+            abs: offset,
         }
     }
 
+    pub const fn outside(&self, span: &UiSpan) -> 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);
+        Self { rel, abs }
+    }
+
     pub fn within_len(&self, len: UiScalar) -> Self {
         self.within(&UiSpan {
             start: UiScalar::ZERO,
@@ -227,18 +227,16 @@ impl UiScalar {
     }
 
     pub const fn flip(&mut self) {
-        self.rel = Rel::ONE.sub(self.rel);
-        self.px = self.px.neg();
+        self.rel = 1.0 - self.rel;
+        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
-    /// becomes a number of pixels.
-    pub const fn to_px(&self, len: Px) -> Px {
-        self.px.add(len.mul(self.rel))
+    pub const fn to_abs(&self, rel: f32) -> f32 {
+        self.rel * rel + self.abs
     }
 }
 
@@ -270,7 +268,7 @@ 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: UiScalar) {
@@ -285,6 +283,13 @@ impl UiSpan {
         }
     }
 
+    pub const fn outside(&self, parent: &Self) -> Self {
+        Self {
+            start: self.start.outside(parent),
+            end: self.end.outside(parent),
+        }
+    }
+
     pub const fn len(&self) -> UiScalar {
         self.end - self.start
     }
@@ -319,7 +324,14 @@ impl UiRegion {
             y: self.y.within(&parent.y),
         }
     }
-    pub const fn axis(&self, axis: Axis) -> &UiSpan {
+    pub const fn outside(&self, parent: &Self) -> Self {
+        Self {
+            x: self.x.outside(&parent.x),
+            y: self.y.outside(&parent.y),
+        }
+    }
+
+    pub const fn axis(&mut self, axis: Axis) -> &UiSpan {
         match axis {
             Axis::X => &self.x,
             Axis::Y => &self.y,
@@ -351,10 +363,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),
-            bot_right: self.bot_right().to_px(size),
+            top_left: self.top_left().get_rel() * size + self.top_left().get_abs(),
+            bot_right: self.bot_right().get_rel() * size + self.bot_right().get_abs(),
         }
     }
 
@@ -409,21 +421,21 @@ impl Display for UiRegion {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub struct PixelRegion {
-    pub top_left: PxVec2,
-    pub bot_right: PxVec2,
+    pub top_left: Vec2,
+    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
     }
 }
@@ -433,3 +445,20 @@ impl Display for PixelRegion {
         write!(f, "{} -> {}", self.top_left, self.bot_right)
     }
 }
+
+pub struct Vec2View<'a> {
+    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,
-    util::Vec2,
+    Align, GlyphAtlas, GlyphEntry, GlyphKey, PlacedGlyph, RegionAlign, UiColor, util::Vec2,
 };
 use parley::{
     Alignment, AlignmentOptions, FontContext, FontFamily, FontFamilyName, GenericFamily, Layout,
     LayoutContext, LineHeight, PositionedLayoutItem, StyleProperty,
 };
-use std::{
-    collections::VecDeque,
-    hash::{DefaultHasher, Hash, Hasher},
-};
+use std::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(),
         }
     }
 }
@@ -107,21 +76,11 @@ impl Default for TextAttrs {
     }
 }
 
-/// How far below the longest line a width may fall and still be answered by
-/// the break in hand. A parent that offers a child the length it reported
-/// composes that length back through the box chain, so the two differ in the
-/// last bits -- and at exactly the longest line, that decides whether a line
-/// fits. Sub-pixel, so no break it admits is one a reader could see.
-const BREAK_EPSILON_PX: f32 = 0.05;
-
 /// Keeps text and its corresponding layout from getting out of sync.
 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)]
@@ -136,7 +95,6 @@ impl TextBuffer {
             text: text.into(),
             layout: Layout::new(),
             layout_key: None,
-            placed: None,
         }
     }
 
@@ -161,28 +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
-    }
-
     pub fn size(&self) -> Vec2 {
         Vec2::new(self.layout.width(), self.layout.height())
     }
@@ -193,58 +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 a chance to
-        // disagree with itself -- which is what happens when a parent offers
-        // a child the length that child just reported, and the two land
-        // either side of a float.
-        if let Some(key) = &self.layout_key
-            && key.attrs == *attrs
-            && let (Some(broke_at), Some(want)) = (key.max_width, width)
-            && want <= broke_at
-            && want + BREAK_EPSILON_PX >= 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);
@@ -255,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);
     }
 }
 
@@ -304,9 +196,9 @@ impl TextData {
                     };
                     placed.push(PlacedGlyph {
                         entry,
-                        offset: PxVec2::new(
-                            Px::from_int(glyph.x.floor() as i32 + entry.left),
-                            Px::from_int(glyph.y.floor() as i32 - entry.top),
+                        offset: Vec2::new(
+                            glyph.x.floor() + entry.left as f32,
+                            glyph.y.floor() - entry.top as f32,
                         ),
                     });
                 }
@@ -373,54 +265,18 @@ pub struct RenderedText {
 }
 
 impl TextData {
-    /// The glyphs of this text at this width, taken out of what is kept.
-    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>(
+    pub fn render(
         &mut self,
-        buffer: &'b mut TextBuffer,
+        buffer: &mut TextBuffer,
         attrs: &TextAttrs,
         width: Option<f32>,
-    ) -> &'b RenderedText {
-        #[cfg(feature = "layout-diagnostics")]
-        diag::bump(Counter::TextRenders);
-        #[cfg(feature = "layout-diagnostics")]
-        let _render = diag::timer(TimerKind::TextRender);
+    ) -> RenderedText {
         buffer.shape(self, attrs, width);
-        // Only asked for when the buffer no longer holds them: taking one out
-        // of the store to then drop it would throw an answer away.
-        let placed = buffer.placed.take().or_else(|| {
-            let key = buffer.layout_key.as_ref()?;
-            self.take_placed(&buffer.text, key)
-        });
-        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);
+        let glyphs = self.place(buffer);
         RenderedText {
-                    glyphs: self.place(buffer),
+            glyphs,
             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;
@@ -241,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,
-    /// on the grid once here rather than on every frame that draws it.
-    pub offset: PxVec2,
+    pub offset: Vec2,
 }

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
-    // that the shader decodes, rather than the numbers themselves.
-    const ATTRIBS: [VertexAttribute; 6] = vertex_attr_array![
-        0 => Sint32x2,
-        1 => Sint32x2,
-        2 => Sint32x2,
-        3 => Sint32x2,
+    const ATTRIBS: [VertexAttribute; 5] = vertex_attr_array![
+        0 => Float32x2,
+        1 => Float32x2,
+        2 => Float32x2,
+        3 => Float32x2,
         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,22 +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 {
-    // The steps come from the same constants the CPU counts in, rather than
-    // a second copy of them written into the shader: a grid the two disagree
-    // about puts every coordinate somewhere else.
-    format!(
-        "const PX_STEP: f32 = 1.0 / {}.0;\nconst REL_STEP: f32 = 1.0 / {}.0;\n{PRELUDE}\n{wgsl}",
-        1u32 << crate::PX_SHIFT,
-        1u32 << crate::REL_SHIFT,
-    )
-}
-
 pub struct UiRenderNode {
     shared_layout: BindGroupLayout,
     shared_group: BindGroup,
@@ -45,7 +34,6 @@ pub struct UiRenderNode {
     active: Vec<usize>,
     window_buffer: Buffer,
     masks: ArrBuf<Mask>,
-    moves: ArrBuf<MoveOffset>,
 }
 
 struct RenderLayer {
@@ -139,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 ui_render.moves.changed {
-            ui_render.moves.changed = false;
-            regroup |= self.moves.update(device, queue, ui_render.moves.entries());
-        }
-        if regroup {
+            if self.masks.update(device, queue, &ui.masks[..]) {
                 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"),
@@ -181,13 +166,7 @@ impl UiRenderNode {
             BufferUsages::STORAGE | BufferUsages::COPY_DST,
             "ui masks",
         );
-        let moves = ArrBuf::new(
-            device,
-            BufferUsages::STORAGE | BufferUsages::COPY_DST,
-            "ui move offsets",
-        );
-        let shared_group =
-            Self::shared_group(device, &shared_layout, &window_buffer, &masks, &moves);
+        let shared_group = Self::shared_group(device, &shared_layout, &window_buffer, &masks);
 
         Self {
             shared_layout,
@@ -198,7 +177,6 @@ impl UiRenderNode {
             layers: HashMap::default(),
             active: Vec::new(),
             masks,
-            moves,
         }
     }
 
@@ -233,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),
@@ -274,8 +252,7 @@ impl UiRenderNode {
         })
     }
 
-    /// What every draw in the ui is given: the window, the masks and the
-    /// move chain every position is resolved through.
+    /// What every draw in the ui is given: the window and the masks.
     fn shared_layout(device: &Device) -> BindGroupLayout {
         device.create_bind_group_layout(&BindGroupLayoutDescriptor {
             entries: &[
@@ -299,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"),
         })
@@ -319,7 +286,6 @@ impl UiRenderNode {
         layout: &BindGroupLayout,
         window: &Buffer,
         masks: &ArrBuf<Mask>,
-        moves: &ArrBuf<MoveOffset>,
     ) -> BindGroup {
         device.create_bind_group(&BindGroupDescriptor {
             layout,
@@ -332,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"),
         })
@@ -412,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 {
-                    region,
-                    mask_idx,
-                    move_idx,
-                },
+                PrimitiveInstance { region, mask_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
-// here, which is how WGSL lays the struct out.
+// Manual rather than derived: the align(8) leaves four bytes of padding, which
+// 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,100 +7,16 @@
 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` and `REL_STEP` are prepended from `iris_core`'s own constants:
-// what it stores is a whole count of each, both 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.
-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) -> UiScalar {
-    return UiScalar(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>) -> UiScalar {
-    return UiScalar(f32(raw.x) * REL_STEP, f32(raw.y) * PX_STEP);
-}
-
-struct Region {
     x: UiSpan,
     y: UiSpan,
 }
 
-const MOVE_NONE: u32 = 4294967295u;
-// Keep in step with `iris_core::CHAIN_LIMIT`. It bounds a malformed cycle
-// rather than any real tree, and the CPU walk uses the same number so both
-// resolve a deep one the same way.
-const CHAIN_LIMIT: u32 = 64u;
-
-// The same expression `UiScalar::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: UiScalar, p: UiSpan) -> UiScalar {
-    return UiScalar(
-        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: UiScalar,
     end: UiScalar,
@@ -108,16 +24,15 @@ struct UiSpan {
 
 struct UiScalar {
     rel: f32,
-    px: f32,
+    abs: f32,
 }
 
 struct InstanceInput {
-    @location(0) x_start: vec2<i32>,
-    @location(1) x_end: vec2<i32>,
-    @location(2) y_start: vec2<i32>,
-    @location(3) y_end: vec2<i32>,
+    @location(0) x_start: vec2<f32>,
+    @location(1) x_end: vec2<f32>,
+    @location(2) y_start: vec2<f32>,
+    @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(
-        UiSpan(scalar_of_pair(in.x_start), scalar_of_pair(in.x_end)),
-        UiSpan(scalar_of_pair(in.y_start), scalar_of_pair(in.y_end)),
-    );
-    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_rel = vec2(in.x_start.x, in.y_start.x);
+    let top_left_abs = vec2(in.x_start.y, in.y_start.y);
+    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 top_left = snap_floor(top_left_rel * window.dim) + snap_floor(top_left_px);
-    let bot_right = snap_floor(bot_right_rel * window.dim) + snap_floor(bot_right_px);
+    let top_left = floor(top_left_rel * window.dim) + floor(top_left_abs);
+    let bot_right = floor(bot_right_rel * window.dim) + floor(bot_right_abs);
     let size = bot_right - top_left;
 
     let uv = vec2<f32>(
@@ -171,16 +81,13 @@ fn masked(in: VertexOutput, color: vec4<f32>) -> vec4<f32> {
         return color;
     }
     let mask = masks[in.mask_idx];
-    // Its own chain, not the drawn primitive's, so a stationary viewport
-    // clips content that moves inside it.
-    let m = resolve_move(mask.move_idx, Region(span_of(mask.x), span_of(mask.y)));
-    let tl = vec2(m.x.start.rel, m.y.start.rel);
-    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 tl = vec2(mask.x.start.rel, mask.y.start.rel);
+    let tl_abs = vec2(mask.x.start.abs, mask.y.start.abs);
+    let br = vec2(mask.x.end.rel, mask.y.end.rel);
+    let br_abs = vec2(mask.x.end.abs, mask.y.end.abs);
 
-    let top_left = snap_floor(tl * window.dim) + snap_floor(tl_px);
-    let bot_right = snap_floor(br * window.dim) + snap_floor(br_px);
+    let top_left = floor(tl * window.dim) + floor(tl_abs);
+    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,64 +1,14 @@
-use crate::{
-    Holds, LayerId, Len, MaskIdx, MoveIdx, PrimitiveHandle, RegionAlign, Size, TextureHandle,
-    UiRegion, WidgetId,
-};
+use crate::{LayerId, MaskIdx, PrimitiveHandle, TextureHandle, UiRegion, WidgetId};
 
-/// What is kept of a widget its parent has asked about. `drawn` says whether
-/// it currently draws; one that does not is kept so that a change to it, or
-/// under it, still reaches whoever asked.
+/// important non rendering data for retained drawing
 #[derive(Debug)]
 pub struct ActiveData {
     pub id: WidgetId,
-    /// The box its drawing is in, in `parent_move`'s coordinates.
     pub region: UiRegion,
-    /// The box its parent first asked about it in, as a part of the box the
-    /// parent was itself asked in. Any later box it was given was decided
-    /// knowing its answer, so this is where a question about it is asked
-    /// again -- and it is kept relative so that it follows the parent's.
-    pub offer: UiRegion,
-    /// What it answered there: the size and what that held for.
-    pub answer: (Size, [Holds; 2]),
-    /// What the widget said it used of its box, the last time it drew.
-    pub size: Size,
-    /// The pixel lengths of `region`, per axis, that its drawing and `size`
-    /// hold for.
-    pub holds: [Holds; 2],
-    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>,
     pub primitives: Vec<PrimitiveHandle>,
     pub children: Vec<WidgetId>,
-    /// The children whose size this widget read while drawing.
-    pub size_deps: Vec<WidgetId>,
-    /// The movable region its primitives are positioned through: its own when
-    /// opted in, otherwise the nearest ancestor's.
-    pub move_idx: MoveIdx,
-    /// The declared lengths whoever drew this widget resolved into its box.
-    /// A change to one moves a box this widget cannot fix by drawing again,
-    /// and comparing them is what says so.
-    pub declared: [Option<Len>; 2],
-    /// The alignment its parent asked it with. A local redraw repeats that
-    /// question, including an override chosen by a container.
-    pub align: RegionAlign,
-    /// Whether that alignment was the parent's override rather than the
-    /// widget's own property.
-    pub align_override: bool,
-    /// Its own alignment when it was last drawn. A change to the property is
-    /// found against this even when its parent overrode the alignment.
-    pub own_align: RegionAlign,
-    /// The movable region whose coordinates `region` uses.
-    pub parent_move: MoveIdx,
     pub mask: MaskIdx,
     pub layer: LayerId,
 }
-
-impl ActiveData {
-    /// Whether its drawing and size hold for a box of these pixel lengths.
-    pub fn holds_at(&self, px: crate::PxVec2) -> bool {
-        self.holds[0].contains(px.x) && self.holds[1].contains(px.y)
-    }
-}

core/src/ui/cache.rs

@@ -0,0 +1,18 @@
+use crate::{BothAxis, Len, UiVec2, WidgetId, util::HashMap};
+
+#[derive(Default)]
+pub struct Cache {
+    pub size: BothAxis<HashMap<WidgetId, (UiVec2, Len)>>,
+}
+
+impl Cache {
+    pub fn remove(&mut self, id: WidgetId) {
+        self.size.x.remove(&id);
+        self.size.y.remove(&id);
+    }
+
+    pub fn clear(&mut self) {
+        self.size.x.clear();
+        self.size.y.clear();
+    }
+}

core/src/ui/holds.rs

@@ -1,126 +0,0 @@
-use crate::{Px, REL_SHIFT, UiScalar, 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. What widening there is
-/// belongs to [`Self::through`], which has a rounding to undo, and is derived
-/// from that rounding rather than chosen.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct Holds {
-    pub lo: Px,
-    pub hi: Px,
-}
-
-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()
-    }
-
-    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. A part with no relative extent is a fixed length: it
-    /// was drawn at that length and any box keeps it there.
-    ///
-    /// The way in is `px + rel * box` taken to the nearest step, so a part
-    /// of exactly `lo` came from anything within half a step of it and the
-    /// answer is an interval even where this range is one length. Inverting
-    /// the length alone instead gives a point that need not even contain the
-    /// box the part was drawn in, which is a range excluding the drawing it
-    /// was made for.
-    pub const fn through(self, len: UiScalar) -> Self {
-        let rel = len.rel.raw() as i64;
-        if rel == 0 {
-            return Self::ANY;
-        }
-        // Three half steps either side -- one for the rounding on the way
-        // in, two for the difference between a length composed down the
-        // chain and the same length measured against the window -- and half
-        // of what a `Rel` counts in, to divide by the fraction. Exact until
-        // the division takes it back to the grid.
-        let px = len.px.raw() as i64;
-        let half_rel = REL_SHIFT - 1;
-        let lo = ((self.lo.raw() as i64 - px) * 2 - 3) << half_rel;
-        let hi = ((self.hi.raw() as i64 - px) * 2 + 3) << half_rel;
-        // Dividing by a negative turns the ends around, so which end each
-        // bound 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 through_reverses_a_range_for_a_negative_fraction() {
-        // `10 - box / 2` is between 20 and 40 for boxes from -60 to -20.
-        let part = UiScalar::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 = UiScalar::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:?}");
-        }
-    }
-
-    #[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/mod.rs

@@ -1,23 +1,17 @@
 use crate::{
-    Mask, MoveIdx, MoveOffset, PrimitiveRegistry, TextData, Textures, UiRegion, WeakWidget,
-    WidgetId, Widgets,
-    util::{Arena, Id, TrackedArena},
+    Mask, PrimitiveRegistry, TextData, Textures, WeakWidget, WidgetId, Widgets, util::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 cache;
 mod painter;
 mod render_state;
+mod size;
 
 pub use active::*;
-pub use holds::*;
 pub use painter::{Painter, PrimitiveLike};
 pub use render_state::*;
+pub use size::*;
 
 #[derive(Default)]
 pub struct UiData {
@@ -29,88 +23,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;
-        }
-    }
-
-    /// Composes a region held in `idx`'s coordinates down the chain, which is
-    /// the same walk the vertex shader does.
-    pub fn resolve(&self, idx: MoveIdx, local: UiRegion) -> UiRegion {
-        let mut region = local;
-        let mut at = idx;
-        for _ in 0..CHAIN_LIMIT {
-            if at == MoveIdx::NONE {
-                return region;
-            }
-            let entry = self.arena[at.idx()];
-            region = region.within(&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"
-        );
-        region
-    }
-
-    /// 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/painter.rs

@@ -1,51 +1,24 @@
-#[cfg(feature = "layout-diagnostics")]
-use crate::layout_diagnostics::{self as diag, Counter};
 use crate::{
-    Axis, Holds, Len, Px, PxVec2, RegionAlign, Rel, RenderedText, Size, StrongWidget, TextAttrs,
-    TextBuffer, TextData, TextureHandle, UiRegion, UiRenderState, UiRsc, UiScalar, UiVec2, Weight,
-    WidgetId, Widgets,
+    Axis, Len, RenderedText, Size, SizeCtx, StrongWidget, TextAttrs, TextBuffer, TextData,
+    TextureHandle, UiRegion, UiRenderState, UiRsc, UiScalar, UiVec2, Widget, WidgetId,
     render::{
-        GlyphPrimitive, Mask, MaskIdx, MoveIdx, Primitive, PrimitiveHandle, PrimitiveInst,
-        PrimitiveKind, TexturePrimitive,
+        GlyphPrimitive, Mask, MaskIdx, Primitive, PrimitiveHandle, PrimitiveInst, PrimitiveKind,
+        TexturePrimitive,
     },
-    ui::render_state::DrawInfo,
+    util::Vec2,
 };
-const AXES: [Axis; 2] = [Axis::X, Axis::Y];
 
 /// makes your surfaces look pretty
 pub struct Painter<'a> {
     pub(super) state: &'a mut UiRenderState,
     pub(super) rsc: &'a mut dyn UiRsc,
 
-    /// This widget's box, in the coordinates of `move_idx`.
     pub(super) region: UiRegion,
     pub(super) mask: MaskIdx,
     pub(super) textures: Vec<TextureHandle>,
     pub(super) primitives: Vec<PrimitiveHandle>,
     pub(super) children: Vec<WidgetId>,
-    /// The children asked about so far, so the first box each was asked in
-    /// is the one recorded as its offer.
-    pub(super) offered: Vec<WidgetId>,
-    /// The box this widget was first asked about in, in pixels.
-    pub(super) offered_px: PxVec2,
-    /// Whether this draw is in that box, which makes the questions it asks
-    /// the ones a cold layout asks and their answers the ones to keep.
-    pub(super) at_offer: bool,
-    /// The children whose size this widget read while drawing.
-    pub(super) size_deps: Vec<WidgetId>,
-    /// What this draw itself read of its box in pixels, per axis: every
-    /// length until it reads one, then that one, unless it says otherwise.
-    pub(super) own: [Holds; 2],
-    /// What the children it asked about and drew keep it to.
-    pub(super) under: [Holds; 2],
-    /// The movable region this widget's primitives are positioned through:
-    /// its own when opted in, otherwise the nearest ancestor's.
-    pub(super) move_idx: MoveIdx,
     pub layer: usize,
-    /// The layer this widget was entered on, which its children's layers are
-    /// counted from however far `layer` has walked.
-    pub(super) own_layer: usize,
-    pub(super) depth: usize,
     pub(super) id: WidgetId,
 }
 
@@ -57,8 +30,6 @@ impl<'a> Painter<'a> {
 
     /// Takes the kind, for a caller writing many of one primitive.
     fn write<P: Primitive>(&mut self, kind: PrimitiveKind<P>, primitive: P, region: UiRegion) {
-        #[cfg(feature = "layout-diagnostics")]
-        diag::bump(Counter::PrimitiveWrites);
         let h = self.state.layers.write(
             self.layer,
             PrimitiveInst {
@@ -67,7 +38,6 @@ impl<'a> Painter<'a> {
                 primitive,
                 region,
                 mask_idx: self.mask,
-                move_idx: self.move_idx,
             },
         );
         self.push_primitive(h);
@@ -94,227 +64,39 @@ impl<'a> Painter<'a> {
 
     pub fn set_mask(&mut self, region: UiRegion) {
         assert!(self.mask == MaskIdx::NONE);
-        self.mask = self.rsc.ui_mut().masks.push(Mask {
-            region,
-            move_idx: self.move_idx,
-        });
+        self.mask = self.rsc.ui_mut().masks.push(Mask { region });
     }
 
     /// Draws a widget within this widget's region.
-    pub fn widget<'s, W: ?Sized>(&'s mut self, id: &'s StrongWidget<W>) -> DrawResult<'s, 'a, W> {
-        self.widget_within(id, UiRegion::FULL)
+    pub fn widget<W: ?Sized>(&mut self, id: &StrongWidget<W>) {
+        self.widget_at(id, self.region);
     }
 
-    /// What a widget's rules declare its lengths to be, which whoever draws
-    /// it resolves into its box. Reading them depends on nothing -- the box
-    /// that comes of them is kept on the child, and `redraw` compares it
-    /// there.
-    fn declared_lens<W: ?Sized>(&self, id: &StrongWidget<W>) -> [Option<Len>; 2] {
-        declared_lens(self.rsc.widgets(), id.id())
+    /// Draws a widget somewhere within this one.
+    /// Useful for drawing child widgets in select areas.
+    pub fn widget_within<W: ?Sized>(&mut self, id: &StrongWidget<W>, region: UiRegion) {
+        self.widget_at(id, region.within(&self.region));
     }
 
-    /// Takes back a child that was drawn only to find out how long it is.
-    /// Its drawing is dropped and it is not one of this widget's children
-    /// this frame; what it answered is still something this widget asked.
-    pub fn undraw<W: ?Sized>(&mut self, id: &StrongWidget<W>) {
-        self.children.retain(|child| *child != id.id());
-        self.state.undraw_rec(id.id(), self.rsc);
-    }
-
-    /// Draws a widget somewhere within this one. `region` is in this widget's
-    /// own coordinates, and the child's declared lengths are still to be
-    /// taken from it. Where the child's drawing sits inside what it is given
-    /// is the child's alignment, applied where the child is drawn, so a
-    /// container positions a child either by handing it a box of exactly its
-    /// length or by leaving it room and letting its alignment decide.
-    pub fn widget_within<'s, W: ?Sized>(
-        &'s mut self,
-        id: &'s StrongWidget<W>,
-        region: UiRegion,
-    ) -> DrawResult<'s, 'a, W> {
-        self.widget_at(id, region, None)
-    }
-
-    /// Draws a widget with an alignment chosen by its container rather than
-    /// the widget's property. Containers use this when the box they hand down
-    /// already expresses the size they report around the child.
-    pub fn widget_aligned<'s, W: ?Sized>(
-        &'s mut self,
-        id: &'s StrongWidget<W>,
-        region: UiRegion,
-        align: RegionAlign,
-    ) -> DrawResult<'s, 'a, W> {
-        self.widget_at(id, region, Some(align))
-    }
-
-    fn widget_at<'s, W: ?Sized>(
-        &'s mut self,
-        id: &'s StrongWidget<W>,
-        region: UiRegion,
-        align_override: Option<RegionAlign>,
-    ) -> DrawResult<'s, 'a, W> {
-        let region_node = self.rsc.widgets().is_region_node(id.id());
-        let declared = self.declared_lens(id);
-        let align = align_override.unwrap_or_else(|| self.rsc.widgets().alignment(id.id()));
-        // Composing `FULL` through a box is not quite the identity in f32,
-        // so a child with nothing declared keeps the box it would have had.
-        let local = match declared.iter().any(Option::is_some) {
-            true => declared_box(region, declared, align),
-            false => region,
-        };
-        let within = match local == UiRegion::FULL {
-            true => self.region,
-            false => local.within(&self.region),
-        };
-        #[cfg(feature = "layout-diagnostics")]
-        if region_node {
-            diag::bump(Counter::RegionNodeDraws);
-            diag::region_node(id.id(), self.id, within);
-        }
-        // A child listed twice would be moved twice.
-        if !self.children.contains(&id.id()) {
+    fn widget_at<W: ?Sized>(&mut self, id: &StrongWidget<W>, region: UiRegion) {
         self.children.push(id.id());
-        }
-        let first_ask = self.offer(id.id());
-        let offer = match first_ask {
-            true => local,
-            false => self.state.active.get(&id.id()).map_or(local, |a| a.offer),
-        };
-        let answers_offer = self.at_offer && local == offer;
-        // The answer and what it holds for, both about the box asked in. The
-        // child's record may say something else once its drawing has been
-        // placed: a drawing made again in its placed box holds for that box.
-        let (size, holds) = self.state.draw_inner(
+        self.state.draw_inner(
+            self.layer,
             id.id(),
-            within,
-            DrawInfo {
-                layer: self.layer,
-                parent: Some(self.id),
-                depth: self.depth + 1,
-                parent_move: self.move_idx,
-                region_node,
-                mask: self.mask,
-                offer,
-                offered_px: self.px_within_offer(offer),
-                align: align_override,
-            },
+            region,
+            Some(self.id),
+            self.mask,
             None,
             self.rsc,
         );
-        if answers_offer {
-            self.state.active.get_mut(&id.id()).unwrap().answer = (size, holds);
-        }
-        // Whatever the child's answer holds for keeps this one to the boxes
-        // that give the child a length inside it.
-        for (axis, under) in AXES.into_iter().zip(self.under.iter_mut()) {
-            *under = under.and(holds[axis as usize].through(local.axis(axis).len()));
-        }
-        DrawResult {
-            child: id,
-            painter: self,
-            size,
-        }
     }
 
-    /// What a child says its length is without being drawn, if it can say.
-    /// Asking counts as reading its size.
-    pub fn size_hint<W: ?Sized>(&mut self, id: &StrongWidget<W>, axis: Axis) -> Option<Len> {
-        let widgets = self.rsc.widgets();
-        // A rule is the answer where there is one: it wins over whatever the
-        // widget would draw, so it has to win over what the widget says too.
-        let hint = widgets.size_rules(id.id()).axis(axis).known().or_else(|| {
-            widgets
-                .get_dyn(id.id())
-                .and_then(|widget| widget.size_hint(axis))
-        });
-        #[cfg(feature = "layout-diagnostics")]
-        diag::hint_read(id.id(), self.id, axis, hint);
-        match hint {
-            Some(hint) => {
-                #[cfg(feature = "layout-diagnostics")]
-                diag::bump(Counter::HintHits);
-                self.depend_on(id);
-                Some(hint)
-            }
-            None => {
-                #[cfg(feature = "layout-diagnostics")]
-                diag::bump(Counter::HintMisses);
-                None
-            }
-        }
-    }
-
-    /// A child's length in the box it is about to be offered, if it can be
-    /// had without drawing it: from its hint, or from a drawing it already
-    /// has that holds for that box.
-    pub fn known_len<W: ?Sized>(
+    pub fn render_text(
         &mut self,
-        child: &StrongWidget<W>,
-        axis: Axis,
-        region: UiRegion,
-    ) -> Option<Len> {
-        let declared = self.declared_lens(child);
-        let align = self.rsc.widgets().alignment(child.id());
-        let local = declared_box(region, declared, align);
-        let within = local.within(&self.region);
-        let first_ask = self.offer(child.id());
-        if first_ask && let Some(active) = self.state.active.get_mut(&child.id()) {
-            active.offer = local;
-        }
-        if let Some(hint) = self.size_hint(child, axis) {
-            return Some(hint);
-        }
-        let px = self.state.px_of(self.move_idx, within);
-        let (size, holds) =
-            self.state
-                .retained_size(child.id(), px, self.move_idx, self.rsc.widgets())?;
-        #[cfg(feature = "layout-diagnostics")]
-        diag::bump(Counter::RetainedSizeHits);
-        self.depend_on(child);
-        if first_ask {
-            let active = self.state.active.get_mut(&child.id()).unwrap();
-            active.answer = (size, holds);
-        }
-        for (axis, under) in AXES.into_iter().zip(self.under.iter_mut()) {
-            *under = under.and(holds[axis as usize].through(local.axis(axis).len()));
-        }
-        Some(size.axis(axis))
-    }
-
-    /// Whether this is the first box a child is asked about in during a draw
-    /// that is itself in the box it was asked in -- the question a cold
-    /// layout asks, whose answer is the one to keep.
-    fn offer(&mut self, child: WidgetId) -> bool {
-        if !self.at_offer || self.offered.contains(&child) {
-            return false;
-        }
-        self.offered.push(child);
-        true
-    }
-
-    /// The pixel size of a part of the box this widget was asked in.
-    fn px_within_offer(&self, local: UiRegion) -> PxVec2 {
-        let size = local.size();
-        PxVec2::new(
-            size.x.to_px(self.offered_px.x),
-            size.y.to_px(self.offered_px.y),
-        )
-    }
-
-    fn depend_on<W: ?Sized>(&mut self, child: &StrongWidget<W>) {
-        if !self.size_deps.contains(&child.id()) {
-            self.size_deps.push(child.id());
-        }
-    }
-
-    pub fn render_text<'b>(
-        &mut self,
-        buffer: &'b mut TextBuffer,
+        buffer: &mut TextBuffer,
         attrs: &TextAttrs,
         width: Option<f32>,
-    ) -> &'b RenderedText {
-        #[cfg(feature = "layout-diagnostics")]
-        diag::render_text(self.id, self.rsc.widgets().label(self.id), width);
+    ) -> RenderedText {
         let ui = self.rsc.ui_mut();
         ui.text.render(buffer, attrs, width)
     }
@@ -326,13 +108,9 @@ impl<'a> Painter<'a> {
             let mut region = origin;
             region.x.end = region.x.start;
             region.y.end = region.y.start;
-            let mut region = region.offset(UiVec2::from_px(glyph.offset));
-            let size = PxVec2::new(
-                Px::from_int(glyph.entry.width as i32),
-                Px::from_int(glyph.entry.height as i32),
-            );
-            region.x.end = region.x.start.offset(size.x);
-            region.y.end = region.y.start.offset(size.y);
+            let mut region = region.offset(UiVec2::abs(glyph.offset));
+            region.x.end = region.x.start + UiScalar::abs(glyph.entry.width as f32);
+            region.y.end = region.y.start + UiScalar::abs(glyph.entry.height as f32);
             self.write(
                 kind,
                 GlyphPrimitive {
@@ -347,76 +125,27 @@ impl<'a> Painter<'a> {
         }
     }
 
-    /// This widget's box, in the coordinates its own primitives are written
-    /// in -- so a region composed `within` it may be drawn directly.
     pub fn region(&self) -> UiRegion {
         self.region
     }
 
-    /// Where this widget sits in a box longer than the length it takes. A
-    /// widget that positions its own content reads it to place that content
-    /// the way the box around it would have placed the widget.
-    pub fn alignment(&self) -> RegionAlign {
-        self.rsc.widgets().alignment(self.id)
+    pub fn size<W: ?Sized + Widget>(&mut self, id: &StrongWidget<W>) -> Size {
+        self.size_ctx().size(id)
     }
 
-    /// Whether a rule beside this widget settles its length on `axis`, which
-    /// makes whatever it reports for that axis moot. The widget under a rule
-    /// does not otherwise learn of it -- this is for a container deciding
-    /// whether reading its children across an axis is worth anything, since
-    /// reading one is also what makes its own size depend on it.
-    pub fn ruled(&self, axis: Axis) -> bool {
-        self.rsc
-            .widgets()
-            .size_rules(self.id)
-            .axis(axis)
-            .known()
-            .is_some()
+    pub fn len_axis<W: ?Sized + Widget>(&mut self, id: &StrongWidget<W>, axis: Axis) -> Len {
+        match axis {
+            Axis::X => self.size_ctx().width(id),
+            Axis::Y => self.size_ctx().height(id),
+        }
     }
 
-    /// The part of this widget's box that something of `size` takes, at the
-    /// near edge. A container that reports one child's size gives every child
-    /// this, so what it draws is inside what it says it occupies.
-    pub fn box_of(&self, size: Size) -> UiRegion {
-        placed_box(UiRegion::FULL, size, RegionAlign::NEAR, [None; 2])
+    pub fn output_size(&self) -> Vec2 {
+        self.state.output_size
     }
 
-    /// This widget's box in pixels. Reading it makes the drawing one that
-    /// holds for this box only, until `holds` says how far it goes.
-    pub fn px_size(&mut self) -> PxVec2 {
-        let px = self.state.px_of(self.move_idx, self.region);
-        for (own, len) in self.own.iter_mut().zip([px.x, px.y]) {
-            if *own == Holds::ANY {
-                *own = Holds::at(len);
-            }
-        }
-        px
-    }
-
-    /// One axis of this widget's box in pixels. Prefer this to
-    /// [`Self::px_size`] when the other axis cannot affect the drawing.
-    pub fn px_len(&mut self, axis: Axis) -> Px {
-        let len = self.state.px_of(self.move_idx, self.region).axis(axis);
-        let own = &mut self.own[axis as usize];
-        if *own == Holds::ANY {
-            *own = Holds::at(len);
-        }
-        len
-    }
-
-    /// The lengths of this widget's box on `axis` that what it is drawing
-    /// holds for -- the same primitives, in the same fractions and offsets
-    /// of the box, and the same reported size. A widget that read its
-    /// length in pixels holds for that one alone until it says otherwise.
-    pub fn holds(&mut self, axis: Axis, holds: impl Into<Holds>) {
-        let holds = holds.into();
-        debug_assert!(
-            holds.contains(self.state.px_of(self.move_idx, self.region).axis(axis)),
-            "'{}' ({:?}) says its drawing holds for lengths that leave out its own box",
-            self.label(),
-            self.id
-        );
-        self.own[axis as usize] = holds;
+    pub fn px_size(&mut self) -> Vec2 {
+        self.region.size().to_abs(self.state.output_size)
     }
 
     pub fn text_data(&mut self) -> &mut TextData {
@@ -427,18 +156,6 @@ impl<'a> Painter<'a> {
         self.layer = self.state.layers.child(self.layer);
     }
 
-    /// The layer this widget's `n`th child draws on, addressed rather than
-    /// walked to. A container that measures one child by drawing it can ask
-    /// on the layer that child will end up on, and then the second ask is a
-    /// reuse rather than a second drawing on another layer.
-    pub fn child_layer_at(&mut self, n: usize) {
-        let mut at = self.state.layers.child(self.own_layer);
-        for _ in 0..n {
-            at = self.state.layers.next(at);
-        }
-        self.layer = at;
-    }
-
     pub fn next_layer(&mut self) {
         self.layer = self.state.layers.next(self.layer);
     }
@@ -450,30 +167,9 @@ impl<'a> Painter<'a> {
     pub fn id(&self) -> &WidgetId {
         &self.id
     }
-}
 
-/// A child that has just been drawn. Reading its size records that this
-/// widget's own size depends on it; dropping it without reading draws the
-/// child and leaves the parent independent of what it came to.
-pub struct DrawResult<'p, 'a, W: ?Sized> {
-    painter: &'p mut Painter<'a>,
-    child: &'p StrongWidget<W>,
-    size: Size,
-}
-
-impl<W: ?Sized> DrawResult<'_, '_, W> {
-    pub fn size(self) -> Size {
-        #[cfg(feature = "layout-diagnostics")]
-        {
-            diag::bump(Counter::SizeReads);
-            diag::size_read(self.child.id(), self.painter.id, self.size);
-        }
-        self.painter.depend_on(self.child);
-        self.size
-    }
-
-    pub fn len(self, axis: Axis) -> Len {
-        self.size().axis(axis)
+    pub fn size_ctx(&mut self) -> SizeCtx<'_> {
+        self.state.size_ctx(self.id, self.region.size(), self.rsc)
     }
 }
 
@@ -501,73 +197,3 @@ impl PrimitiveLike for &TextureHandle {
         self.into()
     }
 }
-
-/// What a widget declares a length of its box to be. `leftover` is not one: a
-/// share of what is left over is only a length to the widget dividing one,
-/// so it passes up in the size instead.
-pub(crate) fn declared_lens(widgets: &Widgets, id: WidgetId) -> [Option<Len>; 2] {
-    let rules = widgets.size_rules(id);
-    let widget = widgets.get_dyn(id);
-    AXES.map(|axis| {
-        rules.axis(axis).declared().or_else(|| {
-            // A hint still narrows the box where no rule does, which is how a
-            // widget with a natural pixel size -- an image, a gap -- gets that
-            // size rather than the whole offer. That is the offer's business
-            // rather than a declaration's, and this falls away once a widget
-            // occupies its reported size inside the box it was offered.
-            widget
-                .and_then(|widget| widget.size_hint(axis))
-                .filter(|len| len.leftover == Weight::ZERO)
-        })
-    })
-}
-
-/// The box a drawing occupies: the size the widget reported, on the side of
-/// the box it was asked in that its alignment says. An axis reported as a
-/// share fills, because a share is a length only to whoever divides one, and
-/// whoever did is the one that handed down this box. A declared axis is
-/// left alone too: `declared_box` already placed it, in the parent's box,
-/// and the rule's length is what the widget reports there.
-///
-/// A reported fraction is a fraction of the box the widget drew in, where a
-/// declared one is a fraction of the box its parent handed down -- a span
-/// reporting `rel(1.0)` means all of what it was given, whatever that was a
-/// fraction of. So this scales by the box rather than composing into it.
-pub(crate) fn placed_box(
-    region: UiRegion,
-    size: Size,
-    align: RegionAlign,
-    declared: [Option<Len>; 2],
-) -> UiRegion {
-    let mut placed = region;
-    for (axis, declared) in AXES.into_iter().zip(declared) {
-        let reported = size.axis(axis);
-        if reported.leftover != Weight::ZERO || declared.is_some() {
-            continue;
-        }
-        let span = placed.axis_mut(axis);
-        let len = span.len().scale(reported.rel) + UiScalar::from_parts(Rel::ZERO, reported.px);
-        span.start += (span.len() - len).scale(align.axis(axis).rel());
-        span.end = span.start + len;
-    }
-    placed
-}
-
-/// Takes a widget's declared lengths in the box `region` is given in, since a
-/// fraction of a length means a fraction of that one, and puts what is left
-/// over on the side its alignment says. A caller that already reserved the
-/// space hands back the same length, so this is the identity for it.
-pub(crate) fn declared_box(
-    mut region: UiRegion,
-    declared: [Option<Len>; 2],
-    align: RegionAlign,
-) -> UiRegion {
-    for (axis, len) in AXES.into_iter().zip(declared) {
-        let Some(len) = len else { continue };
-        let span = region.axis_mut(axis);
-        let len = UiScalar::from_parts(len.rel, len.px);
-        span.start += (span.len() - len).scale(align.axis(axis).rel());
-        span.end = span.start + len;
-    }
-    region
-}

core/src/ui/size.rs

@@ -0,0 +1,89 @@
+use crate::{
+    Axis, AxisT, IdLike, Len, RenderedText, Size, TextAttrs, TextBuffer, TextData, UiVec2,
+    WidgetAxisFns, WidgetId, Widgets, XAxis, YAxis, ui::cache::Cache, util::Vec2,
+};
+
+pub struct SizeCtx<'a> {
+    pub text: &'a mut TextData,
+    pub(super) source: WidgetId,
+    pub(super) widgets: &'a Widgets,
+    pub(super) cache: &'a mut Cache,
+    /// TODO: should this be pub? rn used for sized
+    pub outer: UiVec2,
+    pub(super) output_size: Vec2,
+    pub(super) id: WidgetId,
+}
+
+impl SizeCtx<'_> {
+    pub fn id(&self) -> &WidgetId {
+        &self.id
+    }
+
+    pub fn source(&self) -> &WidgetId {
+        &self.source
+    }
+
+    pub(super) fn len_inner<A: const AxisT>(&mut self, id: WidgetId) -> Len {
+        if let Some((_, len)) = self.cache.size.axis::<A>().get(&id) {
+            return *len;
+        }
+        let len = self
+            .widgets
+            .get_dyn_dynamic(id)
+            .desired_len::<A>(&mut SizeCtx {
+                text: self.text,
+                source: self.source,
+                widgets: self.widgets,
+                cache: self.cache,
+                outer: self.outer,
+                output_size: self.output_size,
+                id,
+            });
+        self.cache.size.axis::<A>().insert(id, (self.outer, len));
+        len
+    }
+
+    pub fn width(&mut self, id: impl IdLike) -> Len {
+        self.len_inner::<XAxis>(id.id())
+    }
+
+    pub fn height(&mut self, id: impl IdLike) -> Len {
+        self.len_inner::<YAxis>(id.id())
+    }
+
+    pub fn len_axis(&mut self, id: impl IdLike, axis: Axis) -> Len {
+        match axis {
+            Axis::X => self.width(id),
+            Axis::Y => self.height(id),
+        }
+    }
+
+    pub fn size(&mut self, id: impl IdLike) -> Size {
+        let id = id.id();
+        Size {
+            x: self.width(id),
+            y: self.height(id),
+        }
+    }
+
+    pub fn px_size(&mut self) -> Vec2 {
+        self.outer.to_abs(self.output_size)
+    }
+
+    pub fn output_size(&mut self) -> Vec2 {
+        self.output_size
+    }
+
+    pub fn draw_text(
+        &mut self,
+        buffer: &mut TextBuffer,
+        attrs: &TextAttrs,
+        width: Option<f32>,
+    ) -> RenderedText {
+        self.text.render(buffer, attrs, width)
+    }
+
+    pub fn label(&self, id: WidgetId) -> &String {
+        self.widgets.label(id)
+    }
+}

core/src/util/arena.rs

@@ -34,10 +34,6 @@ impl<T, I: IdNum> Arena<T, I> {
         self.tracker.free(id);
         self.data[i]
     }
-
-    pub(crate) 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,13 +1,34 @@
+use std::ops::*;
+
 pub const trait LerpUtil {
     fn lerp(self, from: Self, to: Self) -> Self;
+    fn lerp_inv(self, from: Self, to: Self) -> Self;
 }
 
-const impl LerpUtil for f32 {
+pub const trait DivOr {
+    fn div_or(self, rhs: Self, other: Self) -> Self;
+}
+
+const impl DivOr for f32 {
+    fn div_or(self, rhs: Self, other: Self) -> Self {
+        let res = self / rhs;
+        if res.is_nan() { other } else { res }
+    }
+}
+
+const impl<
+    T: const Add<Output = T> + const Sub<Output = T> + const Mul<Output = T> + const DivOr + Copy,
+> LerpUtil for T
+{
     /// linear interpolation
     /// from * (1.0 - self) + to * self
     fn lerp(self, from: Self, to: Self) -> Self {
         from + (to - from) * self
     }
+    /// inverse of lerp
+    fn lerp_inv(self, from: Self, to: Self) -> Self {
+        (self - from).div_or(to - from, from)
+    }
 }
 
 macro_rules! impl_op {
@@ -56,34 +77,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)*);
     };

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 crate::util::{DivOr, impl_op};
 use std::{hash::Hash, ops::*};
 
-/// `align(8)` because that is WGSL's alignment for a `vec2<f32>`, so any GPU
-/// 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))]
+#[repr(C)]
 #[derive(Clone, Copy, PartialEq, Default, bytemuck::Pod, bytemuck::Zeroable)]
 pub struct Vec2 {
     pub x: f32,
@@ -71,6 +67,15 @@ impl_op!(Vec2 Sub sub; x y);
 impl_op!(Vec2 Mul mul; x y);
 impl_op!(Vec2 Div div; x y);
 
+const impl DivOr for Vec2 {
+    fn div_or(self, rhs: Self, other: Self) -> Self {
+        Self {
+            x: self.x.div_or(rhs.x, other.x),
+            y: self.y.div_or(rhs.y, other.y),
+        }
+    }
+}
+
 impl Neg for Vec2 {
     type Output = Self;
 

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,10 +1,9 @@
-use crate::{Axis, Len, Painter, Size};
+use crate::{Axis, AxisT, Len, Painter, SizeCtx};
 use std::any::Any;
 
 mod data;
 mod handle;
 mod like;
-mod size_rule;
 mod tag;
 mod view;
 mod widgets;
@@ -12,31 +11,36 @@ mod widgets;
 pub use data::*;
 pub use handle::*;
 pub use like::*;
-pub use size_rule::*;
 pub use tag::*;
 pub use view::*;
 pub use widgets::*;
 
 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;
+    fn draw(&mut self, painter: &mut Painter);
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len;
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> 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<Len> {
-        None
+pub trait WidgetAxisFns {
+    fn desired_len<A: AxisT>(&mut self, ctx: &mut SizeCtx) -> Len;
+}
+
+impl<W: Widget + ?Sized> WidgetAxisFns for W {
+    fn desired_len<A: AxisT>(&mut self, ctx: &mut SizeCtx) -> Len {
+        match A::get() {
+            Axis::X => self.desired_width(ctx),
+            Axis::Y => self.desired_height(ctx),
+        }
     }
 }
 
 impl Widget for () {
-    /// A gap: nothing drawn, at the default length, so a span gives it a share.
-    fn draw(&mut self, _: &mut Painter) -> Size {
-        Size::default()
+    fn draw(&mut self, _: &mut Painter) {}
+    fn desired_width(&mut self, _: &mut SizeCtx) -> Len {
+        Len::ZERO
     }
-
-    fn size_hint(&self, _axis: Axis) -> Option<Len> {
-        Some(Len::default())
+    fn desired_height(&mut self, _: &mut SizeCtx) -> Len {
+        Len::ZERO
     }
 }
 

core/src/widget/size_rule.rs

@@ -1,86 +0,0 @@
-use crate::{Axis, Len, Weight};
-
-/// What a widget's length on one axis is, as a rule its parent applies where
-/// it draws it rather than an answer the widget gives about itself.
-///
-/// 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.
-#[derive(Debug, Clone, Copy, PartialEq, Default)]
-pub enum SizeRule {
-    /// Whatever the widget reports from drawing.
-    #[default]
-    Free,
-    /// This length, whatever the widget reports.
-    Exact(Len),
-}
-
-impl SizeRule {
-    /// The length this rule gives without the widget being drawn, if it can
-    /// give one. `leftover` is never among them: a share is a length only to
-    /// whoever divides one, so it passes up in the reported size instead and
-    /// is resolved there.
-    pub fn declared(&self) -> Option<Len> {
-        match self {
-            Self::Exact(len) if len.leftover == Weight::ZERO => Some(*len),
-            _ => None,
-        }
-    }
-
-    /// The length this rule fixes, whether or not it can narrow a box. A
-    /// share is a length the widget's parent still has to divide, so it is
-    /// known here and resolved there -- unlike `declared`, which is only the
-    /// ones that give a box directly.
-    pub fn known(&self) -> Option<Len> {
-        match self {
-            Self::Free => None,
-            Self::Exact(len) => Some(*len),
-        }
-    }
-
-    /// The length a widget reporting `reported` ends up with.
-    pub fn apply(&self, reported: Len) -> Len {
-        match self {
-            Self::Free => reported,
-            Self::Exact(len) => *len,
-        }
-    }
-}
-
-impl From<Len> for SizeRule {
-    fn from(len: Len) -> Self {
-        Self::Exact(len)
-    }
-}
-
-impl From<Option<Len>> for SizeRule {
-    fn from(len: Option<Len>) -> 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, Copy, PartialEq, Default)]
-pub struct SizeRules {
-    pub x: SizeRule,
-    pub y: SizeRule,
-}
-
-impl SizeRules {
-    pub fn axis(&self, axis: Axis) -> SizeRule {
-        match axis {
-            Axis::X => self.x,
-            Axis::Y => self.y,
-        }
-    }
-
-    pub fn axis_mut(&mut self, axis: Axis) -> &mut SizeRule {
-        match axis {
-            Axis::X => &mut self.x,
-            Axis::Y => &mut self.y,
-        }
-    }
-}

core/src/widget/widgets.rs

@@ -1,8 +1,7 @@
 use std::sync::mpsc::{Receiver, Sender, channel};
 
 use crate::{
-    Axis, AxisAlign, IdLike, RegionAlign, SizeRule, SizeRules, StrongWidget, WeakWidget, Widget,
-    WidgetData, WidgetId,
+    IdLike, StrongWidget, WeakWidget, Widget, WidgetData, WidgetId,
     util::{DynBorrower, HashSet, SlotVec, forget_mut, to_mut},
 };
 
@@ -101,71 +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
-    }
-
-    /// 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_mut(axis) == rule {
-            return;
-        }
-        *data.size.axis_mut(axis) = rule;
-        self.needs_redraw.insert(id);
-    }
-
-    /// 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_mut(axis) == align {
-            return;
-        }
-        *data.align.axis_mut(axis) = align;
-        self.needs_redraw.insert(id);
-    }
-
-    /// Both axes at once, for a caller holding a pair.
-    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())
     }

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

@@ -24,18 +24,18 @@ impl DefaultAppState for Client {
                     .color(Color::RED)
                     .sized((100, 100))
                     .center()
-                    .width(leftover(2)),
+                    .width(rest(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);
@@ -121,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);

examples/text.rs

@@ -1,63 +0,0 @@
-//! Text sizing: wrapped text reads the width it is offered, fixed text does
-//! not, and both report a height their container lays out around.
-
-use iris::prelude::*;
-
-fn main() {
-    DefaultApp::<State>::run();
-}
-
-#[derive(DefaultUiState)]
-struct State {
-    ui_state: DefaultUiState,
-}
-
-const SAMPLE: &str = "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, and \
-    the same words in a narrower box come back taller. Resize the window and watch the \
-    text below reflow into a different number of lines while nothing about it changes.";
-
-impl DefaultAppState for State {
-    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>, _: Proxy<Self>) -> Self {
-        let panel = || rect(Color::WHITE.darker(0.85));
-
-        let wrapped = wtext(SAMPLE)
-            .size(28)
-            .wrap(true)
-            .text_align(Align::LEFT)
-            .pad(16)
-            .background(panel());
-
-        let aligned = (
-            wtext("left").size(24).text_align(Align::LEFT),
-            wtext("centred").size(24).text_align(Align::CENTER),
-            wtext("right").size(24).text_align(Align::RIGHT),
-        )
-            .span(Dir::DOWN)
-            .gap(8)
-            .pad(16)
-            .background(panel());
-
-        // The same words in half the width, which is a different number of
-        // lines and so a different height. A declared width only holds along
-        // a span's own axis, hence the row.
-        let narrow = (
-            wtext(SAMPLE)
-                .size(20)
-                .wrap(true)
-                .pad(16)
-                .background(panel())
-                .align(Align::TOP)
-                .width(rel(0.5)),
-            rect(Color::WHITE.darker(0.95)),
-        )
-            .span(Dir::RIGHT);
-
-        (wrapped, aligned, narrow)
-            .span(Dir::DOWN)
-            .gap(12)
-            .pad(12)
-            .set_root(rsc, &mut ui_state);
-        Self { ui_state }
-    }
-}

rig-input/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "rig-input"
-version.workspace = true
-edition.workspace = true
-
-# Replays `.touch` recordings through Wayland's virtual-pointer protocol;
-# headless sway has no input devices for coordinate-driving tools to move.
-[[bin]]
-name = "replay-touch"
-path = "src/main.rs"
-
-[dependencies]
-# Share the harness parser so both ways of replaying read a file the same.
-iris = { path = ".." }
-wayland-client = { workspace = true }
-wayland-protocols-wlr = { workspace = true }

rig-input/src/main.rs

@@ -1,141 +0,0 @@
-use iris::harness::{TouchAction, TouchScript};
-use std::time::Duration;
-use wayland_client::protocol::wl_pointer::ButtonState;
-use wayland_client::protocol::{wl_registry, wl_seat};
-use wayland_client::{Connection, Dispatch, QueueHandle, delegate_noop};
-use wayland_protocols_wlr::virtual_pointer::v1::client::{
-    zwlr_virtual_pointer_manager_v1::ZwlrVirtualPointerManagerV1,
-    zwlr_virtual_pointer_v1::ZwlrVirtualPointerV1,
-};
-
-const BTN_LEFT: u32 = 0x110;
-
-const SETTLE: Duration = Duration::from_millis(200);
-
-#[derive(Default)]
-struct Globals {
-    seat: Option<wl_seat::WlSeat>,
-    manager: Option<ZwlrVirtualPointerManagerV1>,
-}
-
-impl Dispatch<wl_registry::WlRegistry, ()> for Globals {
-    fn event(
-        state: &mut Self,
-        registry: &wl_registry::WlRegistry,
-        event: wl_registry::Event,
-        _: &(),
-        _: &Connection,
-        qh: &QueueHandle<Self>,
-    ) {
-        let wl_registry::Event::Global {
-            name,
-            interface,
-            version,
-        } = event
-        else {
-            return;
-        };
-        match interface.as_str() {
-            "wl_seat" => {
-                state.seat = Some(registry.bind(name, version.min(7), qh, ()));
-            }
-            "zwlr_virtual_pointer_manager_v1" => {
-                state.manager = Some(registry.bind(name, version.min(2), qh, ()));
-            }
-            _ => {}
-        }
-    }
-}
-
-delegate_noop!(Globals: ignore wl_seat::WlSeat);
-delegate_noop!(Globals: ZwlrVirtualPointerManagerV1);
-delegate_noop!(Globals: ZwlrVirtualPointerV1);
-
-fn main() {
-    let args: Vec<String> = std::env::args().skip(1).collect();
-    let [width, height, path] = args.as_slice() else {
-        eprintln!("usage: replay-touch WIDTH HEIGHT FILE");
-        std::process::exit(2);
-    };
-    let (width, height) = (parse(width, "WIDTH"), parse(height, "HEIGHT"));
-    let text = std::fs::read_to_string(path)
-        .unwrap_or_else(|e| fail(&format!("could not read {path}: {e}")));
-    let script = TouchScript::parse(&text).unwrap_or_else(|e| fail(&e));
-
-    let conn = Connection::connect_to_env().unwrap_or_else(|e| {
-        fail(&format!(
-            "no wayland display ({e}); is WAYLAND_DISPLAY set?"
-        ))
-    });
-    let mut queue = conn.new_event_queue();
-    let qh = queue.handle();
-    let display = conn.display();
-    display.get_registry(&qh, ());
-    let mut globals = Globals::default();
-    queue
-        .roundtrip(&mut globals)
-        .unwrap_or_else(|e| fail(&format!("wayland roundtrip failed: {e}")));
-
-    let manager = globals.manager.as_ref().unwrap_or_else(|| {
-        fail(
-            "this compositor does not offer zwlr_virtual_pointer_manager_v1, so a pointer cannot \
-             be synthesised; sway and every wlroots compositor do",
-        )
-    });
-    let pointer = manager.create_virtual_pointer(globals.seat.as_ref(), &qh, ());
-
-    // Put the pointer where the gesture starts and let the compositor
-    // settle before anything is pressed. Without this the press is
-    // dropped: sway has just learned about this pointer, and a button
-    // sent in the same breath as the motion that first puts it over a
-    // window arrives before there is a focused surface to send it to --
-    // winit sees `CursorEntered`, the moves and the *release*, never the
-    // press, so the gesture reads as a hover and nothing scrolls. Found
-    // by printing winit's own events; the settle is what fixed it.
-    if let Some(first) = script.samples.first() {
-        pointer.motion_absolute(0, first.pos.x as u32, first.pos.y as u32, width, height);
-        pointer.frame();
-        conn.flush()
-            .unwrap_or_else(|e| fail(&format!("flush: {e}")));
-        std::thread::sleep(SETTLE);
-    }
-
-    let mut previous = 0;
-    for sample in &script.samples {
-        std::thread::sleep(Duration::from_millis(sample.t_ms - previous));
-        previous = sample.t_ms;
-        let t = sample.t_ms as u32;
-        pointer.motion_absolute(t, sample.pos.x as u32, sample.pos.y as u32, width, height);
-        pointer.frame();
-        // The button goes in a frame of its own, *after* the motion has
-        // been committed. Sent in the same frame as the motion that
-        // first puts the pointer over the window, sway drops it: the
-        // client sees `CursorEntered` and the moves but never a
-        // `MouseInput { state: Pressed }`, so the whole gesture reads as
-        // a hover and nothing scrolls. Found exactly that way, by
-        // printing winit's events.
-        let state = match sample.action {
-            TouchAction::Down => Some(ButtonState::Pressed),
-            TouchAction::Up => Some(ButtonState::Released),
-            TouchAction::Move => None,
-        };
-        if let Some(state) = state {
-            pointer.button(t, BTN_LEFT, state);
-            pointer.frame();
-        }
-        conn.flush()
-            .unwrap_or_else(|e| fail(&format!("flush: {e}")));
-    }
-    pointer.destroy();
-    conn.flush().ok();
-}
-
-fn parse(text: &str, what: &str) -> u32 {
-    text.parse()
-        .unwrap_or_else(|_| fail(&format!("{what} is not a whole number: {text:?}")))
-}
-
-fn fail(message: &str) -> ! {
-    eprintln!("replay-touch: {message}");
-    std::process::exit(1);
-}

scripts/headless.conf

@@ -1,14 +0,0 @@
-# The compositor `scripts/run-headless.sh` starts, so that an example has a
-# surface where there is no display. Nothing here is meant to be looked at
-# directly; `grim` is.
-#
-# No Xwayland: winit talks Wayland natively, so an X server is a second thing
-# to go wrong for no gain.
-xwayland disable
-
-# The default output, overridden per run by `--mode`. Larger than the window
-# an example opens, so nothing is scaled or clipped.
-output HEADLESS-1 mode 1920x1200@60Hz
-
-default_border none
-focus_follows_mouse no

scripts/run-headless.sh

@@ -1,182 +0,0 @@
-#!/bin/sh
-# Run an iris example on a machine with no display.
-#
-#   ./scripts/run-headless.sh tabs
-#   ./scripts/run-headless.sh tabs --shot /tmp/tabs.png --seconds 4
-#   ./scripts/run-headless.sh tabs --replay taps.touch --shot /tmp/tabs.png
-#   ./scripts/run-headless.sh app --dir ../elsewhere --mode 1080x2424@120Hz
-#
-# `--dir DIR` names the workspace to build in, defaulting to this one, so a
-# project that depends on iris can be run through the same rig. `--bin` runs a
-# crate binary rather than an example, and takes its own argv from
-# `$RUN_HEADLESS_ARGS`, word-split on purpose.
-#
-# `--mode` sets the output, for running something at a size other than a
-# desktop's -- a phone's, say. Set every run rather than only when it changes:
-# the compositor is reused between runs, so a default-shaped run after a
-# 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
-# `--shot` it also writes `<shot>-before.png` from just before the gesture,
-# since "it moved" is a claim about two pictures.
-#
-# What it supplies is a compositor for winit to open a surface on: a headless
-# sway, and `grim` to screenshot it. Sway gets its own socket and runtime
-# directory rather than joining whatever else is running, because it tiles --
-# adding a window to someone else's compositor resizes theirs.
-set -eu
-
-need() {
-    command -v "$1" >/dev/null 2>&1 || {
-        echo "run-headless: $1 is not installed ($2)" >&2
-        exit 127
-    }
-}
-need sway "the compositor an example opens its window on"
-need swaymsg "sway's control socket"
-
-scripts=$(cd "$(dirname "$0")" && pwd)
-root=$(cd "$scripts/.." && pwd)
-workdir="$root"
-cd "$root"
-run="${XDG_RUNTIME_DIR:-/tmp}/iris-headless"
-seconds=3
-shot=""
-replay=""
-resize=""
-example=""
-kind=example
-mode=1920x1200@60Hz
-
-
-while [ $# -gt 0 ]; do
-    case "$1" in
-        --shot) shot=$2; shift 2 ;;
-        --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; }
-[ -z "$replay" ] || [ -f "$replay" ] || { echo "run-headless: no touch script at $replay" >&2; exit 2; }
-[ -z "$shot" ] || need grim "the screenshot --shot writes"
-
-mkdir -p "$run"
-export SWAYSOCK="$run/sway.sock"
-
-# Named rather than left to sway's pid-based default, so a second run reuses
-# this compositor instead of starting another beside it.
-if ! swaymsg -t get_version >/dev/null 2>&1; then
-    rm -f "$SWAYSOCK"
-    WLR_BACKENDS=headless WLR_LIBINPUT_NO_DEVICES=1 LIBSEAT_BACKEND=noop \
-        setsid sway -c "$scripts/headless.conf" >"$run/sway.log" 2>&1 &
-    i=0
-    while [ $i -lt 20 ]; do
-        swaymsg -t get_version >/dev/null 2>&1 && break
-        i=$((i + 1)); sleep 0.5
-    done
-    swaymsg -t get_version >/dev/null 2>&1 || {
-        echo "run-headless: compositor did not start; see $run/sway.log" >&2
-        exit 1
-    }
-fi
-
-rm -f "$run/display"
-swaymsg exec -- "sh -c 'printf %s \"\$WAYLAND_DISPLAY\" > $run/display'" >/dev/null
-i=0
-while [ $i -lt 20 ]; do
-    [ -s "$run/display" ] && break
-    i=$((i + 1)); sleep 0.5
-done
-[ -s "$run/display" ] || { echo "run-headless: could not read WAYLAND_DISPLAY" >&2; exit 1; }
-WAYLAND_DISPLAY=$(cat "$run/display")
-export WAYLAND_DISPLAY
-
-echo "run-headless: $WAYLAND_DISPLAY (sway $(swaymsg -t get_version --raw | sed -n 's/.*"human_readable":"\([^"]*\)".*/\1/p'))" >&2
-
-swaymsg output HEADLESS-1 mode "$mode" >/dev/null
-# The extent `replay-touch` positions against, so a script's coordinates
-# are the output's own pixels.
-out_w=${mode%x*}
-out_h=${mode#*x}; out_h=${out_h%@*}
-
-# Built before the app starts, so a compile error is not reported as a
-# window that failed to move.
-[ -z "$replay" ] || (cd "$root" && cargo build --bin replay-touch -p rig-input) >&2
-
-cd "$workdir"
-if [ "$kind" = bin ]; then
-    cargo build --bin "$example" "$@" >&2
-    bin="$workdir/target/debug/$example"
-else
-    cargo build --example "$example" "$@" >&2
-    bin="$workdir/target/debug/examples/$example"
-fi
-
-# Deliberately word-split: this is the binary's own argv, not a single path.
-# shellcheck disable=SC2086
-"$bin" ${RUN_HEADLESS_ARGS:-} >"$run/$example.log" 2>&1 &
-pid=$!
-trap 'kill "$pid" 2>/dev/null || true' EXIT INT TERM
-
-# Wait for the window to be mapped rather than for a number of seconds. A
-# fixed sleep took an all-black screenshot the first time this ran, when sway
-# had started in the same invocation and had not composited its output yet --
-# which is indistinguishable from an app that draws nothing.
-i=0
-while [ $i -lt 40 ]; do
-    kill -0 "$pid" 2>/dev/null || break
-    swaymsg -t get_tree --raw 2>/dev/null | grep -q "\"pid\":$pid," && break
-    i=$((i + 1)); sleep 0.25
-done
-
-i=0
-while [ $i -lt "$((seconds * 2))" ]; do
-    kill -0 "$pid" 2>/dev/null || break
-    i=$((i + 1)); sleep 0.5
-done
-
-if [ -n "$resize" ] && kill -0 "$pid" 2>/dev/null; then
-    swaymsg output HEADLESS-1 mode "$resize" >/dev/null
-    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"
-        echo "run-headless: wrote ${shot%.png}-before.png (before the gesture)" >&2
-    fi
-    "$root/target/debug/replay-touch" "$out_w" "$out_h" "$replay"
-    # A fling outlives the finger: the gesture's own last sample is not
-    # when the list stops. Long enough for Android's spline to settle
-    # (`FlingCalculator::duration` tops out around a second and a half).
-    sleep 2
-fi
-
-if kill -0 "$pid" 2>/dev/null; then
-    [ -n "$shot" ] && grim "$shot" && echo "run-headless: wrote $shot" >&2
-    kill "$pid" 2>/dev/null || true
-    wait "$pid" 2>/dev/null || true
-    status=0
-else
-    wait "$pid" 2>/dev/null || status=$?
-    echo "run-headless: $example exited early (status ${status:-0})" >&2
-    status=${status:-1}
-fi
-
-echo "--- $example output ---" >&2
-cat "$run/$example.log" >&2
-exit "$status"

src/default/attr.rs

@@ -15,10 +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 pointer arrives from the platform in floats; everything
-            // it is compared against is on the grid.
-            let pos = (PxVec2::from_f32(ctx.data.pos) + container_pos - id_pos).to_f32();
-            let size = region.size().to_f32();
+            let pos = ctx.data.pos + container_pos - id_pos;
+            let size = region.size();
             select(
                 rsc,
                 ctx.data.render,
@@ -72,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()),
-            LogicalSize::<f32>::from(region.size().to_f32().tuple()),
+            LogicalPosition::<f32>::from(region.top_left.tuple()),
+            LogicalSize::<f32>::from(region.size().tuple()),
         );
     }
     state.focus = Some(id);

src/default/mod.rs

@@ -235,7 +235,8 @@ impl<State: DefaultAppState> AppState for DefaultApp<State> {
             ui_state.focus = None;
         }
         if input_changed {
-            render.run_sensors(rsc, state, cursor_state);
+            let window_size = ui_state.window_size();
+            render.run_sensors(rsc, state, cursor_state, window_size);
         }
         let ui_state = state.default_state_mut();
         if old != ui_state.focus

src/default/sense.rs

@@ -4,14 +4,14 @@ use std::{
     rc::Rc,
 };
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq)]
 pub enum CursorButton {
     Left,
     Right,
     Middle,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq)]
 pub enum CursorSense {
     PressStart(CursorButton),
     Pressing(CursorButton),
@@ -27,7 +27,7 @@ pub struct CursorSenses(Vec<CursorSense>);
 
 impl Event for CursorSenses {
     type Data<'a> = CursorData<'a>;
-    type Global = Hovered;
+    type State = SensorState;
     fn should_run<'a>(&self, data: &Self::Data<'a>) -> Option<Self::Data<'a>> {
         if let Some(sense) = should_run(self, &data.cursor, data.hover) {
             let mut data = data.clone();
@@ -37,24 +37,6 @@ impl Event for CursorSenses {
             None
         }
     }
-
-    /// A press or a scroll is used up by whatever answered it, so it stops
-    /// there. Hovering is not: a cursor resting somewhere goes on resting.
-    fn consumes(&self, data: &Self::Data<'_>) -> bool {
-        !data.sense.position_only()
-    }
-}
-
-/// Who the cursor was inside, before and after an input. The difference is
-/// whose hover has ended -- including a widget a higher layer has covered,
-/// which the walk stops before reaching.
-///
-/// Two buffers that swap rather than one rebuilt, so an input allocates
-/// nothing once they have grown.
-#[derive(Default)]
-pub struct Hovered {
-    was: Vec<WidgetId>,
-    now: Vec<WidgetId>,
 }
 
 impl CursorSense {
@@ -70,12 +52,6 @@ impl CursorSense {
     pub fn is_dragging(&self) -> bool {
         matches!(self, CursorSense::Pressing(CursorButton::Left))
     }
-
-    /// False if the sense is a button or a scroll, true if it is only about
-    /// where the cursor is.
-    fn position_only(&self) -> bool {
-        matches!(self, Self::HoverStart | Self::Hovering | Self::HoverEnd)
-    }
 }
 
 #[derive(Default, Clone)]
@@ -120,12 +96,6 @@ impl CursorButtons {
 }
 
 impl CursorState {
-    /// True if the cursor is only reporting where it is: no button and no
-    /// scroll this frame.
-    pub fn position_only(&self) -> bool {
-        self.scroll_delta == Vec2::ZERO && self.buttons.iter().all(|(_, state)| state.is_off())
-    }
-
     pub fn end_frame(&mut self) {
         self.buttons.end_frame();
         self.scroll_delta = Vec2::ZERO;
@@ -153,6 +123,11 @@ pub struct Sensor<Ctx: HasEvents, Data> {
 
 pub type SenseShape = UiRegion;
 
+#[derive(Default, Debug)]
+pub struct SensorState {
+    pub hover: ActivationState,
+}
+
 #[derive(Clone)]
 pub struct CursorData<'a> {
     /// where this widget was hit
@@ -172,6 +147,7 @@ pub trait SensorUi {
         rsc: &mut Rsc,
         state: &mut Rsc::State,
         cursor: CursorState,
+        window_size: Vec2,
     );
 }
 
@@ -181,85 +157,46 @@ impl SensorUi for UiRenderState {
         rsc: &mut Rsc,
         state: &mut Rsc::State,
         cursor: CursorState,
+        window_size: Vec2,
     ) {
         // in order to remove this take, need to store active list in UiRenderState somehow
         // this would probably be done through a generic parameter that adds yet another rsc /
         // state like thing, but local to render state, and is passed to UiRsc events so you can
         // update it there?
-        let active = std::mem::take(&mut rsc.events_mut().get_type::<CursorSense>().active);
-        let mut hovered = std::mem::take(&mut rsc.events_mut().get_type::<CursorSense>().global);
-        hovered.now.clear();
-        let position_only = cursor.position_only();
-        let region_of = |id| self.window_region(&id);
-
+        let mut active = std::mem::take(&mut rsc.events_mut().get_type::<CursorSense>().active);
         for layer in self.layers.indices().rev() {
-            let mut consumed = false;
-            for id in active.get(&layer).into_flat_iter().map(|(id, _)| *id) {
-                let Some(region) = region_of(id) else {
-                    continue;
-                };
-                if !cursor.exists || !region.contains(PxVec2::from_f32(cursor.pos)) {
+            let mut sensed = false;
+            for (id, sensor) in active.get_mut(&layer).into_flat_iter() {
+                let shape = self.active.get(id).unwrap().region;
+                let region = shape.to_px(window_size);
+                let in_shape = cursor.exists && region.contains(cursor.pos);
+                sensor.hover.update(in_shape);
+                if sensor.hover == ActivationState::Off {
                     continue;
                 }
-                hovered.now.push(id);
-                let hover = match hovered.was.contains(&id) {
-                    true => ActivationState::On,
-                    false => ActivationState::Start,
-                };
-                // A press or a scroll stops where something answered it, so a
-                // button over a list does not swallow the list's scrolling.
-                consumed |= deliver(self, rsc, state, id, hover, &cursor, region);
-                // A cursor doing neither stops at whatever it is over, so
-                // hovering does not reach through.
-                consumed |= position_only;
-            }
-            // Applied after the layer, never during it: senses on one layer do
-            // not block each other.
-            if consumed {
-                break;
-            }
-        }
+                sensed = true;
 
-        // Whatever the cursor was inside and is not now, whether it left or a
-        // layer above took the input before the walk reached it. A widget that
-        // stopped being drawn has no region to report and is simply dropped.
-        for &id in &hovered.was {
-            if !hovered.now.contains(&id)
-                && let Some(region) = region_of(id)
-            {
-                deliver(self, rsc, state, id, ActivationState::End, &cursor, region);
-            }
-        }
-        std::mem::swap(&mut hovered.was, &mut hovered.now);
+                let cursor = cursor.clone();
 
-        let senses = rsc.events_mut().get_type::<CursorSense>();
-        senses.active = active;
-        senses.global = hovered;
-    }
-}
-
-/// Runs one widget's cursor senses, and says whether they used up the input.
-fn deliver<Rsc: HasEvents>(
-    render: &UiRenderState,
-    rsc: &mut Rsc,
-    state: &mut Rsc::State,
-    id: WidgetId,
-    hover: ActivationState,
-    cursor: &CursorState,
-    region: PixelRegion,
-) -> bool {
                 let data = CursorData {
-        pos: cursor.pos - region.top_left.to_f32(),
-        size: region.size().to_f32(),
+                    pos: cursor.pos - region.top_left,
+                    size: region.bot_right - region.top_left,
                     scroll_delta: cursor.scroll_delta,
-        hover,
-        cursor: cursor.clone(),
+                    hover: sensor.hover,
+                    cursor,
                     // this does not have any meaning;
                     // might wanna set up Event to have a prepare stage
                     sense: CursorSense::Hovering,
-        render,
+                    render: self,
                 };
-    rsc.run_event::<CursorSense>(id, data, state)
+                rsc.run_event::<CursorSense>(*id, data, state);
+            }
+            if sensed {
+                break;
+            }
+        }
+        rsc.events_mut().get_type::<CursorSense>().active = active;
+    }
 }
 
 pub fn should_run(
@@ -268,11 +205,6 @@ pub fn should_run(
     hover: ActivationState,
 ) -> Option<CursorSense> {
     for sense in senses.iter() {
-        // A widget the cursor is no longer inside senses only its position:
-        // the press that ended its hover landed on something else.
-        if !hover.is_on() && !sense.position_only() {
-            continue;
-        }
         if match sense {
             CursorSense::PressStart(button) => cursor.buttons.select(button).is_start(),
             CursorSense::Pressing(button) => cursor.buttons.select(button).is_on(),

src/harness.rs

@@ -29,95 +29,14 @@ macro_rules! assert_corners {
         assert_eq!(
             $harness.region(&$id).expect("widget drew nothing"),
             $crate::core::PixelRegion {
-                top_left: $crate::core::PxVec2::new(
-                    $crate::core::Px::from_f32($x0 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),
-                ),
+                top_left: $crate::core::util::Vec2::new($x0 as f32, $y0 as f32),
+                bot_right: $crate::core::util::Vec2::new($x1 as f32, $y1 as f32),
             }
         );
     };
 }
 pub use crate::assert_corners;
 
-/// One replayed pointer sample, cut down to what a window delivers: where the
-/// pointer is, and whether the button changed.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum TouchAction {
-    Down,
-    Move,
-    Up,
-}
-
-impl TouchAction {
-    fn parse(word: &str) -> Option<Self> {
-        match word {
-            "down" => Some(Self::Down),
-            "move" => Some(Self::Move),
-            "up" => Some(Self::Up),
-            _ => None,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct TouchSample {
-    pub t_ms: u64,
-    pub action: TouchAction,
-    pub pos: Vec2,
-}
-
-/// A recorded gesture, in the output's own pixels: `<ms> down|move|up <x> <y>`
-/// a line, `#` to end of line ignored.
-///
-/// One parser for both ways of replaying a recording -- into a harness, and
-/// into a real window -- so the two cannot read the same file differently.
-pub struct TouchScript {
-    pub samples: Vec<TouchSample>,
-}
-
-impl TouchScript {
-    pub fn parse(text: &str) -> Result<Self, String> {
-        let mut samples: Vec<TouchSample> = Vec::new();
-        for (i, line) in text.lines().enumerate() {
-            let line = line.split('#').next().unwrap_or("").trim();
-            if line.is_empty() {
-                continue;
-            }
-            let at = |what: &str| format!("touch script line {}: {what}: {line:?}", i + 1);
-            let mut words = line.split_whitespace();
-            let (Some(t), Some(action), Some(x), Some(y), None) = (
-                words.next(),
-                words.next(),
-                words.next(),
-                words.next(),
-                words.next(),
-            ) else {
-                return Err(at("expected `t_ms action x y`"));
-            };
-            let t_ms: u64 = t.parse().map_err(|_| at("t_ms is not a whole number"))?;
-            let action =
-                TouchAction::parse(action).ok_or_else(|| at("action is not down/move/up"))?;
-            let x: f32 = x.parse().map_err(|_| at("x is not a number"))?;
-            let y: f32 = y.parse().map_err(|_| at("y is not a number"))?;
-            if let Some(last) = samples.last()
-                && t_ms < last.t_ms
-            {
-                return Err(at("samples must be in time order"));
-            }
-            samples.push(TouchSample {
-                t_ms,
-                action,
-                pos: Vec2::new(x, y),
-            });
-        }
-        Ok(Self { samples })
-    }
-}
-
 #[derive(Default)]
 pub struct HarnessState {
     pub root: Option<StrongWidget>,
@@ -157,20 +76,13 @@ 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);
     }
 
-    /// 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<Len>) {
-        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.
     pub fn set_root<T>(&mut self, widget: impl WidgetLike<DefaultRsc<HarnessState>, T>) {
         widget.set_root(&mut self.rsc, &mut self.state);
@@ -248,23 +160,6 @@ impl Harness {
         self.release(CursorButton::Left);
     }
 
-    /// Drives a recorded gesture through the harness.
-    pub fn replay(&mut self, script: &TouchScript) {
-        for sample in &script.samples {
-            match sample.action {
-                TouchAction::Down => {
-                    self.move_to(sample.pos);
-                    self.press(CursorButton::Left);
-                }
-                TouchAction::Move => self.move_to(sample.pos),
-                TouchAction::Up => {
-                    self.move_to(sample.pos);
-                    self.release(CursorButton::Left);
-                }
-            }
-        }
-    }
-
     fn button(&mut self, button: CursorButton) -> &mut ActivationState {
         let buttons = &mut self.cursor.buttons;
         match button {
@@ -278,56 +173,9 @@ impl Harness {
     /// window delivers input against too.
     fn sense(&mut self) {
         let cursor = self.cursor.clone();
+        let size = self.render.output_size();
         self.render
-            .run_sensors(&mut self.rsc, &mut self.state, cursor);
+            .run_sensors(&mut self.rsc, &mut self.state, cursor, size);
         self.cursor.end_frame();
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn parse(text: &str) -> Result<Vec<(u64, TouchAction, f32, f32)>, String> {
-        Ok(TouchScript::parse(text)?
-            .samples
-            .iter()
-            .map(|s| (s.t_ms, s.action, s.pos.x, s.pos.y))
-            .collect())
-    }
-
-    #[test]
-    fn a_recording_is_time_action_and_a_point() {
-        assert_eq!(
-            parse("0 down 10 20\n16 move 10.5 24\n32 up 10.5 24").unwrap(),
-            [
-                (0, TouchAction::Down, 10.0, 20.0),
-                (16, TouchAction::Move, 10.5, 24.0),
-                (32, TouchAction::Up, 10.5, 24.0),
-            ]
-        );
-    }
-
-    #[test]
-    fn blank_lines_and_comments_are_not_samples() {
-        assert_eq!(
-            parse("# a flick\n\n 0 down 1 2   # the finger lands\n\n").unwrap(),
-            [(0, TouchAction::Down, 1.0, 2.0)]
-        );
-    }
-
-    #[test]
-    fn a_recording_that_goes_backwards_is_rejected() {
-        // Replay waits out the gap between samples, so time running backwards
-        // would silently become no wait at all.
-        let err = parse("16 down 1 2\n0 up 1 2").unwrap_err();
-        assert!(err.contains("time order"), "{err}");
-    }
-
-    #[test]
-    fn a_line_that_is_not_a_sample_says_which_line() {
-        let err = parse("0 down 1 2\n16 wiggle 1 2").unwrap_err();
-        assert!(err.contains("line 2"), "{err}");
-        assert!(err.contains("down/move/up"), "{err}");
-    }
-}

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,376 +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;
-
-/// The declared lengths of one widget carrying a size rule, by axis.
-pub type Lens = [Option<Len>; 2];
-
-/// Where one widget carrying an alignment sits, by axis. `None` uses the
-/// centered default.
-pub type Aligns = [Option<AxisAlign>; 2];
-
-/// 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, Lens>,
-    /// 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, Aligns>,
-    /// 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>,
-}
-
-#[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>>,
-    /// Children a `SpanEdit` took out, held so that dropping the last share
-    /// of one does not free its id for the next widget to be given -- which
-    /// would put the two trees' `ids` out of step.
-    pub detached: Vec<StrongWidget>,
-}
-
-/// 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 mut top = UiRegion::FULL;
-        top.y.end = top.y.start.offset(Px::from_int(40));
-        let measured = painter.widget_within(&self.probe, top).len(Axis::X);
-        let px = measured.apply_leftover().to_px(painter.px_len(Axis::X));
-
-        let mut below = UiRegion::FULL;
-        below.y.start = below.y.start.offset(Px::from_int(40));
-        match px > Px::from_f32(self.threshold) {
-            true => painter.widget_within(&self.wide, below),
-            false => painter.widget_within(&self.narrow, below),
-        };
-        Size::LEFTOVER
-    }
-}
-
-pub struct Spanned {
-    pub id: WeakWidget<Span>,
-    /// Leaves grown with the span whether or not they end up in it, so both
-    /// trees make the same widgets in the same order either way. Attaching
-    /// one moves it out of here: a widget belongs to one parent, and one that
-    /// belongs to nobody still has to be held or it reads as a leak.
-    pub spares: Vec<StrongWidget>,
-    /// How many children it was grown with, before any edit.
-    pub grown: usize,
-}
-
-/// 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) {
-    let mut grow = Grow {
-        rsc,
-        rng: Rng::new(seed),
-        tree: Tree::default(),
-        edits,
-    };
-    let root = grow.node(depth);
-    (root, grow.tree)
-}
-
-struct Grow<'a, Rsc> {
-    rsc: &'a mut Rsc,
-    rng: Rng,
-    tree: Tree,
-    edits: &'a Edits,
-}
-
-impl<Rsc: UiRsc + 'static> Grow<'_, Rsc> {
-    fn leaf(&mut self) -> StrongWidget {
-        let id: StrongWidget = match self.rng.below(4) {
-            // Wrapped and unwrapped, because only one of them reads the width
-            // it is given and so only one has to be drawn again for a new one.
-            0 => wtext(WORDS).size(16).wrap(true).add_strong(self.rsc),
-            1 => wtext("one line, overflowing whatever it is given")
-                .size(16)
-                .wrap(false)
-                .add_strong(self.rsc),
-            _ => {
-                let color = COLORS[self.rng.below(COLORS.len())];
-                let alpha = (self.rng.below(5) * 63) as u8;
-                rect(color.alpha(alpha)).add_strong(self.rsc)
-            }
-        };
-        self.tree.ids.push(id.id());
-        id
-    }
-
-    fn len(&mut self) -> Option<Len> {
-        match self.rng.below(4) {
-            0 => Some(Len::px(20.0 + self.rng.below(180) as f32)),
-            1 => Some(Len::LEFTOVER),
-            _ => None,
-        }
-    }
-
-    fn align(&mut self) -> Align {
-        let mut axis = || match self.rng.below(4) {
-            0 => None,
-            1 => Some(AxisAlign::NEG),
-            2 => Some(AxisAlign::CENTER),
-            _ => Some(AxisAlign::POS),
-        };
-        let (mut x, y) = (axis(), axis());
-        // Aligning on neither axis leaves the branch unexercised.
-        if x.is_none() && y.is_none() {
-            x = Some(AxisAlign::CENTER);
-        }
-        Align { x, y }
-    }
-
-    /// A declared size over half the tree, kept where a test can change it.
-    fn sized(&mut self, inner: StrongWidget) -> StrongWidget {
-        // A rule is a property now, so a node already carrying one would take
-        // a second entry in `sized` -- and two edits naming one widget settle
-        // in the order they are applied, which is grow order cold and edit
-        // order warm. One entry per widget instead. Both draws are taken
-        // whatever is decided, and the decision is grow order alone, so the
-        // two trees consume the same random stream.
-        let take = self.rng.chance();
-        let lens = [self.len(), self.len()];
-        if !take || self.tree.sized.contains(&inner.id()) {
-            return inner;
-        }
-        let idx = self.tree.sized.len();
-        let lens = self.edits.sizes.get(&idx).copied().unwrap_or(lens);
-        let id = inner.id();
-        self.rsc
-            .ui_mut()
-            .widgets
-            .set_size_rules(id, lens[0], lens[1]);
-        self.tree.sized.push(id);
-        inner
-    }
-
-    /// An alignment over some of the tree, kept where a test can change it.
-    /// One entry per widget for the reason `sized` gives.
-    fn aligned(&mut self, inner: StrongWidget) -> StrongWidget {
-        let align = self.align();
-        let align = [align.x, align.y];
-        if self.tree.aligned.contains(&inner.id()) {
-            return inner;
-        }
-        let idx = self.tree.aligned.len();
-        let align = self.edits.aligns.get(&idx).copied().unwrap_or(align);
-        let id = inner.id();
-        let widgets = &mut self.rsc.ui_mut().widgets;
-        for (axis, align) in [Axis::X, Axis::Y].into_iter().zip(align) {
-            widgets.set_alignment(id, axis, align.unwrap_or_default());
-        }
-        self.tree.aligned.push(id);
-        inner
-    }
-
-    /// 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: StrongWidget) -> StrongWidget {
-        let take = self.rng.below(4) == 0;
-        if self.tree.nodes.contains(&inner.id()) {
-            return inner;
-        }
-        let idx = self.tree.nodes.len();
-        let take = self.edits.nodes.get(&idx).copied().unwrap_or(take);
-        let id = inner.id();
-        self.rsc.ui_mut().widgets.set_region_node(id, take);
-        self.tree.nodes.push(id);
-        inner
-    }
-
-    fn node(&mut self, depth: usize) -> StrongWidget {
-        if depth == 0 {
-            return self.leaf();
-        }
-        let positioned = self.rng.below(6);
-        if positioned == 0 {
-            // Scrolling reads the pixel length of its box, which nothing
-            // else here does, and gives its child a box longer than its own.
-            let inner = self.node(depth - 1);
-            let inner = self.sized(inner);
-            let inner = self.noded(inner);
-            let axis = if self.rng.chance() { Axis::X } else { Axis::Y };
-            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);
-        }
-        if positioned == 2 {
-            // Both sides are grown either way, so a tree that draws one has
-            // the same ids as a tree that draws the other.
-            let probe = self.node(depth - 1);
-            let wide = self.node(depth - 1);
-            let narrow = self.node(depth - 1);
-            let threshold = self.rng.below(500) as f32;
-            let id = Branch {
-                probe,
-                wide,
-                narrow,
-                threshold,
-            }
-            .add(self.rsc);
-            self.tree.ids.push(id.id());
-            return id.add_strong(self.rsc);
-        }
-        if positioned == 1 {
-            let inner = self.node(depth - 1);
-            let inner = self.sized(inner);
-            let inner = self.noded(inner);
-            return self.aligned(inner);
-        }
-        if self.rng.below(4) == 0 {
-            let inner = self.node(depth - 1);
-            let inner = self.sized(inner);
-            let inner = self.noded(inner);
-            // Each side its own, since a padding that is the same all round
-            // hides anything that treats one edge differently from another.
-            let mut side = || Px::from_int(self.rng.below(24) as i32);
-            let padding = Padding {
-                left: side(),
-                right: side(),
-                top: side(),
-                bottom: side(),
-            };
-            let id = Pad { padding, inner }.add_strong(self.rsc);
-            self.tree.ids.push(id.id());
-            return id;
-        }
-        let grown = 2 + self.rng.below(3);
-        let mut children = Vec::with_capacity(grown);
-        for _ in 0..grown {
-            let child = self.node(depth - 1);
-            let child = self.sized(child);
-            let child = self.noded(child);
-            children.push(child);
-        }
-        if self.rng.chance() {
-            let id = Stack {
-                children,
-                size: StackSize::Child(0),
-            }
-            .add_strong(self.rsc);
-            self.tree.ids.push(id.id());
-            return id;
-        }
-        // Grown either way, so the widget after them has the same id in a
-        // tree that leaves them out as in one that puts them in.
-        let mut spares: Vec<StrongWidget> = (0..SPARES).map(|_| self.leaf()).collect();
-        let idx = self.tree.spans.len();
-        let edit = self.edits.spans.get(&idx).cloned().unwrap_or_default();
-        // Highest first, so an index means the same child however many of its
-        // neighbours are going too.
-        let mut detach = edit.detach.clone();
-        detach.sort_unstable();
-        for j in detach.into_iter().rev() {
-            if j < children.len() {
-                self.tree.detached.push(children.remove(j));
-            }
-        }
-        let attach = edit.attach.min(spares.len());
-        children.extend(spares.drain(..attach));
-        let dir = [Dir::RIGHT, Dir::DOWN, Dir::LEFT, Dir::UP][self.rng.below(4)];
-        let id = Span {
-            children,
-            dir,
-            gap: Px::from_int(self.rng.below(3) as i32 * 4),
-        }
-        .add(self.rsc);
-        // A row takes the height it is given rather than its tallest child,
-        // which is a rule beside it. Derived from an existing choice and
-        // consuming no randomness: a seed must keep growing the same tree
-        // when the generator gains another configuration.
-        if dir.axis == Axis::X {
-            self.rsc
-                .widgets_mut()
-                .set_size_rules(id, None, Some(Len::rel(1.0)));
-        }
-        self.tree.ids.push(id.id());
-        self.tree.spans.push(Spanned { id, spares, grown });
-        id.add_strong(self.rsc)
-    }
-}

src/widget/image.rs

@@ -6,13 +6,16 @@ pub struct Image {
 }
 
 impl Widget for Image {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
+    fn draw(&mut self, painter: &mut Painter) {
         painter.primitive(&self.handle);
-        Size::px(self.handle.size())
     }
 
-    fn size_hint(&self, axis: Axis) -> Option<Len> {
-        Some(Len::px(self.handle.size().axis(axis)))
+    fn desired_width(&mut self, _: &mut SizeCtx) -> Len {
+        Len::abs(self.handle.size().x)
+    }
+
+    fn desired_height(&mut self, _: &mut SizeCtx) -> Len {
+        Len::abs(self.handle.size().y)
     }
 }
 

src/widget/mask.rs

@@ -5,14 +5,16 @@ pub struct Masked {
 }
 
 impl Widget for Masked {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
+    fn draw(&mut self, painter: &mut Painter) {
         painter.set_mask(painter.region());
         painter.widget(&self.inner);
-        // What it occupies is its box, on both axes, for the reason `Scroll`
-        // reports the same: it clips what is inside to that box, so it can
-        // 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 desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.width(&self.inner)
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.height(&self.inner)
     }
 }

src/widget/position/align.rs

@@ -0,0 +1,35 @@
+use crate::prelude::*;
+
+pub struct Aligned {
+    pub inner: StrongWidget,
+    pub align: Align,
+}
+
+impl Widget for Aligned {
+    fn draw(&mut self, painter: &mut Painter) {
+        let region = match self.align.tuple() {
+            (Some(x), Some(y)) => painter
+                .size(&self.inner)
+                .to_uivec2()
+                .align(RegionAlign { x, y }),
+            (Some(x), None) => {
+                let x = painter.size_ctx().width(&self.inner).apply_rest().align(x);
+                UiRegion::new(x, UiSpan::FULL)
+            }
+            (None, Some(y)) => {
+                let y = painter.size_ctx().height(&self.inner).apply_rest().align(y);
+                UiRegion::new(UiSpan::FULL, y)
+            }
+            (None, None) => UiRegion::FULL,
+        };
+        painter.widget_within(&self.inner, region);
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.width(&self.inner)
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.height(&self.inner)
+    }
+}

src/widget/position/layer.rs

@@ -6,10 +6,18 @@ pub struct LayerOffset {
 }
 
 impl Widget for LayerOffset {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
+    fn draw(&mut self, painter: &mut Painter) {
         for _ in 0..self.offset {
             painter.next_layer();
         }
-        painter.widget(&self.inner).size()
+        painter.widget(&self.inner);
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.width(&self.inner)
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.height(&self.inner)
     }
 }

src/widget/position/max_size.rs

@@ -0,0 +1,48 @@
+use crate::prelude::*;
+
+pub struct MaxSize {
+    pub inner: StrongWidget,
+    pub x: Option<Len>,
+    pub y: Option<Len>,
+}
+
+impl MaxSize {
+    fn apply_to_outer(&self, ctx: &mut SizeCtx) {
+        if let Some(x) = self.x {
+            ctx.outer.x.select_len(x.apply_rest());
+        }
+        if let Some(y) = self.y {
+            ctx.outer.y.select_len(y.apply_rest());
+        }
+    }
+}
+
+impl Widget for MaxSize {
+    fn draw(&mut self, painter: &mut Painter) {
+        painter.widget(&self.inner);
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        self.apply_to_outer(ctx);
+        let width = ctx.width(&self.inner);
+        if let Some(x) = self.x {
+            let width_px = width.apply_rest().to_abs(ctx.output_size().x);
+            let x_px = x.apply_rest().to_abs(ctx.output_size().x);
+            if width_px > x_px { x } else { width }
+        } else {
+            width
+        }
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        self.apply_to_outer(ctx);
+        let height = ctx.height(&self.inner);
+        if let Some(y) = self.y {
+            let height_px = height.apply_rest().to_abs(ctx.output_size().y);
+            let y_px = y.apply_rest().to_abs(ctx.output_size().y);
+            if height_px > y_px { y } else { height }
+        } else {
+            height
+        }
+    }
+}

src/widget/position/mod.rs

@@ -1,13 +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,8 +6,16 @@ pub struct Offset {
 }
 
 impl Widget for Offset {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
+    fn draw(&mut self, painter: &mut Painter) {
         let region = UiRegion::FULL.offset(self.amt);
-        painter.widget_within(&self.inner, region).size()
+        painter.widget_within(&self.inner, region);
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.width(&self.inner)
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.height(&self.inner)
     }
 }

src/widget/position/pad.rs

@@ -6,40 +6,48 @@ pub struct Pad {
 }
 
 impl Widget for Pad {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        let inner = painter
-            .widget_aligned(&self.inner, self.padding.region(), RegionAlign::NEAR)
-            .size();
-        Size {
-            x: Len {
-                px: inner.x.px + self.padding.left + self.padding.right,
-                ..inner.x
-            },
-            y: Len {
-                px: inner.y.px + self.padding.top + self.padding.bottom,
-                ..inner.y
-            },
+    fn draw(&mut self, painter: &mut Painter) {
+        painter.widget_within(&self.inner, self.padding.region());
     }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        let width = self.padding.left + self.padding.right;
+        let height = self.padding.top + self.padding.bottom;
+        ctx.outer.x.abs -= width;
+        ctx.outer.y.abs -= height;
+        let mut size = ctx.width(&self.inner);
+        size.abs += width;
+        size
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        let width = self.padding.left + self.padding.right;
+        let height = self.padding.top + self.padding.bottom;
+        ctx.outer.x.abs -= width;
+        ctx.outer.y.abs -= height;
+        let mut size = ctx.height(&self.inner);
+        size.abs += height;
+        size
     }
 }
 
 pub struct Padding {
-    pub left: Px,
-    pub right: Px,
-    pub top: Px,
-    pub bottom: Px,
+    pub left: f32,
+    pub right: f32,
+    pub top: f32,
+    pub bottom: f32,
 }
 
 impl Padding {
     pub const ZERO: Self = Self {
-        left: Px::ZERO,
-        right: Px::ZERO,
-        top: Px::ZERO,
-        bottom: Px::ZERO,
+        left: 0.0,
+        right: 0.0,
+        top: 0.0,
+        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,
@@ -49,76 +57,78 @@ impl Padding {
     }
     pub fn region(&self) -> UiRegion {
         let mut region = UiRegion::FULL;
-        region.x.start.px += self.left;
-        region.y.start.px += self.top;
-        region.x.end.px -= self.right;
-        region.y.end.px -= self.bottom;
+        region.x.start.abs += self.left;
+        region.y.start.abs += self.top;
+        region.x.end.abs -= self.right;
+        region.y.end.abs -= self.bottom;
         region
     }
     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,72 +3,40 @@ use crate::prelude::*;
 pub struct Scroll {
     inner: StrongWidget,
     axis: Axis,
-    amt: Px,
+    amt: f32,
     snap_end: bool,
-    container_len: Px,
-    content_len: Px,
+    container_len: f32,
+    content_len: f32,
 }
 
 impl Widget for Scroll {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        let container_len = painter.px_len(self.axis);
-        // Draw in the whole container only when its scrolling-axis length is
-        // not already known, then draw it at the scrolled offset.
-        let answer_len = match painter.known_len(&self.inner, self.axis, UiRegion::FULL) {
-            Some(len) => len,
-            None => painter.widget(&self.inner).size().axis(self.axis),
-        };
-        let content = answer_len.apply_leftover();
-        self.container_len = container_len;
-        self.content_len = content.to_px(container_len);
+    fn draw(&mut self, painter: &mut Painter) {
+        let output_len = painter.output_size().axis(self.axis);
+        let container_len = painter.region().axis(self.axis).len();
+        let content_len = painter
+            .len_axis(&self.inner, self.axis)
+            .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();
-        let align = painter.alignment().axis(self.axis);
-        // Content of a fixed length that fits sits at the start of any box it
-        // fits in -- but only anchored there. Anywhere else it is a part of
-        // the room left over, so it moves with every length the box takes and
-        // the drawing holds for that length alone. One scrolled part way sits
-        // where it is until the box shrinks past what is left of it. Kept to
-        // the end, it moves with every length.
-        let fixed_len = content.rel == Rel::ZERO;
-        if fixed_len && self.content_len <= self.container_len && align == AxisAlign::NEG {
-            painter.holds(self.axis, self.content_len..=Px::MAX);
-        } else if fixed_len && !self.snap_end {
-            let left = self.content_len - self.amt;
-            painter.holds(self.axis, Px::MIN..=left);
+
+        let mut region = UiRegion::FULL.offset(Vec2::from_axis(self.axis, -self.amt, 0.0));
+        region.axis_mut(self.axis).end = region.axis(self.axis).start.offset(self.content_len);
+        painter.widget_within(&self.inner, region);
     }
 
-        // Content shorter than the viewport has room to sit in, and where it
-        // sits is this widget's own alignment -- the same property that would
-        // have placed the whole scroll in a box longer than it.
-        let slack = (self.container_len - self.content_len).max(Px::ZERO);
-        let anchor = slack.mul(align.rel());
-        let mut region = UiRegion::FULL;
-        // Content that fills the viewport and has not been scrolled is the
-        // viewport, and is handed back as it came. Writing the same box as
-        // its own length in pixels is the same box in another form, and the
-        // two do 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 moved = anchor != Px::ZERO || self.amt != Px::ZERO;
-        if moved || self.content_len != self.container_len {
-            let offset = UiVec2::from_axis(
-                self.axis,
-                UiScalar::from_parts(Rel::ZERO, anchor - self.amt),
-                UiScalar::ZERO,
-            );
-            region = region.offset(offset);
-            region.axis_mut(self.axis).end = region.axis(self.axis).start.offset(self.content_len);
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.width(&self.inner)
     }
-        painter.widget_aligned(&self.inner, region, RegionAlign::NEAR);
-        // 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 desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.height(&self.inner)
     }
 }
 
@@ -77,24 +45,22 @@ impl Scroll {
         Self {
             inner,
             axis,
-            amt: Px::ZERO,
+            amt: 0.0,
             snap_end: true,
-            container_len: Px::ZERO,
-            content_len: Px::ZERO,
+            container_len: 0.0,
+            content_len: 0.0,
         }
     }
 
     pub fn update_amt(&mut self) {
-        self.amt = self.amt.max(Px::ZERO);
-        let len = (self.content_len - self.container_len).max(Px::ZERO);
+        self.amt = self.amt.max(0.0);
+        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,34 @@
+use crate::prelude::*;
+
+pub struct SetSize {
+    pub inner: StrongWidget,
+    pub x: Option<Len>,
+    pub y: Option<Len>,
+}
+
+impl SetSize {
+    fn apply_to_outer(&self, ctx: &mut SizeCtx) {
+        if let Some(x) = self.x {
+            ctx.outer.x.select_len(x.apply_rest());
+        }
+        if let Some(y) = self.y {
+            ctx.outer.y.select_len(y.apply_rest());
+        }
+    }
+}
+
+impl Widget for SetSize {
+    fn draw(&mut self, painter: &mut Painter) {
+        painter.widget(&self.inner);
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        self.apply_to_outer(ctx);
+        self.x.unwrap_or_else(|| ctx.width(&self.inner))
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        self.apply_to_outer(ctx);
+        self.y.unwrap_or_else(|| ctx.height(&self.inner))
+    }
+}

src/widget/position/span.rs

@@ -4,160 +4,48 @@ 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 draw(&mut self, painter: &mut Painter) -> Size {
-        let axis = self.dir.axis;
-        // A length for every child before their final boxes are chosen: from
-        // a hint where one exists, and from drawing otherwise.
-        let mut cursor = UiScalar::rel_min();
-        let mut lens = Vec::with_capacity(self.children.len());
-        for child in &self.children {
-            let mut span = UiSpan::new(cursor, UiScalar::rel_max());
-            if self.dir.sign == Sign::Neg {
-                span.flip();
-            }
-            let region = UiRegion::from_axis(axis, span, UiSpan::FULL);
-            let len = match painter.known_len(child, axis, region) {
-                Some(len) => len,
-                None => painter.widget_within(child, region).len(axis),
-            };
-            cursor.px += len.px + self.gap;
-            cursor.rel += len.rel;
-            lens.push(len);
-        }
-
-        let gaps = self
-            .gap
-            .mul_int(self.children.len().saturating_sub(1) as i32);
-        let total = lens.iter().fold(
-            Len {
-                px: gaps,
-                ..Len::ZERO
-            },
-            |sum, len| sum + *len,
-        );
-
-        // Whether anything is left over is a question in pixels: `rel(0.5)`
-        // beside 300 px is full at 600 and overfull at 400. The room to
-        // divide is `len * fixed - total.px`, and the length where it runs
-        // out is exactly the box a parent sizing itself from this answer
-        // hands back -- which is why this used to need a margin either side
-        // of the boundary, and why it does not now: that box and this sum are
-        // whole counts of the same step, and both routes to it land on the
-        // same count. What the generated oracle checks is the consequence,
-        // since which children exist at all turns on this.
-        let fixed = Rel::ONE - total.rel;
-        let mut shares = false;
-        if total.leftover > Weight::ZERO {
-            let current = painter.px_len(axis);
-            let holds = if fixed > Rel::ZERO {
-                // The box length the fixed parts alone fill.
-                let full = total.px.div(fixed);
-                shares = current > full;
-                match shares {
-                    true => Holds::from(full.next_up()..=Px::MAX),
-                    false => Holds::from(Px::MIN..=full),
-                }
-            } else if fixed < Rel::ZERO {
-                // The relative parts grow faster than the box does, so here
-                // a shorter box is the one that leaves room.
-                let full = total.px.div(fixed);
-                shares = current < full;
-                match shares {
-                    true => Holds::from(Px::MIN..=full.next_down()),
-                    false => Holds::from(full..=Px::MAX),
-                }
-            } else {
-                // The relative parts take exactly the box, whatever it is, so
-                // the only room is what negative pixels leave.
-                shares = total.px < Px::ZERO;
-                Holds::ANY
-            };
-            painter.holds(axis, holds);
-        }
-
-        // Across itself a span is as long as its longest child -- unless a
-        // rule beside it already says how long it is, and then reading them
-        // answers nothing and makes its size depend on theirs for it.
-        let shrinks = !painter.ruled(!axis);
-        // What the fixed parts and the gaps before here take, which is a sum
-        // of lengths and exact, and how much of the leftover weight is
-        // spoken for. A position is one from the other rather than a step
-        // from the last child: the share of the room is rounded, and taking
-        // each from the one before it would carry every rounding along the
-        // row.
-        let mut fixed = UiScalar::rel_min();
-        let mut taken = Weight::ZERO;
-        let room = UiScalar::rel_max() - UiScalar::from_parts(total.rel, total.px);
+    fn draw(&mut self, painter: &mut Painter) {
+        let total = self.len_sum(&mut painter.size_ctx());
         let mut start = UiScalar::rel_min();
-        let mut ortho = Len::ZERO;
-        for (child, len) in self.children.iter().zip(&lens) {
-            // A child asking for nothing but a part of what is left over,
-            // when nothing is, is not drawn at all. One that also asked for
-            // pixels or a fraction keeps those and overflows.
-            if len.leftover > Weight::ZERO && len.px == Px::ZERO && len.rel == Rel::ZERO && !shares
-            {
-                painter.undraw(child);
-                fixed.px += self.gap;
-                continue;
-            }
+        for child in &self.children {
             let mut span = UiSpan::FULL;
             span.start = start;
-            if len.leftover > Weight::ZERO && shares {
-                taken += len.leftover;
+            let len = painter.len_axis(child, self.dir.axis);
+            if len.rest > 0.0 {
+                let offset = UiScalar::new(total.rel, total.abs);
+                let rel_end = UiScalar::rel(len.rest / total.rest);
+                let end = (UiScalar::rel_max() + start) - offset;
+                start = rel_end.within(&start.to(end));
             }
-            fixed.px += len.px;
-            fixed.rel += len.rel;
-            start = shared(fixed, taken, total.leftover, room);
+            start.abs += len.abs;
+            start.rel += len.rel;
             span.end = start;
-            let mut region = UiRegion::from_axis(axis, span, UiSpan::FULL);
+            let mut child_region = UiRegion::from_axis(self.dir.axis, span, UiSpan::FULL);
             if self.dir.sign == Sign::Neg {
-                region.flip(axis);
+                child_region.flip(self.dir.axis);
             }
-            let placed = painter.widget_within(child, region);
-            if shrinks {
-                let used = placed.len(!axis);
-                // Choosing between a fixed and a relative length from the
-                // span's own eventual width admits multiple fixed points.
-                // A scalable child therefore makes Children scalable too;
-                // only fixed children are compared with one another.
-                if used.rel != Rel::ZERO || used.leftover != Weight::ZERO {
-                    ortho = Len::LEFTOVER;
-                } else if ortho.leftover == Weight::ZERO {
-                    ortho.px = ortho.px.max(used.px);
+            painter.widget_within(child, child_region);
+            start.abs += self.gap;
         }
     }
-            fixed.px += self.gap;
-            start = shared(fixed, taken, total.leftover, room);
-        }
 
-        // Carried whole rather than collapsed to one share: a span that sizes
-        // from its children does not resolve `leftover`, it passes the weight up,
-        // so nesting spans divides the same space rather than re-dividing a
-        // share of it. Four `leftover(1)` children under two spans under one span
-        // get a quarter each, which collapsing to `leftover(1)` per level does
-        // not give. Resolution happens at the nearest ancestor with a length,
-        // and the root always has one.
-        let along = total;
-        let ortho = match shrinks {
-            true => ortho,
-            false => Len::rel(1.0),
-        };
-        Size::from_axis(axis, along, ortho)
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        match self.dir.axis {
+            Axis::X => self.desired_len(ctx),
+            Axis::Y => self.desired_ortho(ctx),
+        }
     }
-}
 
-/// Where a row has reached: everything fixed before this point, which is a
-/// sum and exact, plus the share of the room the weights so far are worth,
-/// which is one rounding wherever it is asked for.
-fn shared(fixed: UiScalar, taken: Weight, weight: Weight, room: UiScalar) -> UiScalar {
-    if taken == Weight::ZERO {
-        return fixed;
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        match self.dir.axis {
+            Axis::X => self.desired_ortho(ctx),
+            Axis::Y => self.desired_len(ctx),
+        }
     }
-    fixed + room.scale(Rel::ratio(taken, weight))
 }
 
 impl Span {
@@ -165,12 +53,12 @@ impl Span {
         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
     }
 
@@ -181,12 +69,93 @@ impl Span {
     pub fn pop(&mut self) -> Option<StrongWidget> {
         self.children.pop()
     }
+
+    fn len_sum(&mut self, ctx: &mut SizeCtx) -> Len {
+        let gap = self.gap * self.children.len().saturating_sub(1) as f32;
+        self.children.iter().fold(Len::abs(gap), |mut s, id| {
+            // it's tempting to subtract the abs & rel from the ctx outer,
+            // but that would create inconsistent sizing if you put
+            // a rest first vs last & only speed up in one direction.
+            // I think this is only solvable by restricting how you can
+            // compute size, bc currently you need child to define parent's
+            // sectioning and you need parent's sectioning to define child.
+            // Fortunately, that doesn't matter in most cases
+            let len = ctx.len_axis(id, self.dir.axis);
+            s += len;
+            s
+        })
+    }
+
+    fn desired_len(&mut self, ctx: &mut SizeCtx) -> Len {
+        let len = self.len_sum(ctx);
+        if len.rest == 0.0 && len.rel == 0.0 {
+            len
+        } else {
+            Len::default()
+        }
+    }
+
+    fn desired_ortho(&mut self, ctx: &mut SizeCtx) -> Len {
+        // this is a weird hack to get text wrapping to work properly when in a downward span
+        // the correct solution here is to add a function to widget that lets them
+        // request that ctx.outer has an axis "resolved" before checking the other,
+        // and panicking or warning if two request opposite axis (unsolvable in that case)
+        let outer = ctx.outer.axis(self.dir.axis);
+        if self.dir.axis == Axis::X {
+            // so....... this literally copies draw so that the lengths are correctly set in the
+            // context, which makes this slow and not cool
+            let total = self.len_sum(ctx);
+            let mut start = UiScalar::rel_min();
+            let mut ortho_len = Len::ZERO;
+            for child in &self.children {
+                let mut span = UiSpan::FULL;
+                span.start = start;
+                let len = ctx.len_axis(child, self.dir.axis);
+                if len.rest > 0.0 {
+                    let offset = UiScalar::new(total.rel, total.abs);
+                    let rel_end = UiScalar::rel(len.rest / total.rest);
+                    let end = (UiScalar::rel_max() + start) - offset;
+                    start = rel_end.within(&start.to(end));
+                }
+                start.abs += len.abs;
+                start.rel += len.rel;
+                span.end = start;
+
+                let scalar = span.len();
+                *ctx.outer.axis_mut(self.dir.axis) = outer.select_len(scalar);
+                let ortho = ctx.len_axis(child, !self.dir.axis);
+                // TODO: rel shouldn't do this, but no easy way before actually calculating pixels
+                if ortho.rel > 0.0 || ortho.rest > 0.0 {
+                    ortho_len.rest = 1.0;
+                    ortho_len.abs = 0.0;
+                    break;
+                }
+                ortho_len.abs = ortho_len.abs.max(ortho.abs);
+                start.abs += self.gap;
+            }
+            ortho_len
+        } else {
+            let mut ortho_len = Len::ZERO;
+            let ortho = !self.dir.axis;
+            for child in &self.children {
+                let len = ctx.len_axis(child, ortho);
+                // TODO: rel shouldn't do this, but no easy way before actually calculating pixels
+                if len.rel > 0.0 || len.rest > 0.0 {
+                    ortho_len.rest = 1.0;
+                    ortho_len.abs = 0.0;
+                    break;
+                }
+                ortho_len.abs = ortho_len.abs.max(len.abs);
+            }
+            ortho_len
+        }
+    }
 }
 
 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)>,
 }
 
@@ -212,13 +181,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,30 +8,30 @@ pub struct Stack {
 }
 
 impl Widget for Stack {
-    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 decides the box every child gets.
-        // The stack reports that size, so a child given a longer box would
-        // draw outside what the stack says it occupies.
-        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(child).size()
+    fn draw(&mut self, painter: &mut Painter) {
+        let mut iter = self.children.iter();
+        if let Some(child) = iter.next() {
+            painter.child_layer();
+            painter.widget(child);
         }
-            None => Size::LEFTOVER,
-        };
-        let region = painter.box_of(size);
-        for (i, child) in self.children.iter().enumerate() {
-            painter.child_layer_at(i);
-            painter.widget_aligned(child, region, RegionAlign::NEAR);
+        for child in iter {
+            painter.next_layer();
+            painter.widget(child);
+        }
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        match self.size {
+            StackSize::Default => Len::default(),
+            StackSize::Child(i) => ctx.width(&self.children[i]),
+        }
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        match self.size {
+            StackSize::Default => Len::default(),
+            StackSize::Child(i) => ctx.height(&self.children[i]),
         }
-        size
     }
 }
 

src/widget/ptr.rs

@@ -6,10 +6,25 @@ pub struct WidgetPtr {
 }
 
 impl Widget for WidgetPtr {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        match &self.inner {
-            Some(id) => painter.widget(id).size(),
-            None => Size::default(),
+    fn draw(&mut self, painter: &mut Painter) {
+        if let Some(id) = &self.inner {
+            painter.widget(id);
+        }
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        if let Some(id) = &self.inner {
+            ctx.width(id)
+        } else {
+            Len::ZERO
+        }
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        if let Some(id) = &self.inner {
+            ctx.height(id)
+        } else {
+            Len::ZERO
         }
     }
 }

src/widget/rect.rs

@@ -28,18 +28,21 @@ impl Rect {
 }
 
 impl Widget for Rect {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
+    fn draw(&mut self, painter: &mut Painter) {
         painter.primitive(RectPrimitive {
             color: self.color,
             radius: self.radius,
             thickness: self.thickness,
             inner_radius: self.inner_radius,
         });
-        Size::LEFTOVER
     }
 
-    fn size_hint(&self, _: Axis) -> Option<Len> {
-        Some(Len::LEFTOVER)
+    fn desired_width(&mut self, _: &mut SizeCtx) -> Len {
+        Len::rest(1)
+    }
+
+    fn desired_height(&mut self, _: &mut SizeCtx) -> Len {
+        Len::rest(1)
     }
 }
 

src/widget/text/edit.rs

@@ -55,43 +55,44 @@ impl TextEdit {
 }
 
 impl Widget for TextEdit {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
+    fn draw(&mut self, painter: &mut Painter) {
         let base = painter.layer;
         painter.child_layer();
-        let (_, size) = self.view.draw(painter);
+        self.view.draw(painter);
         painter.layer = base;
         let region = self.region();
 
         let Some(selection) = self.selection else {
-            return size;
+            return;
         };
         let layout = self.view.buf.layout();
 
         // parley reports selection as boxes in layout space, so bidi and
         // wrapped lines come out right without this code knowing about either.
         for (rect, _) in selection.geometry(layout) {
-            let rect_size = vec2(rect.width() as f32, rect.height() as f32);
+            let size = vec2(rect.width() as f32, rect.height() as f32);
             let top_left = vec2(rect.x0 as f32, rect.y0 as f32);
             painter.primitive_within(
                 RectPrimitive::color(Color::SKY),
-                rect_size
-                    .align(Align::TOP_LEFT)
-                    .offset(top_left)
-                    .within(&region),
+                size.align(Align::TOP_LEFT).offset(top_left).within(&region),
             );
         }
 
         let caret = selection.focus().geometry(layout, CARET_WIDTH);
-        let caret_size = vec2(caret.width() as f32, caret.height() as f32);
+        let size = vec2(caret.width() as f32, caret.height() as f32);
         let top_left = vec2(caret.x0 as f32, caret.y0 as f32);
         painter.primitive_within(
             RectPrimitive::color(Color::WHITE),
-            caret_size
-                .align(Align::TOP_LEFT)
-                .offset(top_left)
-                .within(&region),
+            size.align(Align::TOP_LEFT).offset(top_left).within(&region),
         );
-        size
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        self.view.desired_width(ctx)
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        self.view.desired_height(ctx)
     }
 }
 
@@ -126,6 +127,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 +174,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 +187,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 +265,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 +281,7 @@ impl<'a> TextEditCtx<'a> {
     }
 
     pub fn select(&mut self, pos: Vec2, size: Vec2, drag: bool, recent: bool) {
-        let pos = pos
-            - self
-                .text
-                .region()
-                .top_left()
-                .to_px(PxVec2::from_f32(size))
-                .to_f32();
+        let pos = pos - self.text.region().top_left().to_abs(size);
         let prev_sel = self.text.selection;
         let prev_hit = self.text.double_hit;
 

src/widget/text/mod.rs

@@ -14,8 +14,11 @@ pub struct Text {
 }
 
 pub struct TextView {
-    pub attrs: TextAttrs,
-    pub buf: TextBuffer,
+    pub attrs: MutDetect<TextAttrs>,
+    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,45 +52,56 @@ 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));
-        // The shaper measures in floats, which is where a glyph advance comes
-        // from; what it answers goes back on the grid.
-        let text = painter.render_text(&mut self.buf, &self.attrs, width.map(Px::to_f32));
-        // A greedy break is the same break at every width from its longest
-        // line up to the one it was made at: each line still fits, and none
-        // could take a word that did not fit in the wider box. A line too
-        // long to fit at all says nothing about narrower boxes.
-        if let Some(width) = width {
-            painter.holds(Axis::X, Px::from_f32(text.size.x).min(width)..=width);
+    fn render(&mut self, ctx: &mut SizeCtx) -> &RenderedText {
+        let width = if self.attrs.wrap {
+            Some(ctx.px_size().x)
+        } else {
+            None
+        };
+        if width != self.width || self.tex.is_none() || self.attrs.changed || self.buf.changed {
+            self.width = width;
+            self.tex = Some(ctx.draw_text(&mut self.buf, &self.attrs, width));
+            self.attrs.changed = false;
+            self.buf.changed = false;
         }
-        text
+        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) {
+    pub fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        if self.is_empty()
+            && let Some(hint) = &self.hint
+        {
+            ctx.width(hint)
+        } else {
+            Len::abs(self.render(ctx).size.x)
+        }
+    }
+    pub fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        if self.is_empty()
+            && let Some(hint) = &self.hint
+        {
+            ctx.height(hint)
+        } else {
+            Len::abs(self.render(ctx).size.y)
+        }
+    }
+    pub fn draw(&mut self, painter: &mut Painter) -> UiRegion {
         let align = self.align;
         if self.is_empty() && self.hint.is_some() {
-            let region = self.render(painter).size.align(align);
-            let size = match &self.hint {
-                Some(hint) => painter.widget(hint).size(),
-                None => Size::ZERO,
-            };
-            return (region, size);
+            let region = self.render(&mut painter.size_ctx()).size.align(align);
+            if let Some(hint) = &self.hint {
+                painter.widget(hint);
+            }
+            return region;
         }
 
-        let tex = self.render(painter);
+        let tex = self.render(&mut painter.size_ctx());
         let region = tex.size.align(align);
-        let size = Size::px(tex.size);
         let within = region.within(&painter.region());
         painter.glyphs(tex, within);
-        (region, size)
+        region
     }
 
     pub fn content(&self) -> String {
@@ -97,7 +117,7 @@ impl Text {
             content: content.into(),
         }
     }
-    fn update_buf(&mut self) {
+    fn update_buf(&mut self, _ctx: &mut SizeCtx) {
         if self.content.changed {
             self.content.changed = false;
             self.view.buf.set_text(self.content.as_str());
@@ -106,9 +126,19 @@ impl Text {
 }
 
 impl Widget for Text {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        self.update_buf();
-        self.view.draw(painter).1
+    fn draw(&mut self, painter: &mut Painter) {
+        self.update_buf(&mut painter.size_ctx());
+        self.view.draw(painter);
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        self.update_buf(ctx);
+        self.view.desired_width(ctx)
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        self.update_buf(ctx);
+        self.view.desired_height(ctx)
     }
 }
 

src/widget/trait_fns.rs

@@ -12,23 +12,14 @@ widget_trait! {
         }
     }
 
-    fn align(self, align: impl Into<Align>) -> impl WidgetIdFn<Rsc, WL::Widget> {
-        // An axis left out keeps whatever it had, which is centered unless
-        // something else set it.
-        let align = align.into();
-        move |state| {
-            let id = self.add(state);
-            let widgets = &mut state.ui_mut().widgets;
-            for (axis, align) in [(Axis::X, align.x), (Axis::Y, align.y)] {
-                if let Some(align) = align {
-                    widgets.set_alignment(id, axis, align);
-                }
-            }
-            id
+    fn align(self, align: impl Into<Align>) -> impl WidgetFn<Rsc, Aligned> {
+        move |state| Aligned {
+            inner: self.add_strong(state),
+            align: align.into(),
         }
     }
 
-    fn center(self) -> impl WidgetIdFn<Rsc, WL::Widget> {
+    fn center(self) -> impl WidgetFn<Rsc, Aligned> {
         self.align(Align::CENTER)
     }
 
@@ -40,46 +31,48 @@ widget_trait! {
         }
     }
 
-    fn region_node(self) -> impl WidgetIdFn<Rsc, WL::Widget> {
-        |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> {
+    fn sized(self, size: impl Into<Size>) -> impl WidgetFn<Rsc, SetSize> {
         let size = size.into();
-        move |state| {
-            let id = self.add(state);
-            let widgets = &mut state.ui_mut().widgets;
-            widgets.set_size_rule(id, Axis::X, SizeRule::Exact(size.x));
-            widgets.set_size_rule(id, Axis::Y, SizeRule::Exact(size.y));
-            id
+        move |state| SetSize {
+            inner: self.add_strong(state),
+            x: Some(size.x),
+            y: Some(size.y),
         }
     }
 
-    fn width(self, len: impl Into<Len>) -> impl WidgetIdFn<Rsc, WL::Widget> {
+    fn max_width(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, MaxSize> {
         let len = len.into();
-        move |state| {
-            let id = self.add(state);
-            state
-                .ui_mut()
-                .widgets
-                .set_size_rule(id, Axis::X, SizeRule::Exact(len));
-            id
+        move |state| MaxSize {
+            inner: self.add_strong(state),
+            x: Some(len),
+            y: None,
         }
     }
 
-    fn height(self, len: impl Into<Len>) -> impl WidgetIdFn<Rsc, WL::Widget> {
+    fn max_height(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, MaxSize> {
         let len = len.into();
-        move |state| {
-            let id = self.add(state);
-            state
-                .ui_mut()
-                .widgets
-                .set_size_rule(id, Axis::Y, SizeRule::Exact(len));
-            id
+        move |state| MaxSize {
+            inner: self.add_strong(state),
+            x: None,
+            y: Some(len),
+        }
+    }
+
+    fn width(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, SetSize> {
+        let len = len.into();
+        move |state| SetSize {
+            inner: self.add_strong(state),
+            x: Some(len),
+            y: None,
+        }
+    }
+
+    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),
         }
     }
 
@@ -92,9 +85,7 @@ widget_trait! {
 
     fn scrollable(self) -> impl WidgetIdFn<Rsc, Scroll> where Rsc: HasEvents {
         move |state| {
-            let inner = self.add(state);
-            state.ui_mut().widgets.set_region_node(inner, true);
-            Scroll::new(inner.upgrade(state), Axis::Y)
+            Scroll::new(self.add_strong(state), Axis::Y)
                 .on(CursorSense::Scroll, |ctx, rsc| {
                     let delta = ctx.data.scroll_delta.y * 50.0;
                     ctx.widget(rsc).scroll(delta);

tests/cases/determinism.rs

@@ -1,101 +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 mut top = UiRegion::FULL;
-        top.y.end = top.y.start.offset(Px::from_int(40));
-        let measured = painter.widget_within(&self.probe, top).len(Axis::X);
-        let px = measured.apply_leftover().to_px(painter.px_len(Axis::X));
-
-        let mut below = UiRegion::FULL;
-        below.y.start = below.y.start.offset(Px::from_int(40));
-        match px > Px::from_f32(self.threshold) {
-            true => painter.widget_within(&self.wide, below),
-            false => painter.widget_within(&self.narrow, below),
-        };
-        Size::LEFTOVER
-    }
-}
-
-fn 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().get_dyn_mut(wide);
-            h.rsc.widgets_mut().get_dyn_mut(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().get_dyn_mut(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().get_dyn_mut(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/layout.rs

@@ -1,482 +0,0 @@
-//! 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 a_span_ruled_across_itself_does_not_measure_its_children_there() {
-    let mut h = Harness::new((400, 200));
-    let child = rect(Color::RED).height(40).add(&mut h.rsc);
-    let span = (child,).span(Dir::RIGHT).height(rel(1.0)).add(&mut h.rsc);
-    h.set_root(span);
-
-    assert_eq!(h.render.active[&span.id()].size.y, Len::rel(1.0));
-}
-
-#[test]
-fn a_span_reports_its_tallest_fixed_child() {
-    let mut h = Harness::new((400, 200));
-    let short = rect(Color::RED).height(40).add(&mut h.rsc);
-    let tall = rect(Color::BLUE).height(70).add(&mut h.rsc);
-    let span = (short, tall).span(Dir::RIGHT).add(&mut h.rsc);
-    h.set_root(span);
-
-    assert_eq!(h.render.active[&span.id()].size.y, Len::px(70.0));
-}
-
-#[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));
-    // The span measures a child and then places it; listing it twice would
-    // move it twice. The span's own fixed total is shorter than the window,
-    // so the span is centred in it and everything under it carries that.
-    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, (150, 0), (350, 200));
-
-    h.set_len(left, Axis::X, 150);
-    h.frame();
-
-    assert_corners!(h, inner, (175, 0), (375, 200));
-}
-
-#[test]
-fn alignment_accepts_an_arbitrary_fraction_and_changes_at_runtime() {
-    let mut h = Harness::new((400, 200));
-    let fixed = rect(Color::BLUE).sized((100, 100)).add(&mut h.rsc);
-    h.rsc
-        .widgets_mut()
-        .set_alignment(fixed, Axis::X, AxisAlign::new(0.25));
-    h.rsc
-        .widgets_mut()
-        .set_alignment(fixed, Axis::Y, AxisAlign::NEG);
-    h.set_root(fixed);
-    assert_corners!(h, fixed, (75, 0), (175, 100));
-
-    h.rsc
-        .widgets_mut()
-        .set_alignment(fixed, Axis::X, AxisAlign::new(0.75));
-    h.frame();
-    assert_corners!(h, fixed, (225, 0), (325, 100));
-}
-
-#[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 first asked in
-    // the whole box and then given 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.set_len(leaf, Axis::Y, 250);
-    h.frame();
-
-    assert_corners!(h, panel, (0, 0), (400, 250));
-}
-
-#[test]
-fn a_moved_subtree_takes_its_children_with_it() {
-    let mut h = Harness::new((400, 400));
-    let first = rect(Color::RED).height(40).add(&mut h.rsc);
-    let inner = rect(Color::BLUE).add(&mut h.rsc);
-    let row = inner.pad(10).height(40).region_node().add(&mut h.rsc);
-    // 80 of fixed rows in a 400 window, so the span takes 80 and sits in the
-    // middle of what it was given.
-    h.set_root((first, row).span(Dir::DOWN));
-    assert_corners!(h, inner, (10, 210), (390, 230));
-
-    h.set_len(first, Axis::Y, 80);
-    h.frame();
-
-    // The row opted into one movable region, so its descendants follow one
-    // entry rather than having their primitive regions rewritten.
-    assert_corners!(h, inner, (10, 230), (390, 250));
-}
-
-#[test]
-fn a_fixed_length_child_keeps_it_when_the_box_around_it_grows() {
-    let mut h = Harness::new((400, 200));
-    let fixed = rect(Color::BLUE).width(50).add(&mut h.rsc);
-    let leftover = rect(Color::GREEN).add(&mut h.rsc);
-    let panel = (fixed, leftover).span(Dir::RIGHT).add(&mut h.rsc);
-    // Changing the bar's width is the only thing that changes the box the
-    // panel and everything under it was drawn for.
-    let bar = rect(Color::RED).width(100).add(&mut h.rsc);
-    h.set_root((bar, panel).span(Dir::RIGHT));
-    assert_corners!(h, fixed, (100, 0), (150, 200));
-    assert_corners!(h, leftover, (150, 0), (400, 200));
-
-    h.set_len(bar, Axis::X, 200);
-    h.frame();
-
-    // The panel's box is 100 shorter, so the fixed child is the same 50 wide
-    // against its new start and the one taking what is left absorbs the change.
-    assert_corners!(h, fixed, (200, 0), (250, 200));
-    assert_corners!(h, leftover, (250, 0), (400, 200));
-}
-
-#[test]
-fn a_box_with_a_fixed_length_can_be_stretched_on_its_other_axis() {
-    let mut h = Harness::new((400, 200));
-    // The row is 40 tall whatever happens, which used to make its drawing
-    // impossible to take out of: recovering a fraction of a box needs a
-    // relative extent, and it has none on that axis.
-    let inner = rect(Color::BLUE).add(&mut h.rsc);
-    let row = inner.pad(10).height(40).add(&mut h.rsc);
-    let filler = rect(Color::GREEN).add(&mut h.rsc);
-    // This column is an item in a row, so it takes the width left for it
-    // rather than asking for a full row-width in addition to the bar.
-    let column = (row, filler).span(Dir::DOWN).add(&mut h.rsc);
-    let bar = rect(Color::RED).width(100).add(&mut h.rsc);
-    h.set_root((bar, column).span(Dir::RIGHT));
-    assert_corners!(h, inner, (110, 10), (390, 30));
-
-    h.set_len(bar, Axis::X, 200);
-    h.frame();
-
-    assert_corners!(h, inner, (210, 10), (390, 30));
-}
-
-#[test]
-fn only_a_region_node_lengthens_the_chain_and_it_can_be_removed() {
-    let mut h = Harness::new((400, 200));
-    let leaf = rect(Color::BLUE).add(&mut h.rsc);
-    let buried = leaf.pad(4).pad(4).pad(4).pad(4).add(&mut h.rsc);
-    let bar = rect(Color::RED).width(100).add(&mut h.rsc);
-    h.set_root((bar, buried).span(Dir::RIGHT));
-
-    let move_idx = h.render.active[&leaf.id()].parent_move;
-    assert_eq!(h.render.moves.depth(move_idx), 1, "only the root region");
-
-    h.rsc.widgets_mut().set_region_node(buried, true);
-    h.frame();
-    let move_idx = h.render.active[&leaf.id()].parent_move;
-    assert_eq!(
-        h.render.moves.depth(move_idx),
-        2,
-        "the opted-in widget's region and the root region"
-    );
-
-    h.rsc.widgets_mut().set_region_node(buried, false);
-    h.frame();
-    let move_idx = h.render.active[&leaf.id()].parent_move;
-    assert_eq!(h.render.moves.depth(move_idx), 1);
-}
-
-/// A span that sizes from its children passes their `leftover` weight up
-/// than collapsing it to one share, so nesting divides the same space instead
-/// of re-dividing a share of it.
-#[test]
-fn nested_spans_divide_the_space_once_however_deep_the_nesting_is() {
-    let mut h = Harness::new((400, 200));
-    let (a, b, c, d) = (
-        rect(Color::RED).add(&mut h.rsc),
-        rect(Color::BLUE).add(&mut h.rsc),
-        rect(Color::GREEN).add(&mut h.rsc),
-        rect(Color::WHITE).add(&mut h.rsc),
-    );
-    let left = (a, b).span(Dir::RIGHT).add(&mut h.rsc);
-    let right = (c, d).span(Dir::RIGHT).add(&mut h.rsc);
-    h.set_root((left, right).span(Dir::RIGHT));
-
-    for (i, id) in [a, b, c, d].into_iter().enumerate() {
-        let x = i as f32 * 100.0;
-        assert_corners!(h, id, (x, 0), (x + 100.0, 200));
-    }
-}
-
-/// The same space, unevenly nested: weights carried up mean a share is a
-/// share of the whole, not of whatever branch a widget happens to sit in.
-#[test]
-fn an_uneven_nesting_still_gives_every_share_the_same_length() {
-    let mut h = Harness::new((400, 200));
-    let (a, b, c, d) = (
-        rect(Color::RED).add(&mut h.rsc),
-        rect(Color::BLUE).add(&mut h.rsc),
-        rect(Color::GREEN).add(&mut h.rsc),
-        rect(Color::WHITE).add(&mut h.rsc),
-    );
-    let one = (a,).span(Dir::RIGHT).add(&mut h.rsc);
-    let three = (b, c, d).span(Dir::RIGHT).add(&mut h.rsc);
-    h.set_root((one, three).span(Dir::RIGHT));
-
-    for (i, id) in [a, b, c, d].into_iter().enumerate() {
-        let x = i as f32 * 100.0;
-        assert_corners!(h, id, (x, 0), (x + 100.0, 200));
-    }
-}
-
-/// However many ways a row is divided, the shares add up to the row: each
-/// one is the fixed parts before it plus a share of the room, rather than a
-/// step from where the last one ended, so the roundings do not accumulate
-/// along it. Chained, two hundred of them ended a step short of the edge.
-#[test]
-fn a_row_of_equal_shares_fills_it_exactly() {
-    for n in [2usize, 3, 7, 64, 200] {
-        let mut h = Harness::new((1000, 100));
-        let mut ids = Vec::new();
-        let mut kids: Vec<StrongWidget> = Vec::new();
-        for _ in 0..n {
-            let kid = rect(Color::RED).add(&mut h.rsc);
-            ids.push(kid.id());
-            kids.push(kid.add_strong(&mut h.rsc));
-        }
-        let span = Span {
-            children: kids,
-            dir: Dir::RIGHT,
-            gap: Px::ZERO,
-        }
-        .add(&mut h.rsc);
-        h.set_root(span);
-        h.frame();
-
-        for (i, id) in ids.iter().enumerate() {
-            let at = h.region(id).expect("a share drew nothing").top_left.x;
-            let want = Px::from_f32(1000.0 * (i as f32) / (n as f32));
-            assert!(
-                (at - want).abs() <= Px::STEP,
-                "{n} shares: the {i}th starts at {at:?}, not {want:?}"
-            );
-        }
-        let end = h.region(ids.last().unwrap()).unwrap().bot_right.x;
-        assert_eq!(end, Px::from_int(1000), "{n} shares do not reach the edge");
-    }
-}
-
-/// Where the shader puts an edge: the two parts of a scalar are floored
-/// apart, so a fraction and a pixel offset snap independently, and each is
-/// taken to the boundary it composes to within half a step of. Kept in step
-/// with `snap_floor` in `prelude.wgsl`.
-fn drawn_edges(h: &Harness, id: WidgetId, axis: Axis) -> (f32, f32) {
-    let active = &h.render.active[&id];
-    let region = h.render.moves.resolve(active.parent_move, active.region);
-    let dim = h.size().axis(axis);
-    let snap = |v: f32| (v + Px::STEP.to_f32() * 0.5).floor();
-    let edge = |s: UiScalar| snap(s.rel.to_f32() * dim) + snap(s.px.to_f32());
-    let span = region.axis(axis);
-    (edge(span.start), edge(span.end))
-}
-
-fn hairline(h: &mut Harness, marks: &mut Vec<WidgetId>) -> StrongWidget {
-    let mark = rect(Color::RED).width(1).add_strong(&mut h.rsc);
-    marks.push(mark.id());
-    mark
-}
-
-fn share(h: &mut Harness, inner: StrongWidget, ratio: f32) -> StrongWidget {
-    h.set_len(&inner, Axis::X, Len::leftover(ratio));
-    inner
-}
-
-/// Shares in weights no binary fraction lands on, a padding on one branch
-/// and not the other, so an edge falls near an integer as often as it can.
-fn hairlines(h: &mut Harness, depth: usize, marks: &mut Vec<WidgetId>) -> StrongWidget {
-    let mut span = Span::empty(Dir::RIGHT);
-    if depth == 0 {
-        let left = rect(Color::BLUE).add_strong(&mut h.rsc);
-        let left = share(h, left, 3.0);
-        span.push(left);
-        let mark = hairline(h, marks);
-        span.push(mark);
-        let right = rect(Color::BLUE).add_strong(&mut h.rsc);
-        let right = share(h, right, 7.0);
-        span.push(right);
-        return span.add_strong(&mut h.rsc);
-    }
-    let first = hairlines(h, depth - 1, marks);
-    let first = share(h, first, 3.0);
-    span.push(first);
-    let second = hairlines(h, depth - 1, marks);
-    let second = Pad {
-        padding: Padding {
-            left: Px::from_int(3),
-            right: Px::from_int(7),
-            top: Px::ZERO,
-            bottom: Px::ZERO,
-        },
-        inner: second,
-    }
-    .add_strong(&mut h.rsc);
-    let second = share(h, second, 5.0);
-    span.push(second);
-    span.add_strong(&mut h.rsc)
-}
-
-/// A one-pixel line is a pixel wherever it is drawn. Both edges of a fixed
-/// length share their box's fraction, so composing the chain moves them
-/// together and the shader's `floor` cannot round the pixel between them
-/// away -- only shift it. A separator that disappeared at one window size
-/// would be a defect no size comparison catches.
-#[test]
-fn a_one_pixel_line_keeps_its_pixel_through_a_chain() {
-    let mut h = Harness::new((1920, 1200));
-    let mut marks = Vec::new();
-    let root = hairlines(&mut h, 4, &mut marks);
-    h.state.set_root(root);
-    h.frame();
-    assert_eq!(marks.len(), 16);
-
-    for size in [(1920, 1200), (1919, 1201), (997, 1003), (1367, 733)] {
-        h.resize(size);
-        h.frame();
-        for mark in &marks {
-            let (start, end) = drawn_edges(&h, *mark, Axis::X);
-            assert_eq!(end - start, 1.0, "at {size:?}, mark {mark:?}");
-        }
-    }
-}
-
-/// A span short of room takes it from its shares, which go to nothing and
-/// then to nothing wider; the fixed lengths between them keep their pixels.
-/// Collapsing those to make room would delete a separator the caller asked
-/// for, which is worse than overflowing.
-#[test]
-fn a_span_out_of_room_shrinks_its_shares_and_not_its_fixed_lengths() {
-    let mut h = Harness::new((400, 20));
-    let mut marks = Vec::new();
-    let mut span = Span::empty(Dir::RIGHT);
-    for _ in 0..3 {
-        let share_of = rect(Color::BLUE).add_strong(&mut h.rsc);
-        let share_of = share(&mut h, share_of, 1.0);
-        span.push(share_of);
-        let mark = hairline(&mut h, &mut marks);
-        span.push(mark);
-    }
-    let root = span.add_strong(&mut h.rsc);
-    h.state.set_root(root);
-    h.frame();
-
-    for width in [400, 10, 3, 1] {
-        h.resize((width, 20));
-        h.frame();
-        for mark in &marks {
-            let (start, end) = drawn_edges(&h, *mark, Axis::X);
-            assert_eq!(end - start, 1.0, "at {width} wide, mark {mark:?}");
-        }
-    }
-}
-
-#[test]
-fn only_a_pure_leftover_child_disappears_when_nothing_is_left() {
-    let mut h = Harness::new((100, 20));
-    let fixed = rect(Color::RED).width(100).add(&mut h.rsc);
-    let leftover = rect(Color::BLUE).add(&mut h.rsc);
-    h.set_root((fixed, leftover).span(Dir::RIGHT));
-
-    assert_corners!(h, fixed, (0, 0), (100, 20));
-    assert_eq!(h.region(&leftover), None);
-
-    // An undrawn child remains a dependency of the span, so making room for
-    // it draws it without rebuilding the tree.
-    h.set_len(fixed, Axis::X, 60);
-    h.frame();
-    assert_corners!(h, leftover, (60, 0), (100, 20));
-
-    let mut h = Harness::new((100, 20));
-    let fixed = rect(Color::RED).width(100).add(&mut h.rsc);
-    let mixed = rect(Color::BLUE)
-        .width(Len::px(20) + Len::LEFTOVER)
-        .add(&mut h.rsc);
-    h.set_root((fixed, mixed).span(Dir::RIGHT));
-
-    // Pixels and fractions still overflow; only a child whose entire length
-    // is leftover is omitted.
-    assert_corners!(h, mixed, (100, 0), (120, 20));
-}
-
-#[test]
-fn leftover_children_disappear_at_the_exact_fixed_content_boundary() {
-    let mut h = Harness::new((100, 100));
-    let first = rect(Color::RED).height(90).add(&mut h.rsc);
-    let a = rect(Color::GREEN).add(&mut h.rsc);
-    let b = rect(Color::BLUE).add(&mut h.rsc);
-    let inner = (a, b).span(Dir::DOWN).gap(4).add(&mut h.rsc);
-    h.set_root((first, inner).span(Dir::DOWN));
-    assert!(h.region(&a).is_some());
-    assert!(h.region(&b).is_some());
-
-    h.set_len(first, Axis::Y, 96.0);
-    h.frame();
-
-    assert!(h.region(&a).is_none());
-    assert!(h.region(&b).is_none());
-}

tests/cases/pointer_routing.rs

@@ -1,225 +0,0 @@
-//! Input across layers: what stops at a layer, what passes through it, and
-//! where hovering stops.
-
-use std::{cell::RefCell, rc::Rc};
-
-use iris::harness::Harness;
-use iris::prelude::*;
-
-const WINDOW: f32 = 100.0;
-
-/// Every sense that has fired on one widget since it was last read.
-#[derive(Default, Clone)]
-struct Fired(Rc<RefCell<Vec<CursorSense>>>);
-
-impl Fired {
-    fn take(&self) -> Vec<CursorSense> {
-        std::mem::take(&mut self.0.borrow_mut())
-    }
-}
-
-/// A widget filling whatever it is given, recording the senses it is sent.
-fn listener(h: &mut Harness, senses: impl Into<CursorSenses>) -> (WeakWidget<Rect>, Fired) {
-    let fired = Fired::default();
-    let record = fired.clone();
-    let id = rect(Color::WHITE)
-        .on(senses.into(), move |ctx, _| {
-            record.0.borrow_mut().push(ctx.data.sense)
-        })
-        .add(&mut h.rsc);
-    (id, fired)
-}
-
-/// A widget with no senses of its own, to leave a gap beside one that has.
-fn blank(h: &mut Harness) -> WeakWidget<Rect> {
-    rect(Color::WHITE).add(&mut h.rsc)
-}
-
-fn harness() -> Harness {
-    Harness::new((WINDOW, WINDOW))
-}
-
-#[test]
-fn hover_stops_at_the_topmost_widget() {
-    let mut h = harness();
-    let (bottom, bottom_hover) = listener(&mut h, CursorSense::HoverStart);
-    let (middle, middle_hover) = listener(&mut h, CursorSense::HoverStart);
-    let (top, top_hover) = listener(&mut h, CursorSense::HoverStart);
-    h.set_root((bottom, middle, top).stack());
-
-    h.move_to((50, 50));
-
-    assert_eq!(top_hover.take(), [CursorSense::HoverStart]);
-    assert_eq!(
-        middle_hover.take(),
-        [],
-        "hover is not shared with a layer below"
-    );
-    assert_eq!(bottom_hover.take(), []);
-}
-
-#[test]
-fn a_scroll_passes_through_every_widget_that_does_not_want_it() {
-    let mut h = harness();
-    let (list, scrolled) = listener(&mut h, CursorSense::Scroll);
-    let (button, clicked) = listener(&mut h, CursorSense::click());
-    let (overlay, overlay_clicked) = listener(&mut h, CursorSense::click());
-    h.set_root((list, button, overlay).stack());
-
-    h.move_to((50, 50));
-    h.scroll((0, 10));
-
-    assert_eq!(
-        scrolled.take(),
-        [CursorSense::Scroll],
-        "two layers of click-only widgets do not stop a scroll"
-    );
-    assert_eq!(clicked.take(), []);
-    assert_eq!(overlay_clicked.take(), []);
-}
-
-#[test]
-fn hovering_a_button_above_does_not_stop_a_later_scroll() {
-    let mut h = harness();
-    let (list, scrolled) = listener(&mut h, CursorSense::Scroll);
-    let (button, _clicked) = listener(&mut h, CursorSense::click());
-    h.set_root((list, button).stack());
-
-    // The hover arrives in its own frame, as a window delivers it.
-    h.move_to((50, 50));
-    assert_eq!(scrolled.take(), []);
-
-    h.scroll((0, 10));
-    assert_eq!(
-        scrolled.take(),
-        [CursorSense::Scroll],
-        "a hover already resting on the button must not consume the wheel"
-    );
-}
-
-#[test]
-fn only_the_topmost_listener_takes_a_press() {
-    let mut h = harness();
-    let (below, below_clicked) = listener(&mut h, CursorSense::click());
-    let (above, above_clicked) = listener(&mut h, CursorSense::click());
-    h.set_root((below, above).stack());
-
-    h.click((50, 50));
-
-    assert_eq!(above_clicked.take(), [CursorSense::click()]);
-    assert_eq!(below_clicked.take(), [], "one press goes to one widget");
-}
-
-#[test]
-fn a_press_beside_the_button_reaches_the_layer_below() {
-    let mut h = harness();
-    let (list, list_clicked) = listener(&mut h, CursorSense::click());
-    // The row above the list covers it, but only its left half is the button.
-    let (button, button_clicked) = listener(&mut h, CursorSense::click());
-    let row = (button, blank(&mut h)).span(Dir::RIGHT).add(&mut h.rsc);
-    h.set_root((list, row).stack());
-
-    h.click((20, 50));
-    assert_eq!(button_clicked.take(), [CursorSense::click()]);
-    assert_eq!(list_clicked.take(), []);
-
-    h.click((80, 50));
-    assert_eq!(button_clicked.take(), [], "the cursor is not on the button");
-    assert_eq!(
-        list_clicked.take(),
-        [CursorSense::click()],
-        "a press beside the button belongs to what is under it"
-    );
-}
-
-#[test]
-fn leaving_a_widget_still_ends_its_hover() {
-    let mut h = harness();
-    let (widget, hover) = listener(&mut h, CursorSense::HoverStart | CursorSense::HoverEnd);
-    h.set_root(widget);
-
-    h.move_to((50, 50));
-    assert_eq!(hover.take(), [CursorSense::HoverStart]);
-
-    h.leave();
-    assert_eq!(hover.take(), [CursorSense::HoverEnd]);
-}
-
-#[test]
-fn leaving_a_widget_does_not_block_the_layer_below() {
-    let mut h = harness();
-    let (below, below_hover) = listener(&mut h, CursorSense::HoverStart);
-    // Only the left half of the layer above is a widget, so the cursor can
-    // leave it without leaving the one underneath.
-    let (above, above_hover) = listener(&mut h, CursorSense::HoverStart | CursorSense::HoverEnd);
-    let row = (above, blank(&mut h)).span(Dir::RIGHT).add(&mut h.rsc);
-    h.set_root((below, row).stack());
-
-    h.move_to((20, 50));
-    assert_eq!(above_hover.take(), [CursorSense::HoverStart]);
-    assert_eq!(below_hover.take(), [], "the layer above is over it");
-
-    h.move_to((80, 50));
-    assert_eq!(above_hover.take(), [CursorSense::HoverEnd]);
-    assert_eq!(
-        below_hover.take(),
-        [CursorSense::HoverStart],
-        "ending a hover above must not stop the hover below"
-    );
-}
-
-#[test]
-fn covering_a_widget_ends_its_hover() {
-    let mut h = harness();
-    let (below, below_hover) = listener(&mut h, CursorSense::HoverStart | CursorSense::HoverEnd);
-    let (above, above_hover) = listener(&mut h, CursorSense::HoverStart);
-    let row = (above, blank(&mut h)).span(Dir::RIGHT).add(&mut h.rsc);
-    h.set_root((below, row).stack());
-
-    h.move_to((80, 50));
-    assert_eq!(below_hover.take(), [CursorSense::HoverStart]);
-
-    h.move_to((20, 50));
-    assert_eq!(above_hover.take(), [CursorSense::HoverStart]);
-    assert_eq!(
-        below_hover.take(),
-        [CursorSense::HoverEnd],
-        "a widget covered by one that took the input is no longer hovered"
-    );
-
-    h.move_to((80, 50));
-    assert_eq!(
-        below_hover.take(),
-        [CursorSense::HoverStart],
-        "uncovering it hovers it again"
-    );
-}
-
-#[test]
-fn hover_starts_and_ends_once_each() {
-    let mut h = harness();
-    // Only the left half is the widget, so the cursor can leave it without
-    // leaving the window.
-    let (widget, hover) = listener(&mut h, CursorSense::HoverStart | CursorSense::HoverEnd);
-    let row = (widget, blank(&mut h)).span(Dir::RIGHT).add(&mut h.rsc);
-    h.set_root(row);
-
-    h.move_to((20, 50));
-    assert_eq!(hover.take(), [CursorSense::HoverStart]);
-
-    h.move_to((30, 50));
-    assert_eq!(hover.take(), [], "staying inside is not a second start");
-
-    h.move_to((80, 50));
-    assert_eq!(hover.take(), [CursorSense::HoverEnd]);
-
-    h.move_to((90, 50));
-    assert_eq!(hover.take(), [], "an ended hover does not end again");
-
-    h.move_to((20, 50));
-    assert_eq!(
-        hover.take(),
-        [CursorSense::HoverStart],
-        "re-entering starts it"
-    );
-}

tests/cases/retained.rs

@@ -1,618 +0,0 @@
-//! 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. One that reads its box in
-/// pixels has a drawing that holds for that box alone.
-struct Counted {
-    draws: Rc<Cell<usize>>,
-    size: Size,
-    reads_box: bool,
-}
-
-impl Widget for Counted {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        self.draws.set(self.draws.get() + 1);
-        if self.reads_box {
-            painter.px_size();
-        }
-        self.size
-    }
-}
-
-struct Counts(Rc<Cell<usize>>);
-
-impl Counts {
-    fn get(&self) -> usize {
-        self.0.get()
-    }
-}
-
-fn counted(h: &mut Harness, size: Size, reads_box: bool) -> (WeakWidget<Counted>, Counts) {
-    let draws = Rc::new(Cell::new(0));
-    let id = Counted {
-        draws: draws.clone(),
-        size,
-        reads_box,
-    }
-    .add(&mut h.rsc);
-    (id, Counts(draws))
-}
-
-struct Layered {
-    children: [StrongWidget<Rect>; 2],
-    _revision: usize,
-}
-
-impl Widget for Layered {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter.child_layer();
-        painter.widget(&self.children[0]);
-        painter.next_layer();
-        painter.widget(&self.children[1]);
-        Size::default()
-    }
-}
-
-#[test]
-fn a_redrawn_layered_widget_keeps_the_layer_it_was_entered_on() {
-    let mut h = Harness::new((400, 200));
-    let children = [
-        rect(Color::RED).add_strong(&mut h.rsc),
-        rect(Color::BLUE).add_strong(&mut h.rsc),
-    ];
-    let root = Layered {
-        children,
-        _revision: 0,
-    }
-    .add(&mut h.rsc);
-    h.set_root(root);
-
-    h.rsc[root]._revision += 1;
-    h.frame();
-
-    let label = h.rsc.widgets().label(root.id());
-    let active = h
-        .render
-        .debug(h.rsc.widgets(), label)
-        .find(|active| active.id == root.id())
-        .unwrap();
-    assert_eq!(active.layer, 0);
-}
-
-/// A fixed-width leaf beside one that takes what is left over, so changing
-/// the first hands the second a different box without the output changing.
-fn pair(h: &mut Harness, reads_box: bool) -> (WeakWidget<Counted>, Counts, WidgetId) {
-    let (first, _) = counted(h, Size::from((100, 200)), false);
-    let (second, draws) = counted(h, Size::LEFTOVER, reads_box);
-    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, false);
-    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 moving_an_ordinary_subtree_remaps_its_mask() {
-    let mut h = Harness::new((400, 200));
-    let (first, _) = counted(&mut h, Size::from((100, 200)), false);
-    let inner = rect(Color::BLUE).add(&mut h.rsc);
-    let masked = inner.masked().add(&mut h.rsc);
-    h.set_root((first, masked).span(Dir::RIGHT));
-
-    h.rsc[first].size = Size::from((150, 200));
-    h.frame();
-
-    let active = &h.render.active[&masked.id()];
-    assert_eq!(
-        h.rsc.ui().masks[active.mask.idx()].region,
-        UiRegion::new(
-            UiSpan::new(UiScalar::px(150.0), UiScalar::rel_max()),
-            UiSpan::FULL,
-        )
-    );
-    assert_corners!(h, inner, (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, true);
-    let settled = draws.get();
-
-    h.rsc[first].size = Size::from((150, 200));
-    h.frame();
-
-    // The preceding fixed child makes the remaining box this child's real
-    // box, so measuring it also draws it in its final box.
-    assert_eq!(draws.get(), settled + 1);
-    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)), false);
-    let (asked, asked_draws) = counted(&mut h, Size::from((100, 200)), true);
-    // 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 its final box.
-    let hinted = told.width(100).add(&mut h.rsc);
-    h.set_root((hinted, asked).span(Dir::RIGHT));
-
-    assert_eq!(told_draws.get(), 1);
-    // Reading its box makes its drawing hold for the measuring box alone,
-    // and it reports less than that box: so it is drawn again in the box its
-    // answer places it in, and once more in the final box the span chooses.
-    // A widget that says what it holds for, as text does, skips the middle
-    // one.
-    assert_eq!(
-        asked_draws.get(),
-        3,
-        "drawn to be measured, in its placed box, then in its final box"
-    );
-}
-
-#[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, false);
-
-    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_repaint_that_keeps_its_size_does_not_relay_out() {
-    let mut h = Harness::new((400, 200));
-    let (first, draws) = counted(&mut h, Size::from((100, 200)), false);
-    let (second, _) = counted(&mut h, Size::LEFTOVER, false);
-    h.set_root((first, second).span(Dir::RIGHT));
-    let settled = draws.get();
-
-    // Taking mutable access is the ordinary content-change signal. This
-    // widget returns the same size, so the parent has nothing to lay out.
-    let _ = h.rsc.widgets_mut().get_dyn_mut(first.id());
-    h.frame();
-
-    assert_eq!(draws.get(), settled + 1);
-}
-
-#[test]
-fn a_span_child_survives_the_next_frame() {
-    let mut h = Harness::new((400, 200));
-    // Both children declare a length, so the span chooses their boxes from
-    // 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.px);
-        painter.widget_within(&self.inner, region);
-        Size::LEFTOVER
-    }
-}
-
-#[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.set_len(inner, Axis::Y, 120);
-    h.frame();
-
-    assert_corners!(h, inner, (0, 0), (400, 120));
-}
-
-/// Reads its box's size, which nothing but its own draw can put right.
-struct ReadsBox {
-    draws: Rc<Cell<usize>>,
-}
-
-impl Widget for ReadsBox {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        self.draws.set(self.draws.get() + 1);
-        Size::from_px(painter.px_size().div_int(4))
-    }
-}
-
-/// Reads its box across one axis only, so its drawing holds for a taller
-/// box on its own and only a wider one is worth a draw.
-///
-/// Both of these report a quarter of what they read, without saying that the
-/// drawing holds there too, so each length they are asked at costs two draws:
-/// one to answer, and one in the quarter-sized box that answer places them
-/// in. The counts below are in those pairs.
-struct ReadsWidth {
-    draws: Rc<Cell<usize>>,
-}
-
-impl Widget for ReadsWidth {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        self.draws.set(self.draws.get() + 1);
-        Size::from_px(PxVec2::new(
-            painter.px_len(Axis::X).div_int(4),
-            Px::from_int(20),
-        ))
-    }
-}
-
-#[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::LEFTOVER, false);
-    h.set_root(leaf);
-    let settled = draws.get();
-
-    h.resize((800, 100));
-    assert!(h.needs_redraw());
-    h.frame();
-
-    assert_eq!(
-        draws.get(),
-        settled,
-        "a scaling drawing follows its box, and the output is one"
-    );
-    assert_corners!(h, leaf, (0, 0), (800, 100));
-}
-
-#[test]
-fn a_span_ruled_across_itself_moves_its_child_without_redrawing_it() {
-    let mut h = Harness::new((400, 200));
-    let (leaf, draws) = counted(&mut h, Size::LEFTOVER, false);
-    let span = (leaf,).span(Dir::RIGHT).height(rel(1.0)).add(&mut h.rsc);
-    h.set_root(span);
-    let settled = draws.get();
-
-    h.resize((400, 100));
-    h.frame();
-
-    assert_eq!(draws.get(), settled);
-    assert_corners!(h, leaf, (0, 0), (400, 100));
-    assert_eq!(h.render.active[&span.id()].size.y, Len::rel(1.0));
-}
-
-/// The output is the root of the box chain, so a resize is a box that changed
-/// length like any other -- there is not a second rule for the window. A
-/// drawing that holds for one length is drawn again whichever box moved.
-#[test]
-fn a_resize_redraws_what_does_not_scale() {
-    let mut h = Harness::new((400, 200));
-    let (leaf, draws) = counted(&mut h, Size::LEFTOVER, true);
-    h.set_root(leaf);
-    let settled = draws.get();
-
-    h.resize((800, 100));
-    h.frame();
-
-    assert_eq!(draws.get(), settled + 1, "its box is a different length");
-    assert_corners!(h, leaf, (0, 0), (800, 100));
-}
-
-#[test]
-fn a_resize_redraws_what_read_its_box() {
-    let mut h = Harness::new((400, 200));
-    let draws = Rc::new(Cell::new(0));
-    let leaf = ReadsBox {
-        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 + 2);
-}
-
-#[test]
-fn a_resize_only_redraws_read_axes() {
-    let mut h = Harness::new((400, 200));
-    let draws = Rc::new(Cell::new(0));
-    let leaf = ReadsWidth {
-        draws: draws.clone(),
-    }
-    .add(&mut h.rsc);
-    h.set_root(leaf);
-    let settled = draws.get();
-
-    h.resize((400, 300));
-    h.frame();
-    assert_eq!(draws.get(), settled, "height was never read");
-
-    h.resize((800, 300));
-    h.frame();
-    assert_eq!(draws.get(), settled + 2, "width changes its answer");
-}
-
-/// A window is measured onto the grid like everything else, so a resize too
-/// small to reach the next step is not a resize at all -- and one that does
-/// reach it is, however little of a pixel it is worth.
-#[test]
-fn a_resize_within_one_step_is_not_a_resize() {
-    let mut h = Harness::new((400, 200));
-    let draws = Rc::new(Cell::new(0));
-    let leaf = ReadsWidth {
-        draws: draws.clone(),
-    }
-    .add(&mut h.rsc);
-    h.set_root(leaf);
-    let settled = draws.get();
-
-    // All of these are 400 px to the nearest step.
-    let step = Px::STEP.to_f32();
-    for part in [0.1, 0.2, 0.3] {
-        h.resize((400.0 + step * part, 200.0));
-        h.frame();
-        assert_eq!(draws.get(), settled);
-    }
-
-    h.resize((400.0 + step, 200.0));
-    h.frame();
-    assert_eq!(draws.get(), settled + 2);
-}
-
-/// The same for a box that changes because a sibling did: what is compared
-/// is the length on the grid, and three lengths that land on one step are
-/// one length.
-#[test]
-fn a_box_change_within_one_step_is_not_a_change() {
-    let mut h = Harness::new((400, 200));
-    let (first, draws, _) = pair(&mut h, true);
-    let settled = draws.get();
-
-    let step = Px::STEP.to_f32();
-    for part in [0.1, 0.2, 0.3] {
-        h.rsc[first].size.x = Len::px(100.0 + step * part);
-        h.frame();
-        assert_eq!(draws.get(), settled);
-    }
-
-    h.rsc[first].size.x = Len::px(100.0 + step);
-    h.frame();
-    assert_eq!(draws.get(), settled + 1);
-}
-
-#[test]
-fn reporting_the_same_output_size_does_not_start_a_resize() {
-    let mut h = Harness::new((400, 200));
-    let draws = Rc::new(Cell::new(0));
-    let leaf = ReadsBox {
-        draws: draws.clone(),
-    }
-    .add(&mut h.rsc);
-    h.set_root(leaf);
-    let settled = draws.get();
-
-    h.resize((400, 200));
-
-    assert!(!h.needs_redraw());
-    h.frame();
-    assert_eq!(draws.get(), settled);
-}
-
-#[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::px((100, 100).into()), true);
-    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::px((100, 200).into());
-    h.frame();
-
-    assert_corners!(h, below, (12, 232), (388, 388));
-}
-
-/// Reads nothing of its box, so its drawing holds for any length, and has a
-/// child so that whatever asks about the subtree has one to reach.
-struct Stretchy {
-    inner: StrongWidget,
-    draws: Rc<Cell<usize>>,
-}
-
-impl Widget for Stretchy {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        self.draws.set(self.draws.get() + 1);
-        painter.widget(&self.inner).size()
-    }
-}
-
-#[test]
-fn stretching_a_subtree_carries_the_children_in_it() {
-    let mut h = Harness::new((400, 400));
-    let first = rect(Color::RED).height(40).add(&mut h.rsc);
-    let inner = rect(Color::BLUE).add(&mut h.rsc);
-    let draws = Rc::new(Cell::new(0));
-    let outer = Stretchy {
-        inner: inner.add_strong(&mut h.rsc),
-        draws: draws.clone(),
-    }
-    .add(&mut h.rsc);
-    h.set_root((first, outer).span(Dir::DOWN));
-    let settled = draws.get();
-    assert_corners!(h, inner, (0, 40), (400, 400));
-
-    h.set_len(first, Axis::Y, 80);
-    h.frame();
-
-    assert_eq!(
-        draws.get(),
-        settled,
-        "its drawing follows its box, rather than being made again"
-    );
-    assert_corners!(h, outer, (0, 80), (400, 400));
-    assert_corners!(h, inner, (0, 80), (400, 400));
-}
-
-#[test]
-fn a_widened_row_redraws_what_reads_its_length_and_nothing_else() {
-    let mut h = Harness::new((400, 200));
-    // What a transcript row is: something whose shaping depends on the width
-    // it is given, beside something that only has to be the right shape.
-    let (wraps, wrap_draws) = counted(&mut h, Size::LEFTOVER, true);
-    let (backing, back_draws) = counted(&mut h, Size::LEFTOVER, false);
-    let row = (backing, wraps).span(Dir::RIGHT).add(&mut h.rsc);
-    let bar = rect(Color::RED).width(100).add(&mut h.rsc);
-    h.set_root((bar, row).span(Dir::RIGHT));
-    let (settled_wrap, settled_back) = (wrap_draws.get(), back_draws.get());
-
-    h.set_len(bar, Axis::X, 200);
-    h.frame();
-
-    // The span reads every child's size, so redrawing one takes the span
-    // with it -- and the span then measures and places the redrawn child.
-    assert!(wrap_draws.get() > settled_wrap, "reads the width it got");
-    assert_eq!(back_draws.get(), settled_back, "only has to be the shape");
-    assert_corners!(h, backing, (200, 0), (300, 200));
-    assert_corners!(h, wraps, (300, 0), (400, 200));
-}
-
-#[test]
-fn a_declared_length_child_is_not_redrawn_when_the_box_around_it_grows() {
-    let mut h = Harness::new((400, 200));
-    // Its box is a fixed 80 wherever the row's edges end up, so drawing it
-    // again would be for a width it does not have. The declared width is what
-    // lets the span say that without drawing it: a width the span learnt by
-    // drawing the child in its own box is only an answer for that box.
-    let (counter, draws) = counted(&mut h, Size::from((80, 200)), true);
-    let fixed = counter.width(80).add(&mut h.rsc);
-    let (leftover, _) = counted(&mut h, Size::LEFTOVER, false);
-    let row = (fixed, leftover).span(Dir::RIGHT).add(&mut h.rsc);
-    let bar = rect(Color::RED).width(100).add(&mut h.rsc);
-    h.set_root((bar, row).span(Dir::RIGHT));
-    let settled = draws.get();
-
-    h.set_len(bar, Axis::X, 200);
-    h.frame();
-
-    assert_eq!(draws.get(), settled, "its own length did not change");
-    assert_corners!(h, fixed, (200, 0), (280, 200));
-}
-
-/// A retained drawing belongs to the layer it was made on: asked for again
-/// on another one it has to be drawn there, since nothing about its geometry
-/// says it is in a list that paints at a different moment.
-#[test]
-fn a_widget_asked_again_on_another_layer_is_drawn_there() {
-    /// Draws its child on its own layer, then again one layer in -- which is
-    /// what a container measuring a child by drawing it used to do.
-    struct Twice(StrongWidget);
-
-    impl Widget for Twice {
-        fn draw(&mut self, painter: &mut Painter) -> Size {
-            let size = painter.widget(&self.0).size();
-            painter.child_layer();
-            painter.widget(&self.0);
-            size
-        }
-    }
-
-    let mut h = Harness::new((400, 200));
-    let (front, draws) = counted(&mut h, Size::from((100, 50)), false);
-    let outer = Twice(front.add_strong(&mut h.rsc)).add(&mut h.rsc);
-    h.set_root(outer);
-    h.frame();
-
-    assert_ne!(
-        h.render.active[&front.id()].layer,
-        h.render.active[&outer.id()].layer,
-        "the first drawing was kept, on the layer it was measured on"
-    );
-    assert_eq!(draws.get(), 2, "the second ask could not reuse the first");
-}
-
-/// Which is why `Stack` measures the child that sizes it on the layer that
-/// child draws on: one drawing, above the background it stacks over, rather
-/// than one on each layer and the wrong one kept.
-#[test]
-fn a_stacks_sizing_child_is_drawn_once_where_it_belongs() {
-    let mut h = Harness::new((400, 200));
-    let background = rect(Color::RED).add(&mut h.rsc);
-    let (front, draws) = counted(&mut h, Size::from((100, 50)), false);
-    let stack = Stack {
-        children: vec![
-            background.add_strong(&mut h.rsc),
-            front.add_strong(&mut h.rsc),
-        ],
-        size: StackSize::Child(1),
-    }
-    .add(&mut h.rsc);
-    h.set_root(stack);
-    h.frame();
-
-    let layer = |id| h.render.active[&id].layer;
-    assert_ne!(layer(front.id()), layer(stack.id()));
-    assert_ne!(layer(front.id()), layer(background.id()));
-    assert_eq!(draws.get(), 1);
-}

tests/cases/scroll.rs

@@ -1,84 +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));
-}
-
-/// 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(painter.region());
-            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);
-    h.set_root(clipper);
-    h.frame();
-}

tests/cases/unsettled.rs

@@ -1,400 +0,0 @@
-//! The smallest trees that laid out differently warm than cold, each shrunk
-//! by `tests/shrink.rs` from hundreds of widgets. The first two are a cold
-//! frame that had not settled: a wrapping text shaped at a width it was
-//! measured in rather than the one it was given. The rest are a widget
-//! measured again in a box its own answer had decided, where the old answer
-//! is a fixed point whatever the content now says. The last is neither: one
-//! box length, composed two ways, landing either side of the boundary that
-//! decided whether a child was drawn at all.
-
-use iris::harness::Harness;
-use iris::prelude::*;
-
-/// Six widgets, shrunk from a 402-widget tree the fuzzer found. Nothing about
-/// the tree changes -- every widget is marked for redraw and the frame is
-/// taken again -- so no box may move, and a warm frame has to land where a
-/// cold one does.
-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).add(&mut h.rsc);
-    let sized = wrapped.width(76).add(&mut h.rsc);
-    let aligned = sized;
-    h.rsc
-        .widgets_mut()
-        .set_alignment(sized, Axis::X, AxisAlign::POS);
-    h.rsc
-        .widgets_mut()
-        .set_alignment(sized, Axis::Y, AxisAlign::POS);
-    let stack = Stack {
-        children: vec![plain.add_strong(&mut h.rsc), aligned.add_strong(&mut h.rsc)],
-        size: StackSize::Child(0),
-    }
-    .add(&mut h.rsc);
-    let root = (stack,).span(Dir::RIGHT).add(&mut h.rsc);
-    h.set_root(root);
-    vec![
-        plain.id(),
-        wrapped.id(),
-        sized.id(),
-        aligned.id(),
-        stack.id(),
-        root.id(),
-    ]
-}
-
-/// The first frame does not reach the layout a second one does, so "cold" is
-/// not a fixed point and comparing against it compares against a tree that
-/// has not settled.
-#[test]
-fn one_frame_is_enough() {
-    let mut h = Harness::new((640, 900));
-    let ids = plant(&mut h);
-    let first = h.region(&ids[1]).unwrap();
-    for _ in 0..3 {
-        for &id in &ids {
-            h.rsc.widgets_mut().get_dyn_mut(id);
-        }
-        h.frame();
-    }
-    let settled = h.region(&ids[1]).unwrap();
-    println!(
-        "first frame {} tall, settled {} tall",
-        first.bot_right.y - first.top_left.y,
-        settled.bot_right.y - settled.top_left.y
-    );
-    assert_eq!(
-        first.bot_right.y - first.top_left.y,
-        settled.bot_right.y - settled.top_left.y,
-        "the first frame had not finished laying out"
-    );
-}
-
-#[test]
-fn repainting_everything_moves_nothing() {
-    let mut warm = Harness::new((640, 900));
-    let ids = plant(&mut warm);
-    for &id in &ids {
-        warm.rsc.widgets_mut().get_dyn_mut(id);
-    }
-    warm.frame();
-
-    let mut cold = Harness::new((640, 900));
-    let cold_ids = plant(&mut cold);
-
-    let mut wrong = Vec::new();
-    for (i, (&w, &c)) in ids.iter().zip(&cold_ids).enumerate() {
-        let (got, want) = (warm.region(&w), cold.region(&c));
-        if got != want {
-            wrong.push(format!("widget {i}: warm {got:?} cold {want:?}"));
-        }
-    }
-    assert!(wrong.is_empty(), "{}", wrong.join("\n"));
-}
-
-/// Six widgets, shrunk from 905. Everything inside the declared 189x176 box
-/// is the same size whatever the output is, so a resize may not change any of
-/// it -- but the text comes out 3.92px narrower warm than cold.
-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);
-    let aligned = text;
-    h.rsc
-        .widgets_mut()
-        .set_alignment(text, Axis::X, AxisAlign::NEG);
-    let inner = (aligned,).span(Dir::RIGHT).add(&mut h.rsc);
-    let sized = inner.sized((189, 176)).add(&mut h.rsc);
-    let filler = rect(Color::RED).add(&mut h.rsc);
-    let root = (filler, sized).span(Dir::RIGHT).add(&mut h.rsc);
-    h.state.root = Some(root.add_strong(&mut h.rsc));
-    vec![
-        text.id(),
-        aligned.id(),
-        inner.id(),
-        sized.id(),
-        filler.id(),
-        root.id(),
-    ]
-}
-
-#[test]
-fn a_resize_does_not_reach_inside_a_box_of_declared_pixels() {
-    let mut warm = Harness::new((1920, 1200));
-    let ids = plant_fixed(&mut warm);
-    warm.frame();
-    warm.resize((640, 900));
-    warm.frame();
-
-    let mut cold = Harness::new((640, 900));
-    let cold_ids = plant_fixed(&mut cold);
-    cold.frame();
-
-    let mut wrong = Vec::new();
-    for (i, (&w, &c)) in ids.iter().zip(&cold_ids).enumerate() {
-        let (got, want) = (warm.region(&w), cold.region(&c));
-        if got != want {
-            wrong.push(format!("widget {i}: warm {got:?} cold {want:?}"));
-        }
-    }
-    assert!(wrong.is_empty(), "{}", wrong.join("\n"));
-}
-
-/// Four widgets, shrunk from 486. A span's two children are swapped: warm by
-/// moving them, cold by growing them that way. Same widgets, same sizes, one
-/// ends up 29.9px from where the other does.
-fn plant_pair(h: &mut Harness, swapped: bool) -> (Vec<WidgetId>, WeakWidget<Span>) {
-    let wrapped = wtext("Wrapping shapes one source into as many lines")
-        .size(16)
-        .wrap(true)
-        .add(&mut h.rsc);
-    let plain = wtext("one line, overflowing whatever it is given")
-        .size(16)
-        .wrap(false)
-        .add(&mut h.rsc);
-    let first: StrongWidget = wrapped.add_strong(&mut h.rsc);
-    let second: StrongWidget = plain.add_strong(&mut h.rsc);
-    let children = match swapped {
-        true => vec![second, first],
-        false => vec![first, second],
-    };
-    let span = Span {
-        children,
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    let span_handle = span;
-    let aligned = span;
-    h.rsc
-        .widgets_mut()
-        .set_alignment(span, Axis::X, AxisAlign::CENTER);
-    h.state.root = Some(aligned.add_strong(&mut h.rsc));
-    (
-        vec![wrapped.id(), plain.id(), span.id(), aligned.id()],
-        span_handle,
-    )
-}
-
-#[test]
-fn swapping_two_children_lands_where_growing_them_that_way_does() {
-    let mut warm = Harness::new((640, 900));
-    let (ids, span) = plant_pair(&mut warm, false);
-    warm.frame();
-    warm.rsc[span].children.rotate_left(1);
-    warm.frame();
-
-    let mut cold = Harness::new((640, 900));
-    let (cold_ids, _) = plant_pair(&mut cold, true);
-    cold.frame();
-
-    let mut wrong = Vec::new();
-    for (i, (&w, &c)) in ids.iter().zip(&cold_ids).enumerate() {
-        let (got, want) = (warm.region(&w), cold.region(&c));
-        if got != want {
-            wrong.push(format!("widget {i}: warm {got:?} cold {want:?}"));
-        }
-    }
-    assert!(wrong.is_empty(), "{}", wrong.join("\n"));
-}
-
-/// Eight widgets, shrunk from 80. The scroll decides how wide to make its
-/// content from what the content says, and hands that box down through a
-/// pass-through; the span under it was given that box once, so nothing at its
-/// own edge says the box was its own answer.
-fn plant_scrolled(h: &mut Harness, swapped: bool) -> (Vec<WidgetId>, [WeakWidget<Span>; 2]) {
-    let words = "Wrapping shapes one source into as many lines as the box leaves room for,";
-    let text = wtext(words).size(16).wrap(true).add(&mut h.rsc);
-    let filler = rect(Color::RED).add(&mut h.rsc);
-    let mut inner_children: Vec<StrongWidget> =
-        vec![text.add_strong(&mut h.rsc), filler.add_strong(&mut h.rsc)];
-    if swapped {
-        inner_children.rotate_left(1);
-    }
-    let inner = Span {
-        children: inner_children,
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    let block = rect(Color::RED).add(&mut h.rsc);
-    let fixed = block.width(87).add(&mut h.rsc);
-    let mut outer_children: Vec<StrongWidget> =
-        vec![fixed.add_strong(&mut h.rsc), inner.add_strong(&mut h.rsc)];
-    if swapped {
-        outer_children.rotate_left(1);
-    }
-    let outer = Span {
-        children: outer_children,
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    // Carried no rule even before rules were a property: it is here to be a
-    // widget between the span and the scroll, not to declare anything.
-    let through = (outer,).span(Dir::RIGHT).add(&mut h.rsc);
-    let scroll = Scroll::new(through.add_strong(&mut h.rsc), Axis::X).add(&mut h.rsc);
-    h.state.root = Some(scroll.add_strong(&mut h.rsc));
-    (
-        vec![
-            text.id(),
-            filler.id(),
-            inner.id(),
-            block.id(),
-            fixed.id(),
-            outer.id(),
-            through.id(),
-            scroll.id(),
-        ],
-        [inner, outer],
-    )
-}
-
-#[test]
-fn a_span_given_the_box_its_answer_decided_matches_a_cold_layout() {
-    let mut warm = Harness::new((640, 900));
-    let (ids, spans) = plant_scrolled(&mut warm, false);
-    warm.frame();
-    for span in spans {
-        warm.rsc[span].children.rotate_left(1);
-    }
-    warm.frame();
-
-    let mut cold = Harness::new((640, 900));
-    let (cold_ids, _) = plant_scrolled(&mut cold, true);
-    cold.frame();
-
-    let mut wrong = Vec::new();
-    for (i, (&w, &c)) in ids.iter().zip(&cold_ids).enumerate() {
-        let (got, want) = (warm.region(&w), cold.region(&c));
-        if got != want {
-            wrong.push(format!("widget {i}: warm {got:?} cold {want:?}"));
-        }
-    }
-    assert!(wrong.is_empty(), "{}", wrong.join("\n"));
-}
-
-/// Reports a width derived from the box it is asked in. Reading through the
-/// painter is its declaration that the answer holds for that width only.
-struct Wider {
-    extra: f32,
-}
-
-impl Widget for Wider {
-    fn draw(&mut self, painter: &mut Painter) -> Size {
-        Size {
-            x: Len {
-                px: painter.px_len(Axis::X) + Px::from_f32(self.extra),
-                ..Len::ZERO
-            },
-            y: Len::LEFTOVER,
-        }
-    }
-}
-
-fn plant_wider(h: &mut Harness, extra: f32) -> (WeakWidget<Wider>, WidgetId) {
-    let content = Wider { extra }.add(&mut h.rsc);
-    let scroll = Scroll::new(content.add_strong(&mut h.rsc), Axis::X).add(&mut h.rsc);
-    let root = scroll;
-    h.rsc
-        .widgets_mut()
-        .set_alignment(scroll, Axis::X, AxisAlign::NEG);
-    h.set_root(root);
-    (content, scroll.id())
-}
-
-#[test]
-fn a_scrolls_retained_answer_is_the_one_a_cold_layout_asks_for() {
-    let mut warm = Harness::new((100, 100));
-    let (content, scroll) = plant_wider(&mut warm, 50.0);
-    warm.rsc[content].extra = 70.0;
-    warm.frame();
-
-    let mut cold = Harness::new((100, 100));
-    let (_, cold_scroll) = plant_wider(&mut cold, 70.0);
-
-    assert_eq!(warm.region(&scroll), cold.region(&cold_scroll));
-}
-
-/// Six widgets, shrunk from 266. `measured`'s box is exactly the height of its
-/// one fixed child, which is the box a parent sizing itself from that answer
-/// hands back -- so whether its leftover-only child was drawn at all came down
-/// to the 0.00003 px the composed length differs by, one way warm and the
-/// other cold.
-fn plant_boundary(h: &mut Harness, swapped: bool) -> (Vec<WidgetId>, [WeakWidget<Span>; 2]) {
-    let filler = rect(Color::RED).add(&mut h.rsc);
-    let plain = wtext("one line, overflowing whatever it is given")
-        .size(16)
-        .wrap(false)
-        .add(&mut h.rsc);
-    let mut pair: Vec<StrongWidget> =
-        vec![filler.add_strong(&mut h.rsc), plain.add_strong(&mut h.rsc)];
-    if swapped {
-        pair.rotate_left(1);
-    }
-    let measured = Span {
-        children: pair,
-        dir: Dir::DOWN,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    // Takes the whole box on its own, so the span above has nothing left to
-    // divide and `measured` is given exactly the text's height.
-    let whole = rect(Color::RED).add(&mut h.rsc);
-    h.rsc
-        .widgets_mut()
-        .set_size_rules(whole, None, Some(Len::rel(1.0)));
-    let mut inner_children: Vec<StrongWidget> = vec![
-        measured.add_strong(&mut h.rsc),
-        whole.add_strong(&mut h.rsc),
-    ];
-    if swapped {
-        inner_children.rotate_left(1);
-    }
-    let inner = Span {
-        children: inner_children,
-        dir: Dir::DOWN,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    h.rsc
-        .widgets_mut()
-        .set_size_rules(inner, None, Some(Len::px(198.0)));
-    // One more span above it: without a box composed through it, both trees
-    // round the same way and the boundary is never crossed.
-    let outer = (inner,).span(Dir::DOWN).add(&mut h.rsc);
-    h.set_root(outer);
-    (
-        vec![
-            filler.id(),
-            plain.id(),
-            measured.id(),
-            whole.id(),
-            inner.id(),
-            outer.id(),
-        ],
-        [measured, inner],
-    )
-}
-
-#[test]
-fn a_box_that_only_rounds_past_its_fixed_children_leaves_nothing_over() {
-    let mut warm = Harness::new((640, 900));
-    let (ids, spans) = plant_boundary(&mut warm, false);
-    warm.frame();
-    for span in spans {
-        warm.rsc[span].children.rotate_left(1);
-    }
-    warm.frame();
-
-    let mut cold = Harness::new((640, 900));
-    let (cold_ids, _) = plant_boundary(&mut cold, true);
-    cold.frame();
-
-    let mut wrong = Vec::new();
-    for (i, (&w, &c)) in ids.iter().zip(&cold_ids).enumerate() {
-        let (got, want) = (warm.region(&w), cold.region(&c));
-        if got != want {
-            wrong.push(format!("widget {i}: warm {got:?} cold {want:?}"));
-        }
-    }
-    assert!(wrong.is_empty(), "{}", wrong.join("\n"));
-}

tests/chain_cost.rs

@@ -1,223 +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.
-//!
-//! The instance is leaked deliberately, for the reason `draw_cost.rs` gives.
-
-use iris::prelude::*;
-use iris_core::{
-    MaskIdx, MoveIdx, PrimitiveInst, RectPrimitive, UiData, UiRegion, UiRenderNode, UiRenderState,
-    UiScalar, UiSpan,
-};
-use wgpu::{Color as GpuColor, *};
-
-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 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));
-    let adapter =
-        pollster::block_on(instance.request_adapter(&RequestAdapterOptions::default())).ok()?;
-    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))
-}
-
-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![],
-    }
-}
-
-/// 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| UiScalar::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, &config(format));
-    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/draw_cost.rs

@@ -22,8 +22,8 @@ use std::time::Instant;
 
 use iris::prelude::*;
 use iris_core::{
-    GlyphPrimitive, MaskIdx, MoveIdx, PrimitiveInst, RectPrimitive, TextureHandle,
-    TexturePrimitive, UiData, UiRegion, UiRenderNode, UiRenderState,
+    GlyphPrimitive, MaskIdx, PrimitiveInst, RectPrimitive, TextureHandle, TexturePrimitive, UiData,
+    UiRegion, UiRenderNode, UiRenderState,
 };
 use wgpu::{Color as GpuColor, *};
 
@@ -95,7 +95,6 @@ fn fill(
                     primitive: RectPrimitive::color(UiColor::WHITE),
                     region: UiRegion::FULL,
                     mask_idx: MaskIdx::NONE,
-                    move_idx: MoveIdx::NONE,
                 },
             );
             render.layers.write(
@@ -112,7 +111,6 @@ fn fill(
                     },
                     region: UiRegion::FULL,
                     mask_idx: MaskIdx::NONE,
-                    move_idx: MoveIdx::NONE,
                 },
             );
         }
@@ -125,7 +123,6 @@ fn fill(
                     primitive: TexturePrimitive::from(h),
                     region: UiRegion::FULL,
                     mask_idx: MaskIdx::NONE,
-                    move_idx: MoveIdx::NONE,
                 },
             );
         }

tests/generated.rs

@@ -1,584 +0,0 @@
-//! Random trees, checked against building the same tree cold.
-//!
-//! A frame reaches its layout by keeping most of the last one: movable regions
-//! or primitive boxes rewritten, some widgets drawn again, the rest untouched.
-//! The result must be the tree a cold start would have produced, so anything
-//! wrongly retained shows up as a difference in somebody's box.
-//!
-//! `iris::random` grows the tree and `examples/random.rs` draws one. A seed is
-//! the whole reproduction; `a_long_run_of_seeds_agrees` is the ignored sweep
-//! for when it is worth spending the time.
-
-use std::collections::HashMap;
-
-use iris::harness::Harness;
-use iris::prelude::*;
-use iris::random::{Aligns, Edits, Lens, Rng, SpanEdit, Tree, grow};
-
-/// 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)
-}
-
-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)
-}
-const SEEDS: [u64; 9] = [1, 2, 3, 5, 8, 10, 13, 86, 98];
-
-/// The same box, to a step of the grid per level of nesting between the two
-/// ways of reaching it. A move, a repaint and a row of shares land on the
-/// same number now; what is left is a box centred in a fraction of its parent
-/// against the same box centred in its own pixels. A step is a thousandth of
-/// a pixel, where this was a twentieth of one before any of it was on a grid.
-const AGREE_STEPS: i32 = 2;
-
-fn same_region(got: Option<PixelRegion>, want: Option<PixelRegion>) -> bool {
-    match (got, want) {
-        (Some(got), Some(want)) => {
-            let same = |a: Px, b: Px| (a - b).abs() <= Px::STEP.mul_int(AGREE_STEPS);
-            same(got.top_left.x, want.top_left.x)
-                && same(got.top_left.y, want.top_left.y)
-                && same(got.bot_right.x, want.bot_right.x)
-                && same(got.bot_right.y, want.bot_right.y)
-        }
-        (None, None) => true,
-        _ => false,
-    }
-}
-
-fn plant(h: &mut Harness, seed: u64, edits: &Edits) -> Tree {
-    let (root, tree) = grow(&mut h.rsc, seed, depth(), edits);
-    h.state.root = Some(root);
-    h.frame();
-    tree
-}
-
-fn resize_one(h: &mut Harness, tree: &Tree, idx: usize, rng: &mut Rng) -> Lens {
-    let lens = [
-        Some(Len::px(20.0 + rng.below(180) as f32)),
-        Some(Len::px(20.0 + rng.below(180) as f32)),
-    ];
-    h.rsc
-        .widgets_mut()
-        .set_size_rules(tree.sized[idx], lens[0], lens[1]);
-    lens
-}
-
-/// Changes a few of the declared sizes, and says which, so the cold tree can
-/// be grown with the same ones.
-fn edit(h: &mut Harness, tree: &Tree, rng: &mut Rng) -> HashMap<usize, Lens> {
-    let mut edits = HashMap::new();
-    for _ in 0..4 {
-        let idx = rng.below(tree.sized.len());
-        edits.insert(idx, resize_one(h, tree, idx, rng));
-    }
-    edits
-}
-
-/// Every declared size at once, so every reader of a size in the tree has a
-/// changed descendant in the same frame and the whole dirty set has to settle
-/// together.
-fn edit_every(h: &mut Harness, tree: &Tree, rng: &mut Rng) -> HashMap<usize, Lens> {
-    (0..tree.sized.len())
-        .map(|idx| (idx, resize_one(h, tree, idx, rng)))
-        .collect()
-}
-
-/// 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)]
-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,
-}
-
-const SHUFFLES: [Shuffle; 5] = [
-    Shuffle::EveryOther,
-    Shuffle::AllButFirst,
-    Shuffle::AddThree,
-    Shuffle::SwapForThree,
-    Shuffle::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,
-            },
-        }
-    }
-}
-
-/// Applies `shuffle` to every third span, and says what it did so the cold
-/// tree can be grown that way. The widgets it takes out are given back: the
-/// last share of one must outlive the comparison, or its id is handed to
-/// something else and the two trees stop lining up.
-fn reshuffle(
-    h: &mut Harness,
-    tree: &mut Tree,
-    shuffle: Shuffle,
-) -> (HashMap<usize, SpanEdit>, Vec<StrongWidget>) {
-    let mut edits = HashMap::new();
-    let mut detached = Vec::new();
-    for (idx, span) in tree.spans.iter_mut().enumerate().step_by(3) {
-        let span_edit = shuffle.of(span.grown);
-        let mut take = span_edit.detach.clone();
-        take.sort_unstable();
-        let children = &mut h.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() {
-                detached.push(children.remove(j));
-            }
-        }
-        let attach = span_edit.attach.min(span.spares.len());
-        children.extend(span.spares.drain(..attach));
-        edits.insert(idx, span_edit);
-    }
-    (edits, detached)
-}
-
-/// What a widget was configured with, so a tree the generator found can be
-/// written out by hand. A fuzz 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);
-    let rule = |r: SizeRule| match r.known() {
-        Some(len) => format!("{len}"),
-        None => "-".into(),
-    };
-    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.x, rules.y) != (SizeRule::Free, SizeRule::Free) {
-        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
-}
-
-/// Every widget in one tree against the matching widget in the other. A
-/// mismatch prints the widget's ancestry, marking region nodes, since where
-/// two trees disagree is rarely where the cause is.
-fn assert_same(seed: u64, what: &str, warm: (&Harness, &Tree), cold: (&Harness, &Tree)) {
-    let ((wh, wt), (ch, ct)) = (warm, cold);
-    assert_eq!(wt.ids.len(), ct.ids.len(), "seed {seed}: different trees");
-    let mut drawn = 0;
-    let mut wrong = 0;
-    for (i, (&w, &c)) in wt.ids.iter().zip(&ct.ids).enumerate() {
-        let (got, want) = (wh.region(&w), ch.region(&c));
-        drawn += usize::from(got.is_some());
-        // This oracle cares where rasterization lands, not whether equivalent
-        // arithmetic produced the same f32. Keep the tolerance to one
-        // twentieth of a physical pixel, while whether a widget drew remains
-        // exact.
-        if same_region(got, want) {
-            continue;
-        }
-        wrong += 1;
-        if wrong <= 3 {
-            let mut chain = Vec::new();
-            let mut at = Some(w);
-            while let Some(id) = at {
-                let active = &wh.render.active[&id];
-                let node = match active.move_idx == active.parent_move {
-                    true => "",
-                    false => "*",
-                };
-                chain.push(format!("{}{node}", describe(id, wh)));
-                at = active.parent;
-            }
-            println!(
-                "seed {seed} after {what}: widget {i}\n  warm {got:?}\n  cold {want:?}\n  {}",
-                chain.join(" < ")
-            );
-        }
-    }
-    assert!(drawn > 0, "seed {seed}: nothing was drawn");
-    assert_eq!(wrong, 0, "seed {seed}: {wrong} widgets differ after {what}");
-}
-
-fn changed_size(seed: u64) {
-    let mut warm = Harness::new((900, 1200));
-    let grown = plant(&mut warm, seed, &Edits::default());
-    // Not every tree grows a declared size to change.
-    if grown.sized.is_empty() {
-        return;
-    }
-
-    let mut rng = Rng::new(seed ^ 0x5eed);
-    let sizes = edit(&mut warm, &grown, &mut rng);
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let same = plant(
-        &mut cold,
-        seed,
-        &Edits {
-            sizes,
-            ..Default::default()
-        },
-    );
-    assert_same(seed, "a size change", (&warm, &grown), (&cold, &same));
-}
-
-/// Moves one widget to a different corner of the box it is given.
-fn realign_one(h: &mut Harness, tree: &Tree, idx: usize, rng: &mut Rng) -> Aligns {
-    let mut side = || match rng.below(4) {
-        0 => None,
-        1 => Some(AxisAlign::NEG),
-        2 => Some(AxisAlign::CENTER),
-        _ => Some(AxisAlign::POS),
-    };
-    let aligns = [side(), side()];
-    for (axis, align) in [Axis::X, Axis::Y].into_iter().zip(aligns) {
-        h.rsc
-            .widgets_mut()
-            .set_alignment(tree.aligned[idx], axis, align.unwrap_or_default());
-    }
-    aligns
-}
-
-fn changed_alignment(seed: u64) {
-    let mut warm = Harness::new((900, 1200));
-    let grown = plant(&mut warm, seed, &Edits::default());
-    if grown.aligned.is_empty() {
-        return;
-    }
-
-    let mut rng = Rng::new(seed ^ 0xa11);
-    let aligns = (0..grown.aligned.len())
-        .step_by(3)
-        .map(|idx| (idx, realign_one(&mut warm, &grown, idx, &mut rng)))
-        .collect();
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let same = plant(
-        &mut cold,
-        seed,
-        &Edits {
-            aligns,
-            ..Default::default()
-        },
-    );
-    assert_same(seed, "an alignment change", (&warm, &grown), (&cold, &same));
-}
-
-/// 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. A cold tree built that way is what says the rebuild was complete.
-fn changed_region_node(seed: u64) {
-    let mut warm = Harness::new((900, 1200));
-    let grown = plant(&mut warm, seed, &Edits::default());
-    if grown.nodes.is_empty() {
-        return;
-    }
-
-    let nodes: HashMap<usize, bool> = (0..grown.nodes.len())
-        .step_by(2)
-        .map(|idx| {
-            let id = grown.nodes[idx];
-            let was = warm.rsc.widgets().is_region_node(id);
-            warm.rsc.widgets_mut().set_region_node(id, !was);
-            (idx, !was)
-        })
-        .collect();
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let same = plant(
-        &mut cold,
-        seed,
-        &Edits {
-            nodes,
-            ..Default::default()
-        },
-    );
-    assert_same(
-        seed,
-        "a region-node change",
-        (&warm, &grown),
-        (&cold, &same),
-    );
-}
-
-fn reshuffled(seed: u64, shuffle: Shuffle) {
-    let mut warm = Harness::new((900, 1200));
-    let mut grown = plant(&mut warm, seed, &Edits::default());
-    // Some seeds grow nothing but wrappers, and a shuffle with no span to
-    // shuffle is not the same thing as one that had no effect. A span behind
-    // a branch nobody took is the same kind of nothing: it is not drawn, so
-    // shuffling it cannot move anything.
-    let shuffles = grown
-        .spans
-        .iter()
-        .step_by(3)
-        .any(|span| warm.region(&span.id.id()).is_some());
-    if !shuffles {
-        return;
-    }
-    let (spans, _held) = reshuffle(&mut warm, &mut grown, shuffle);
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let same = plant(
-        &mut cold,
-        seed,
-        &Edits {
-            spans,
-            ..Default::default()
-        },
-    );
-
-    let what = format!("{shuffle:?}");
-    assert_same(seed, &what, (&warm, &grown), (&cold, &same));
-}
-
-fn changed_every_size(seed: u64) {
-    let mut warm = Harness::new((900, 1200));
-    let grown = plant(&mut warm, seed, &Edits::default());
-    if grown.sized.is_empty() {
-        return;
-    }
-
-    let mut rng = Rng::new(seed ^ 0xa11);
-    let sizes = edit_every(&mut warm, &grown, &mut rng);
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let same = plant(
-        &mut cold,
-        seed,
-        &Edits {
-            sizes,
-            ..Default::default()
-        },
-    );
-    assert_same(seed, "every size at once", (&warm, &grown), (&cold, &same));
-}
-
-/// Marks a spread of widgets for redraw at once. Nothing changes, so no box
-/// may either; what this exercises is the order a frame settles a dirty set
-/// in, which the other cases reach one dependency path at a time.
-fn repainted_together(seed: u64) {
-    let mut warm = Harness::new((900, 1200));
-    let grown = plant(&mut warm, seed, &Edits::default());
-    for &id in grown.ids.iter().step_by(5) {
-        warm.rsc.widgets_mut().get_dyn_mut(id);
-    }
-    assert!(
-        !warm.rsc.widgets().needs_redraw.is_empty(),
-        "seed {seed}: nothing was marked"
-    );
-    warm.frame();
-
-    let mut cold = Harness::new((900, 1200));
-    let same = plant(&mut cold, seed, &Edits::default());
-
-    let what = "many repaints at once";
-    assert_same(seed, what, (&warm, &grown), (&cold, &same));
-}
-
-fn resized(seed: u64) {
-    let mut warm = Harness::new((1920, 1200));
-    let grown = plant(&mut warm, seed, &Edits::default());
-    warm.resize((640, 900));
-    warm.frame();
-
-    let mut cold = Harness::new((640, 900));
-    let same = plant(&mut cold, seed, &Edits::default());
-
-    assert_same(seed, "a resize", (&warm, &grown), (&cold, &same));
-}
-
-fn resized_then_changed(seed: u64) {
-    let mut warm = Harness::new((1920, 1200));
-    let grown = plant(&mut warm, seed, &Edits::default());
-    if grown.sized.is_empty() {
-        return;
-    }
-    warm.resize((640, 900));
-    warm.frame();
-
-    let mut rng = Rng::new(seed ^ 0xb0a7);
-    let sizes = edit(&mut warm, &grown, &mut rng);
-    warm.frame();
-
-    let mut cold = Harness::new((640, 900));
-    let same = plant(
-        &mut cold,
-        seed,
-        &Edits {
-            sizes,
-            ..Default::default()
-        },
-    );
-
-    let what = "a resize then a size change";
-    assert_same(seed, what, (&warm, &grown), (&cold, &same));
-}
-
-#[test]
-fn a_changed_size_lands_where_growing_it_that_way_would() {
-    SEEDS.into_iter().for_each(changed_size);
-}
-
-#[test]
-fn a_changed_alignment_lands_where_growing_it_that_way_would() {
-    SEEDS.into_iter().for_each(changed_alignment);
-}
-
-#[test]
-fn a_toggled_region_node_lands_where_growing_it_that_way_would() {
-    SEEDS.into_iter().for_each(changed_region_node);
-}
-
-#[test]
-fn every_size_changing_at_once_lands_where_growing_it_that_way_would() {
-    SEEDS.into_iter().for_each(changed_every_size);
-}
-
-#[test]
-fn many_widgets_redrawing_at_once_leaves_every_box_where_it_was() {
-    SEEDS.into_iter().for_each(repainted_together);
-}
-
-#[test]
-fn a_resize_lands_where_starting_at_that_size_would() {
-    SEEDS.into_iter().for_each(resized);
-}
-
-#[test]
-fn a_size_change_after_a_resize_lands_the_same_way() {
-    SEEDS.into_iter().for_each(resized_then_changed);
-}
-
-#[test]
-fn adding_and_removing_span_children_lands_where_growing_it_that_way_would() {
-    for shuffle in SHUFFLES {
-        for seed in SEEDS {
-            reshuffled(seed, shuffle);
-        }
-    }
-}
-
-/// The same property over a hundred seeds and every scenario. What it has
-/// found so far was never where the trees disagreed: a text measured in a box
-/// it was not going to get, and a widget re-measured in a box its own answer
-/// had decided. `tests/shrink.rs` is how a seed from here becomes a tree
-/// small enough to read.
-#[test]
-#[ignore = "a hundred seeds, rather than the nine the others check"]
-fn a_long_run_of_seeds_agrees() {
-    let seeds = std::env::var("IRIS_GENERATED_SEED")
-        .ok()
-        .and_then(|seed| seed.parse().ok())
-        .map(|seed| seed..=seed)
-        .unwrap_or_else(|| 1..=env("IRIS_GENERATED_SEEDS", 100));
-    over_seeds(seeds.collect(), |seed| {
-        changed_size(seed);
-        changed_every_size(seed);
-        repainted_together(seed);
-        resized(seed);
-        resized_then_changed(seed);
-        for shuffle in SHUFFLES {
-            reshuffled(seed, shuffle);
-        }
-    });
-}
-
-/// Every seed on its own thread's share of them. A tree is grown, laid out
-/// and dropped inside one call, so seeds share nothing, and this is most of
-/// the time a run takes. A thread that fails takes the scope down with it,
-/// which is the same panic libtest would have seen.
-///
-/// One core short of all of them, so the machine this runs on stays usable.
-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)));
-        }
-    });
-}

tests/layout.rs

@@ -0,0 +1,34 @@
+//! 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));
+}

tests/layout_diagnostics.rs

@@ -1,244 +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
-//!
-//! Uninstrumented hardware totals for one phase:
-//!
-//!     IRIS_PHASE=resize IRIS_FRAMES=1000 perf stat \
-//!       -e cycles:u,instructions:u cargo test --release \
-//!       --test 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);
-
-#[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();
-
-    let _ = harness.rsc.widgets_mut().get_dyn_mut(root.id());
-    let _ = harness.rsc.widgets_mut().get_dyn_mut(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) {}
-
-fn warm(seed: u64, depth: usize) -> (Harness, Tree) {
-    let mut harness = Harness::new(OUTPUT);
-    let (root, tree) = grow(&mut harness.rsc, seed, depth, &Edits::default());
-    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 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, &Edits::default());
-        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, |_, _| {});
-        drop(tree);
-    }
-
-    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, _| {
-            let _ = harness.rsc.widgets_mut().get_dyn_mut(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().get_dyn_mut(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 = Len::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));
-        });
-        drop(tree);
-    }
-}

tests/pointer.rs

@@ -2,7 +2,7 @@
 
 use std::{cell::RefCell, rc::Rc};
 
-use iris::harness::{Harness, TouchScript};
+use iris::harness::Harness;
 use iris::prelude::*;
 
 #[test]
@@ -58,28 +58,3 @@ fn hover_ends_when_the_cursor_leaves_the_window() {
     h.leave();
     assert_eq!((*hovered.borrow(), *ended.borrow()), (1, 1));
 }
-
-#[test]
-fn a_recorded_gesture_presses_where_it_says() {
-    let mut h = Harness::new((400, 200));
-    let clicks = Rc::new(RefCell::new(Vec::new()));
-
-    let (on_left, on_right) = (clicks.clone(), clicks.clone());
-    let left = rect(Color::RED)
-        .width(100)
-        .on(CursorSense::click(), move |_, _| {
-            on_left.borrow_mut().push("left")
-        })
-        .add(&mut h.rsc);
-    let right = rect(Color::BLUE)
-        .on(CursorSense::click(), move |_, _| {
-            on_right.borrow_mut().push("right")
-        })
-        .add(&mut h.rsc);
-    h.set_root((left, right).span(Dir::RIGHT));
-
-    let script = TouchScript::parse("0 down 300 100\n80 up 300 100").unwrap();
-    h.replay(&script);
-
-    assert_eq!(*clicks.borrow(), ["right"]);
-}

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/revision_cost.rs

@@ -1,199 +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(Len::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.
-    for _ in 0..10 {
-        let _ = h.rsc.widgets_mut().get_dyn_mut(paragraphs[0]);
-        h.frame();
-    }
-    report("after settling");
-}

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,619 +0,0 @@
-//! A property test that shrinks its own counterexample.
-//!
-//! `generated.rs` reproduces a failure from a seed, but 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 trees it can take apart, so a failure is reduced to the smallest
-//! tree that still shows it and printed 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. 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.
-
-use iris::harness::Harness;
-use iris::prelude::*;
-use iris::random::{Branch, Rng};
-
-/// The same two leaves `iris::random` grows, since only one of them reads the
-/// width it is given and that is the difference that matters.
-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.",
-];
-
-const ONE_LINE: &str = "one line, overflowing whatever it is given";
-
-const OUTER: (f32, f32) = (1920.0, 1200.0);
-/// Steps of the grid two ways of reaching a box may differ by: one per level
-/// of nesting between them, and these trees are five deep. See
-/// `docs/HANDOFF.md`'s "Fixed point" in `ai-app-2` for what is left.
-const AGREE_STEPS: i32 = 2;
-const INNER: (f32, f32) = (640.0, 900.0);
-
-#[derive(Clone, Debug, PartialEq)]
-enum Node {
-    /// Words taken from [`WORDS`], and whether it wraps.
-    Text(usize, bool),
-    /// The leaf that overflows whatever box it is given rather than wrapping.
-    OneLine,
-    Rect,
-    /// Direction, gap, children in creation order, and the order they are
-    /// attached in -- separate so a tree that reorders its children
-    /// still makes the same widgets in the same order, and two
-    /// builds line up index for index.
-    Span(bool, f32, Vec<Node>, Vec<usize>),
-    Stack(Vec<Node>),
-    Pad(f32, Box<Node>),
-    Aligned(u8, u8, Box<Node>),
-    Sized(Option<Len>, Option<Len>, Box<Node>),
-    Scroll(bool, Box<Node>),
-    Branch(Box<Node>, Box<Node>, Box<Node>, f32),
-}
-
-fn axis_align(v: u8) -> Option<AxisAlign> {
-    match v % 4 {
-        0 => None,
-        1 => Some(AxisAlign::NEG),
-        2 => Some(AxisAlign::CENTER),
-        _ => Some(AxisAlign::POS),
-    }
-}
-
-fn dir(down: bool) -> Dir {
-    if down { Dir::DOWN } else { Dir::RIGHT }
-}
-
-impl Node {
-    /// Builds into `h`, pushing every id in tree order, so two builds of one
-    /// node line up index for index and their boxes can be compared.
-    fn build(
-        &self,
-        h: &mut Harness,
-        out: &mut Vec<WidgetId>,
-        spans: &mut Vec<WeakWidget<Span>>,
-        sized: &mut Vec<WidgetId>,
-    ) -> StrongWidget {
-        let id: StrongWidget = match self {
-            Node::Text(words, wrap) => {
-                let n = (*words).clamp(1, WORDS.len());
-                wtext(WORDS[..n].join(" "))
-                    .size(16)
-                    .wrap(*wrap)
-                    .add_strong(&mut h.rsc)
-            }
-            Node::OneLine => wtext(ONE_LINE).size(16).wrap(false).add_strong(&mut h.rsc),
-            Node::Rect => rect(Color::RED).add_strong(&mut h.rsc),
-            Node::Span(down, gap, kids, order) => {
-                let mut built: Vec<_> = kids
-                    .iter()
-                    .map(|k| Some(k.build(h, out, spans, sized)))
-                    .collect();
-                // `order` is a permutation, so each is taken exactly once.
-                let children = order
-                    .iter()
-                    .map(|&i| built[i].take().expect("order repeats an index"))
-                    .collect();
-                let handle = Span {
-                    children,
-                    dir: dir(*down),
-                    gap: Px::from_f32(*gap),
-                }
-                .add(&mut h.rsc);
-                // A row takes the height it is given; a column is as wide
-                // as its widest child, which needs no rule.
-                if !*down {
-                    h.rsc
-                        .widgets_mut()
-                        .set_size_rules(handle, None, Some(Len::rel(1.0)));
-                }
-                spans.push(handle);
-                handle.add_strong(&mut h.rsc)
-            }
-            Node::Stack(kids) => {
-                let children = kids.iter().map(|k| k.build(h, out, spans, sized)).collect();
-                Stack {
-                    children,
-                    size: StackSize::Child(0),
-                }
-                .add_strong(&mut h.rsc)
-            }
-            Node::Pad(p, kid) => {
-                let inner = kid.build(h, out, spans, sized);
-                Pad {
-                    padding: Padding::uniform(*p),
-                    inner,
-                }
-                .add_strong(&mut h.rsc)
-            }
-            Node::Aligned(x, y, kid) => {
-                let inner = kid.build(h, out, spans, sized);
-                for (axis, align) in [(Axis::X, axis_align(*x)), (Axis::Y, axis_align(*y))] {
-                    if let Some(align) = align {
-                        h.rsc.widgets_mut().set_alignment(&inner, axis, align);
-                    }
-                }
-                inner
-            }
-            Node::Sized(x, y, kid) => {
-                let inner = kid.build(h, out, spans, sized);
-                h.rsc.widgets_mut().set_size_rules(&inner, *x, *y);
-                sized.push(inner.id());
-                inner
-            }
-            Node::Scroll(down, kid) => {
-                let inner = kid.build(h, out, spans, sized);
-                let axis = if *down { Axis::Y } else { Axis::X };
-                Scroll::new(inner, axis).add_strong(&mut h.rsc)
-            }
-            Node::Branch(probe, a, b, at) => {
-                let probe = probe.build(h, out, spans, sized);
-                let wide = a.build(h, out, spans, sized);
-                let narrow = b.build(h, out, spans, sized);
-                Branch {
-                    probe,
-                    wide,
-                    narrow,
-                    threshold: *at,
-                }
-                .add_strong(&mut h.rsc)
-            }
-        };
-        out.push(id.id());
-        id
-    }
-
-    /// The lengths every `Sized` node would carry after `resized`, in the
-    /// order `build` pushes them.
-    fn sized_lens(&self, out: &mut Vec<(Option<Len>, Option<Len>)>) {
-        match self {
-            Node::Text(..) | Node::OneLine | Node::Rect => {}
-            Node::Span(_, _, kids, _) | Node::Stack(kids) => {
-                kids.iter().for_each(|k| k.sized_lens(out));
-            }
-            Node::Pad(_, k) | Node::Aligned(_, _, k) | Node::Scroll(_, k) => k.sized_lens(out),
-            Node::Sized(x, y, k) => {
-                k.sized_lens(out);
-                out.push((resized_len(*x), resized_len(*y)));
-            }
-            Node::Branch(p, a, b, _) => {
-                p.sized_lens(out);
-                a.sized_lens(out);
-                b.sized_lens(out);
-            }
-        }
-    }
-
-    fn size(&self) -> usize {
-        1 + match self {
-            Node::Text(..) | Node::OneLine | Node::Rect => 0,
-            Node::Span(_, _, kids, _) | Node::Stack(kids) => kids.iter().map(Node::size).sum(),
-            Node::Pad(_, k)
-            | Node::Aligned(_, _, k)
-            | Node::Sized(_, _, k)
-            | Node::Scroll(_, k) => k.size(),
-            Node::Branch(p, a, b, _) => p.size() + a.size() + b.size(),
-        }
-    }
-
-    /// Every one-step simplification: a wrapper replaced by what it wrapped, a
-    /// child dropped, a length or a word count reduced. Ordered cheapest-first
-    /// so the greedy walk takes the biggest bites early.
-    fn smaller(&self) -> Vec<Node> {
-        let mut out = Vec::new();
-        let leaf = Node::Rect;
-        match self {
-            Node::Text(words, wrap) => {
-                if *words > 1 {
-                    out.push(Node::Text(words / 2, *wrap));
-                    out.push(Node::Text(words - 1, *wrap));
-                }
-                if *wrap {
-                    out.push(Node::Text(*words, false));
-                }
-                out.push(leaf);
-            }
-            Node::OneLine => out.push(Node::Rect),
-            Node::Rect => {}
-            Node::Span(down, gap, kids, order) => {
-                out.extend(order.iter().map(|&i| kids[i].clone()));
-                for i in 0..kids.len() {
-                    if kids.len() > 1 {
-                        let mut less = kids.clone();
-                        less.remove(i);
-                        let order = (0..less.len()).collect();
-                        out.push(Node::Span(*down, *gap, less, order));
-                    }
-                }
-                if *gap != 0.0 {
-                    out.push(Node::Span(*down, 0.0, kids.clone(), order.clone()));
-                }
-                for (i, kid) in kids.iter().enumerate() {
-                    for small in kid.smaller() {
-                        let mut next = kids.clone();
-                        next[i] = small;
-                        out.push(Node::Span(*down, *gap, next, order.clone()));
-                    }
-                }
-            }
-            Node::Stack(kids) => {
-                out.extend(kids.iter().cloned());
-                for i in 0..kids.len() {
-                    if kids.len() > 1 {
-                        let mut less = kids.clone();
-                        less.remove(i);
-                        out.push(Node::Stack(less));
-                    }
-                }
-                for (i, kid) in kids.iter().enumerate() {
-                    for small in kid.smaller() {
-                        let mut next = kids.clone();
-                        next[i] = small;
-                        out.push(Node::Stack(next));
-                    }
-                }
-            }
-            Node::Pad(p, kid) => {
-                out.push((**kid).clone());
-                if *p != 0.0 {
-                    out.push(Node::Pad(0.0, kid.clone()));
-                }
-                out.extend(
-                    kid.smaller()
-                        .into_iter()
-                        .map(|k| Node::Pad(*p, Box::new(k))),
-                );
-            }
-            Node::Aligned(x, y, kid) => {
-                out.push((**kid).clone());
-                for (nx, ny) in [(0, *y), (*x, 0)] {
-                    if (nx, ny) != (*x, *y) {
-                        out.push(Node::Aligned(nx, ny, kid.clone()));
-                    }
-                }
-                out.extend(
-                    kid.smaller()
-                        .into_iter()
-                        .map(|k| Node::Aligned(*x, *y, Box::new(k))),
-                );
-            }
-            Node::Sized(x, y, kid) => {
-                out.push((**kid).clone());
-                if x.is_some() {
-                    out.push(Node::Sized(None, *y, kid.clone()));
-                }
-                if y.is_some() {
-                    out.push(Node::Sized(*x, None, kid.clone()));
-                }
-                out.extend(
-                    kid.smaller()
-                        .into_iter()
-                        .map(|k| Node::Sized(*x, *y, Box::new(k))),
-                );
-            }
-            Node::Scroll(down, kid) => {
-                out.push((**kid).clone());
-                out.extend(
-                    kid.smaller()
-                        .into_iter()
-                        .map(|k| Node::Scroll(*down, Box::new(k))),
-                );
-            }
-            Node::Branch(p, a, b, at) => {
-                out.push((**p).clone());
-                out.push((**a).clone());
-                out.push((**b).clone());
-                for small in p.smaller() {
-                    out.push(Node::Branch(Box::new(small), a.clone(), b.clone(), *at));
-                }
-                for small in a.smaller() {
-                    out.push(Node::Branch(p.clone(), Box::new(small), b.clone(), *at));
-                }
-                for small in b.smaller() {
-                    out.push(Node::Branch(p.clone(), a.clone(), Box::new(small), *at));
-                }
-            }
-        }
-        out
-    }
-}
-
-/// A declared size over about half the tree, the way `iris::random` puts them
-/// in: on the way into every child rather than as a node kind of its own, so
-/// readers of a size are dense rather than occasional.
-fn sized(rng: &mut Rng, inner: Node) -> Node {
-    if !rng.chance() {
-        return inner;
-    }
-    let len = |rng: &mut Rng| match rng.below(4) {
-        0 => Some(Len::px(20.0 + rng.below(180) as f32)),
-        1 => Some(Len::LEFTOVER),
-        _ => None,
-    };
-    Node::Sized(len(rng), len(rng), Box::new(inner))
-}
-
-fn grow(rng: &mut Rng, depth: usize) -> Node {
-    if depth == 0 {
-        return match rng.below(4) {
-            0 => Node::Text(1 + rng.below(WORDS.len()), true),
-            1 => Node::OneLine,
-            _ => Node::Rect,
-        };
-    }
-    let len = |rng: &mut Rng| match rng.below(4) {
-        0 => Some(Len::px(20.0 + rng.below(180) as f32)),
-        1 => Some(Len::LEFTOVER),
-        2 => Some(Len::rel(0.25 + rng.below(3) as f32 * 0.25)),
-        _ => None,
-    };
-    let kid = |rng: &mut Rng| {
-        let inner = grow(rng, depth - 1);
-        sized(rng, inner)
-    };
-    match rng.below(8) {
-        0 => Node::Scroll(rng.chance(), Box::new(kid(rng))),
-        1 => Node::Aligned(rng.below(4) as u8, rng.below(4) as u8, Box::new(kid(rng))),
-        2 => Node::Pad(rng.below(24) as f32, Box::new(kid(rng))),
-        3 => Node::Sized(len(rng), len(rng), Box::new(kid(rng))),
-        4 => Node::Branch(
-            Box::new(kid(rng)),
-            Box::new(kid(rng)),
-            Box::new(kid(rng)),
-            rng.below(500) as f32,
-        ),
-        5 => Node::Stack((0..2 + rng.below(2)).map(|_| kid(rng)).collect()),
-        _ => {
-            let kids: Vec<_> = (0..2 + rng.below(3)).map(|_| kid(rng)).collect();
-            let order = (0..kids.len()).collect();
-            Node::Span(rng.chance(), rng.below(3) as f32 * 4.0, kids, order)
-        }
-    }
-}
-
-#[derive(Clone, Copy, PartialEq)]
-enum Case {
-    Resize,
-    Repaint,
-    ResizeRepaint,
-    Reorder,
-    SizeChange,
-}
-
-/// A different declared length, kept the same kind so the change is to the
-/// value alone.
-fn resized_len(len: Option<Len>) -> Option<Len> {
-    let half = Rel::from_f32(0.5);
-    len.map(|len| Len {
-        px: len.px.mul(half) + Px::from_int(13),
-        rel: len.rel.mul(half),
-        leftover: len.leftover,
-    })
-}
-
-/// Every declared size changed, as a tree rather than as a change.
-fn resized(node: &Node) -> Node {
-    match node {
-        Node::Span(down, gap, kids, order) => Node::Span(
-            *down,
-            *gap,
-            kids.iter().map(resized).collect(),
-            order.clone(),
-        ),
-        Node::Stack(kids) => Node::Stack(kids.iter().map(resized).collect()),
-        Node::Pad(p, k) => Node::Pad(*p, Box::new(resized(k))),
-        Node::Aligned(x, y, k) => Node::Aligned(*x, *y, Box::new(resized(k))),
-        Node::Sized(x, y, k) => Node::Sized(resized_len(*x), resized_len(*y), Box::new(resized(k))),
-        Node::Scroll(d, k) => Node::Scroll(*d, Box::new(resized(k))),
-        Node::Branch(p, a, b, at) => Node::Branch(
-            Box::new(resized(p)),
-            Box::new(resized(a)),
-            Box::new(resized(b)),
-            *at,
-        ),
-        leaf => leaf.clone(),
-    }
-}
-
-/// Every span's children rotated by one, as a tree rather than as a change:
-/// what a warm frame reaches by moving them has to be where growing them that
-/// way lands.
-fn reordered(node: &Node) -> Node {
-    match node {
-        Node::Span(down, gap, kids, order) => {
-            let kids = kids.iter().map(reordered).collect::<Vec<_>>();
-            let mut order = order.clone();
-            order.rotate_left(1);
-            Node::Span(*down, *gap, kids, order)
-        }
-        Node::Stack(kids) => Node::Stack(kids.iter().map(reordered).collect()),
-        Node::Pad(p, k) => Node::Pad(*p, Box::new(reordered(k))),
-        Node::Aligned(x, y, k) => Node::Aligned(*x, *y, Box::new(reordered(k))),
-        Node::Sized(x, y, k) => Node::Sized(*x, *y, Box::new(reordered(k))),
-        Node::Scroll(d, k) => Node::Scroll(*d, Box::new(reordered(k))),
-        Node::Branch(p, a, b, at) => Node::Branch(
-            Box::new(reordered(p)),
-            Box::new(reordered(a)),
-            Box::new(reordered(b)),
-            *at,
-        ),
-        leaf => leaf.clone(),
-    }
-}
-
-/// Runs one scenario warm and cold and says where they disagree.
-fn diverges(node: &Node, case: Case) -> Option<String> {
-    let resizes = matches!(case, Case::Resize | Case::ResizeRepaint);
-    let repaints = matches!(case, Case::Repaint | Case::ResizeRepaint);
-    let start = if resizes { OUTER } else { INNER };
-    let mut warm = Harness::new(start);
-    let mut warm_ids = Vec::new();
-    let mut warm_spans = Vec::new();
-    let mut warm_sized = Vec::new();
-    let root = node.build(&mut warm, &mut warm_ids, &mut warm_spans, &mut warm_sized);
-    warm.state.root = Some(root);
-    // The frame that makes it warm: without it there is nothing retained and
-    // the comparison is two cold starts agreeing with each other.
-    warm.frame();
-    if resizes {
-        warm.resize(INNER);
-        warm.frame();
-    }
-    if repaints {
-        for &id in &warm_ids {
-            warm.rsc.widgets_mut().get_dyn_mut(id);
-        }
-        warm.frame();
-    }
-    if case == Case::Reorder {
-        for span in &warm_spans {
-            warm.rsc[*span].children.rotate_left(1);
-        }
-        warm.frame();
-    }
-    if case == Case::SizeChange {
-        let mut lens = Vec::new();
-        node.sized_lens(&mut lens);
-        for (id, (x, y)) in warm_sized.iter().zip(lens) {
-            warm.rsc.widgets_mut().set_size_rules(*id, x, y);
-        }
-        warm.frame();
-    }
-
-    // What the warm tree was moved into, grown that way from the start.
-    let want = match case {
-        Case::Reorder => reordered(node),
-        Case::SizeChange => resized(node),
-        _ => node.clone(),
-    };
-    let mut cold = Harness::new(INNER);
-    let mut cold_ids = Vec::new();
-    let mut cold_spans = Vec::new();
-    let mut cold_sized = Vec::new();
-    let root = want.build(&mut cold, &mut cold_ids, &mut cold_spans, &mut cold_sized);
-    cold.state.root = Some(root);
-    cold.frame();
-
-    for (i, (&w, &c)) in warm_ids.iter().zip(&cold_ids).enumerate() {
-        let (got, want) = (warm.region(&w), cold.region(&c));
-        // To a couple of steps of the grid, each a thousandth of a pixel: a
-        // move or a resize lands on the same number now, and a length
-        // measured one way against the same length composed another can
-        // still be a step out per composition between them.
-        let same = match (got, want) {
-            (Some(g), Some(c)) => {
-                let d = |a: Px, b: Px| (a - b).abs() <= Px::STEP.mul_int(AGREE_STEPS);
-                d(g.top_left.x, c.top_left.x)
-                    && d(g.top_left.y, c.top_left.y)
-                    && d(g.bot_right.x, c.bot_right.x)
-                    && d(g.bot_right.y, c.bot_right.y)
-            }
-            (None, None) => true,
-            _ => false,
-        };
-        if !same {
-            return Some(format!("widget {i}: warm {got:?} cold {want:?}"));
-        }
-    }
-    None
-}
-
-/// Takes the first simplification that still fails, until none does.
-fn shrink(mut node: Node, case: Case) -> Node {
-    loop {
-        let Some(next) = node
-            .smaller()
-            .into_iter()
-            .find(|small| diverges(small, case).is_some())
-        else {
-            return node;
-        };
-        node = next;
-    }
-}
-
-/// One thread per core but one, each taking a share of the seeds: a tree is
-/// grown, laid out and dropped within a seed, so nothing is shared. A seed
-/// that fails shrinks on its own thread and panics there, which brings the
-/// scope down with it.
-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)));
-        }
-    });
-}
-
-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)
-}
-
-#[test]
-#[ignore = "a fuzzer; run it once the ordinary tests pass"]
-fn no_grown_tree_lays_out_differently_warm_than_cold() {
-    let seeds: u64 = env("SHRINK_SEEDS", 400);
-    let depth: usize = env("SHRINK_DEPTH", 5);
-    let case = match env("SHRINK_CASE", String::from("resize")).as_str() {
-        "repaint" => Case::Repaint,
-        "resize-repaint" => Case::ResizeRepaint,
-        "reorder" => Case::Reorder,
-        "size-change" => Case::SizeChange,
-        _ => Case::Resize,
-    };
-
-    over_seeds((1..=seeds).collect(), |seed| {
-        let node = grow(&mut Rng::new(seed), depth);
-        let Some(how) = diverges(&node, case) else {
-            return;
-        };
-        let small = shrink(node.clone(), case);
-        println!(
-            "seed {seed}: {how}\ngrown {} widgets, shrank to {}\n{small:#?}",
-            node.size(),
-            small.size()
-        );
-        panic!("seed {seed} lays out differently warm than cold");
-    });
-    let sizes: Vec<usize> = (1..=seeds)
-        .map(|seed| grow(&mut Rng::new(seed), depth).size())
-        .collect();
-    let total: usize = sizes.iter().sum();
-    println!(
-        "{seeds} trees at depth {depth} agree: {} widgets total, largest {}",
-        total,
-        sizes.iter().max().copied().unwrap_or(0)
-    );
-}

tests/suite.rs

@@ -1,32 +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/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;

tests/trace_unsettled.rs

@@ -1,140 +0,0 @@
-//! Traces the six-widget tree in `unsettled.rs`, to see what box its 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).add(&mut h.rsc);
-    let sized = wrapped.width(76).add(&mut h.rsc);
-    let aligned = sized;
-    h.rsc
-        .widgets_mut()
-        .set_alignment(sized, Axis::X, AxisAlign::POS);
-    h.rsc
-        .widgets_mut()
-        .set_alignment(sized, Axis::Y, AxisAlign::POS);
-    let stack = Stack {
-        children: vec![plain.add_strong(&mut h.rsc), aligned.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(),
-        sized.id(),
-        aligned.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,
-                pixel_size,
-                ..
-            } if *id == text => {
-                println!(
-                    "  draw in {:.2}x{:.2}  region {region:?}",
-                    pixel_size.x, pixel_size.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().get_dyn_mut(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);
-    let aligned = text;
-    h.rsc
-        .widgets_mut()
-        .set_alignment(text, Axis::X, AxisAlign::NEG);
-    let inner = (aligned,).span(Dir::RIGHT).add(&mut h.rsc);
-    let sized = inner.sized((189, 176)).add(&mut h.rsc);
-    let filler = rect(Color::RED).add(&mut h.rsc);
-    let root = (filler, sized).span(Dir::RIGHT).add(&mut h.rsc);
-    h.state.root = Some(root.add_strong(&mut h.rsc));
-    vec![
-        text.id(),
-        aligned.id(),
-        inner.id(),
-        sized.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();
-}