WIP: Pad outside, Inset inside, and a report read raw

`Pad` moves its child's box in rather than shrinking it, `Inset` is the old
behaviour under a new name, and `in_parent_frame`'s composition and the
`reports_of` argument are gone -- a report comes up raw and the parent says
what it is a fraction of, which `Inset` does for itself.

Not landed. Everything passes except the new `Inset` test: a child declaring
`rel(0.5)` under an inset comes out 47.5 px wide of the 190 inside rather
than 95, and I have not accounted for where the second halving is. The
`Pad` half is green on its own -- the three tests that changed to `.inset()`
were using padding as scaffolding -- but landing it without a working
`Inset` would break every `.pad()` that meant inset.

core/src/orientation/axis.rs

@@ -7,17 +7,6 @@ pub enum Axis {
     Y,
 }
 
-impl Axis {
-    /// A per-axis pair with `aligned` on this axis and `ortho` on the other,
-    /// which is what `from_axis` does for a vector.
-    pub fn pair<T>(self, aligned: T, ortho: T) -> [T; 2] {
-        match self {
-            Self::X => [aligned, ortho],
-            Self::Y => [ortho, aligned],
-        }
-    }
-}
-
 impl std::ops::Not for Axis {
     type Output = Self;
 

core/src/render/mod.rs

@@ -106,8 +106,7 @@ impl UiRenderNode {
             self.active.push(i);
             for change in draws.apply_free() {
                 if let Some(inst) = ui_render.active.get_mut(&change.id) {
-                    for primitive in &mut inst.primitives {
-                        let h = &mut primitive.handle;
+                    for h in &mut inst.primitives {
                         if h.layer == i && h.kind == change.kind && h.inst_idx == change.old {
                             h.inst_idx = change.new;
                             break;

core/src/ui/active.rs

@@ -1,6 +1,6 @@
 use crate::{
-    DrawRegion, LayerId, LayoutHolds, LayoutLen, MaskIdx, MoveIdx, RegionAlign, RetainedPrimitive,
-    Size, TextureHandle, UiRegion, UiVec2, WidgetId,
+    Holds, LayerId, LayoutLen, MaskIdx, MoveIdx, PrimitiveHandle, RegionAlign, Size, TextureHandle,
+    UiRegion, UiVec2, WidgetId,
 };
 
 /// What is kept of a widget its parent has asked about. `drawn` says whether
@@ -9,12 +9,12 @@ use crate::{
 #[derive(Debug)]
 pub struct ActiveData {
     pub id: WidgetId,
-    /// The box its parent gave it, in `parent_move`'s coordinates: what it
-    /// was asked about, and what a fraction under it is a fraction of. A
-    /// local redraw asks here.
+    /// The box its drawing is in, in `parent_move`'s coordinates.
     pub region: UiRegion,
-    /// Where its drawing sits inside that box, in the box's own coordinates.
-    pub placement: UiRegion,
+    /// The box its parent gave it, in the same coordinates: what it was
+    /// asked about, before its own answer placed its drawing inside it.
+    /// `region` is that placement, and a local redraw asks here.
+    pub given: UiRegion,
     /// The same box as lengths of its parent's box, which is the one route
     /// to a box in pixels: a draw threads these down a level at a time, and
     /// [`crate::UiRenderState::redraw`] takes the same steps back up.
@@ -25,14 +25,13 @@ pub struct ActiveData {
     /// asked again -- and a chain of fractions has no frame in it, which is
     /// why a region node between two widgets cannot break it.
     pub offer_len: UiVec2,
-    pub offer_placement: [Option<crate::UiSpan>; 2],
-    /// The measured answer and its dependencies. A hint-only dependency or
-    /// a widget first encountered during placement has no measurement yet.
-    pub answer: Option<(Size, LayoutHolds)>,
+    /// 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 frame, extent and explicit placement reads that this drawing holds for.
-    pub holds: LayoutHolds,
+    /// 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
@@ -40,9 +39,7 @@ pub struct ActiveData {
     /// widget a frame visits and cannot drift while one is being drawn.
     pub depth: usize,
     pub textures: Vec<TextureHandle>,
-    pub primitives: Vec<RetainedPrimitive>,
-    pub mask_region: Option<DrawRegion>,
-    pub inherited_children: Vec<WidgetId>,
+    pub primitives: Vec<PrimitiveHandle>,
     pub children: Vec<WidgetId>,
     /// The children whose size this widget read while drawing.
     pub size_deps: Vec<WidgetId>,
@@ -73,18 +70,8 @@ pub struct ActiveData {
 }
 
 impl ActiveData {
-    /// Whether what it answered still stands for a box of these pixel
-    /// lengths -- the box it was asked in, where `holds` is about the box its
-    /// answer then chose.
-    pub fn answers_at(&self, px: crate::PxVec2) -> bool {
-        self.answer.is_some_and(|(_, holds)| {
-            holds.contains(
-                px,
-                UiRegion {
-                    x: self.offer_placement[0].unwrap_or(crate::UiSpan::FULL),
-                    y: self.offer_placement[1].unwrap_or(crate::UiSpan::FULL),
-                },
-            )
-        })
+    /// 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/draw_region.rs

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

core/src/ui/layout_holds.rs

@@ -1,33 +0,0 @@
-use crate::{Axis, Holds, PxVec2, UiRegion};
-
-/// Dependencies of one evaluation, before the frame and extent are composed.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct LayoutHolds {
-    pub frame: [Holds; 2],
-    pub extent: [Holds; 2],
-    pub placement: Option<UiRegion>,
-}
-
-impl LayoutHolds {
-    pub const ANY: Self = Self {
-        frame: [Holds::ANY; 2],
-        extent: [Holds::ANY; 2],
-        placement: None,
-    };
-
-    pub fn contains(self, px: PxVec2, placement: UiRegion) -> bool {
-        self.placement.is_none_or(|old| old == placement)
-            && [Axis::X, Axis::Y].into_iter().all(|axis| {
-                self.frame[axis as usize].contains(px.axis(axis))
-                    && self.extent[axis as usize]
-                        .contains(placement.axis(axis).len().to_px(px.axis(axis)))
-            })
-    }
-
-    pub fn in_frame(self, placement: UiRegion) -> [Holds; 2] {
-        [Axis::X, Axis::Y].map(|axis| {
-            self.frame[axis as usize]
-                .and(self.extent[axis as usize].through(placement.axis(axis).len()))
-        })
-    }
-}

core/src/ui/mod.rs

@@ -10,16 +10,12 @@ use crate::{
 pub const CHAIN_LIMIT: u32 = 64;
 
 mod active;
-mod draw_region;
 mod holds;
-mod layout_holds;
 mod painter;
 mod render_state;
 
 pub use active::*;
-pub use draw_region::*;
 pub use holds::*;
-pub use layout_holds::*;
 pub use painter::{Painter, PrimitiveLike};
 pub use render_state::*;
 

core/src/ui/painter.rs

@@ -1,12 +1,12 @@
 #[cfg(feature = "layout-diagnostics")]
 use crate::layout_diagnostics::{self as diag, Counter};
 use crate::{
-    Axis, DrawRegion, Holds, LayoutLen, Len, Px, PxVec2, RegionAlign, RenderedText,
-    RetainedPrimitive, Size, StrongWidget, TextAttrs, TextBuffer, TextData, TextureHandle,
-    UiRegion, UiRenderState, UiRsc, UiSpan, UiVec2, Weight, WidgetId, Widgets,
+    Axis, Holds, LayoutLen, Len, Px, PxVec2, RegionAlign, RenderedText, Size, StrongWidget,
+    TextAttrs, TextBuffer, TextData, TextureHandle, UiRegion, UiRenderState, UiRsc, UiVec2, Weight,
+    WidgetId, Widgets,
     render::{
-        GlyphPrimitive, Mask, MaskIdx, MoveIdx, Primitive, PrimitiveInst, PrimitiveKind,
-        TexturePrimitive,
+        GlyphPrimitive, Mask, MaskIdx, MoveIdx, Primitive, PrimitiveHandle, PrimitiveInst,
+        PrimitiveKind, TexturePrimitive,
     },
     ui::render_state::DrawInfo,
 };
@@ -17,20 +17,8 @@ pub struct Painter<'a> {
     pub(super) state: &'a mut UiRenderState,
     pub(super) rsc: &'a mut dyn UiRsc,
 
-    /// The box its parent gave it, in the coordinates of `move_idx`: what a
-    /// fraction of this widget's area is a fraction of, and what every region
-    /// it writes composes within. The same box on the ask that measures and
-    /// the ask that places, which is what keeps a fraction under it from
-    /// being resolved twice.
+    /// This widget's box, in the coordinates of `move_idx`.
     pub(super) region: UiRegion,
-    /// Where this widget's drawing sits inside that box, in the box's own
-    /// coordinates: `FULL` while its answer is not yet known, and the box
-    /// its answer or its parent chose once one of them has.
-    pub(super) placement: UiRegion,
-    /// Whether this draw read its placement, which makes the drawing one
-    /// that holds for that placement alone -- the way reading a length in
-    /// pixels makes it hold for that length.
-    pub(super) reads_placement: bool,
     /// That box in pixels, which its children's are a length of: threaded
     /// down from the box this widget was given rather than composed back up
     /// the chain, so every length in layout is one multiply from its
@@ -38,11 +26,7 @@ pub struct Painter<'a> {
     pub(super) px: PxVec2,
     pub(super) mask: MaskIdx,
     pub(super) textures: Vec<TextureHandle>,
-    pub(super) primitives: Vec<RetainedPrimitive>,
-    pub(super) mask_region: Option<DrawRegion>,
-    pub(super) inherited_children: Vec<WidgetId>,
-    pub(super) extent_own: [Holds; 2],
-    pub(super) extent_under: [Holds; 2],
+    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.
@@ -73,13 +57,13 @@ pub struct Painter<'a> {
 }
 
 impl<'a> Painter<'a> {
-    fn primitive_at<P: Primitive>(&mut self, primitive: P, region: DrawRegion) {
+    fn primitive_at<P: Primitive>(&mut self, primitive: P, region: UiRegion) {
         let kind = self.rsc.ui_mut().primitives.kind::<P>();
         self.write(kind, primitive, region);
     }
 
     /// Takes the kind, for a caller writing many of one primitive.
-    fn write<P: Primitive>(&mut self, kind: PrimitiveKind<P>, primitive: P, region: DrawRegion) {
+    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(
@@ -88,15 +72,15 @@ impl<'a> Painter<'a> {
                 kind,
                 id: self.id,
                 primitive,
-                region: region.resolve(self.region, self.placement),
+                region,
                 mask_idx: self.mask,
                 move_idx: self.move_idx,
             },
         );
-        self.push_primitive(RetainedPrimitive { handle: h, region });
+        self.push_primitive(h);
     }
 
-    fn push_primitive(&mut self, h: RetainedPrimitive) {
+    fn push_primitive(&mut self, h: PrimitiveHandle) {
         if self.mask != MaskIdx::NONE {
             // TODO: I have no clue if this works at all :joy:
             self.rsc.ui_mut().masks.push_ref(self.mask);
@@ -104,42 +88,28 @@ impl<'a> Painter<'a> {
         self.primitives.push(h);
     }
 
-    /// Writes a primitive over the whole of this widget's own box.
+    /// Writes a primitive to be rendered
     pub fn primitive(&mut self, primitive: impl PrimitiveLike) {
-        let at = DrawRegion::Extent(UiRegion::FULL);
         let primitive = primitive.into_primitive(self);
-        self.primitive_at(primitive, at)
+        self.primitive_at(primitive, self.region)
     }
 
-    /// Writes in the frame by default. `DrawRegion::Extent` keeps the local
-    /// geometry attached to this widget's box without reading its placement.
-    pub fn primitive_within(
-        &mut self,
-        primitive: impl PrimitiveLike,
-        region: impl Into<DrawRegion>,
-    ) {
+    pub fn primitive_within(&mut self, primitive: impl PrimitiveLike, region: UiRegion) {
         let primitive = primitive.into_primitive(self);
-        self.primitive_at(primitive, region.into());
+        self.primitive_at(primitive, region.within(&self.region));
     }
 
-    /// Sets a mask in the selected frame or extent coordinates.
-    pub fn set_mask(&mut self, region: impl Into<DrawRegion>) {
-        let region = region.into();
-        self.mask_region = Some(region);
+    pub fn set_mask(&mut self, region: UiRegion) {
         assert!(self.mask == MaskIdx::NONE);
         self.mask = self.rsc.ui_mut().masks.push(Mask {
-            region: region.resolve(self.region, self.placement),
+            region,
             move_idx: self.move_idx,
         });
     }
 
-    /// Draws a widget in the whole of this widget's own box: it gets the
-    /// same region -- the same area for its fractions to be of -- and is put
-    /// where this widget was put. What a container that is only a wrapper
-    /// around one child wants, since its box is the child's.
+    /// 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> {
-        let own = self.placement;
-        self.widget_at_inner(id, UiRegion::FULL, [Some(own.x), Some(own.y)], true)
+        self.widget_within(id, UiRegion::FULL)
     }
 
     /// What a widget's rules declare its lengths to be, which whoever draws
@@ -155,63 +125,45 @@ impl<'a> Painter<'a> {
     /// 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.inherited_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 region, and is the child's own region: what its declared lengths
-    /// and its report are fractions of. Where its drawing sits inside that is
-    /// its own answer placed by its alignment.
+    /// 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; 2])
+        self.widget_at(id, region, [false; 2])
     }
 
-    /// Draws a widget in `region`, saying where in it the drawing goes.
-    ///
-    /// `region` is the child's own area: what a fraction it declares or
-    /// reports is a fraction of, and the coordinates the regions it writes
-    /// compose within. It is the same box on the ask that measures and the
-    /// ask that places, which is what stops a fraction under it being
-    /// resolved twice.
-    ///
-    /// `placement` is what of that region the child's drawing takes, per
-    /// axis, wherever this widget is choosing. `None` leaves the axis to the
-    /// child's own answer and alignment, which is what
-    /// [`Self::widget_within`] passes. A span passes the whole row as the
-    /// region, so `rel(0.5)` is half the row wherever the child sits in it,
-    /// and places the child by passing the slot along its axis.
+    /// Draws a widget in a box this widget chose from the widget's own
+    /// answer along the `decided` axes. On those the answer is not placed
+    /// inside the box again: it already is the box, and a fraction the
+    /// widget reported, taken of this box a second time, would shrink it
+    /// twice. A container uses this where it hands back exactly what a child
+    /// asked for -- a span placing a child at the length it reported, a
+    /// scroll giving its content the content's own length.
     pub fn widget_at<'s, W: ?Sized>(
         &'s mut self,
         id: &'s StrongWidget<W>,
         region: UiRegion,
-        placement: [Option<UiSpan>; 2],
+        decided: [bool; 2],
     ) -> DrawResult<'s, 'a, W> {
-        self.widget_at_inner(id, region, placement, false)
-    }
-
-    fn widget_at_inner<'s, W: ?Sized>(
-        &'s mut self,
-        id: &'s StrongWidget<W>,
-        region: UiRegion,
-        placement: [Option<UiSpan>; 2],
-        inherited: bool,
-    ) -> DrawResult<'s, 'a, W> {
-        if inherited {
-            if !self.inherited_children.contains(&id.id()) {
-                self.inherited_children.push(id.id());
-            }
-        } else {
-            self.inherited_children.retain(|child| *child != id.id());
-        }
         let region_node = self.rsc.widgets().is_region_node(id.id());
         let declared = self.declared_lens(id);
         let align = self.rsc.widgets().alignment(id.id());
-        let (local, placement) = ask_box(region, declared, align, placement);
+        // 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),
@@ -235,16 +187,11 @@ impl<'a> Painter<'a> {
                 .get(&id.id())
                 .map_or(given_len, |a| a.offer_len),
         };
-        let offer_placement = if first_ask {
-            placement
-        } else {
-            self.state
-                .active
-                .get(&id.id())
-                .map_or(placement, |a| a.offer_placement)
-        };
         let px = given_len.to_px(self.px);
         let offered_px = offer_len.to_px(self.offered_px);
+        // Whether this ask is the child's offer question, which is a question
+        // about lengths: the same lengths somewhere else is the same question.
+        let answers_offer = self.at_offer && px == offered_px;
         // 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.
@@ -260,36 +207,33 @@ impl<'a> Painter<'a> {
                 mask: self.mask,
                 given_len,
                 offer_len,
-                offer_placement,
                 px,
                 offered_px,
-                placement,
+                decided,
             },
             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 in AXES {
-            let n = axis as usize;
-            let frame = holds.frame[n].through(local.axis(axis).len());
-            self.under[n] = self.under[n].and(frame);
-            if inherited && declared[n].is_none() {
-                self.extent_under[n] = self.extent_under[n].and(holds.extent[n]);
-                self.reads_placement |= holds.placement.is_some();
-            } else {
-                let extent = placement[n].unwrap_or(UiSpan::FULL).len();
-                self.under[n] = self.under[n].and(
-                    holds.extent[n]
-                        .through(extent)
-                        .through(local.axis(axis).len()),
-                );
-            }
+        for (axis, under) in AXES.into_iter().zip(self.under.iter_mut()) {
+            *under = under.and(holds[axis as usize].through(local.axis(axis).len()));
         }
+        // The answer as it was given. A fraction in it is a fraction of this
+        // widget's box, which is the same thing a rule beside the child
+        // means and the same thing for every box this widget hands out: a
+        // span offers each child the room left from its cursor, because a
+        // text has to wrap at the width actually there, and `rel(0.5)` is
+        // still half the span. Padding is outside what it pads for the same
+        // reason -- inset the fraction and a child's `rel` would mean the
+        // inner box while its `px` meant the outer one.
         DrawResult {
             child: id,
             painter: self,
-            size: in_parent_frame(size, local.size(), declared),
+            size,
         }
     }
 
@@ -321,50 +265,40 @@ impl<'a> Painter<'a> {
         }
     }
 
-    /// A child's length in the region it is about to be offered, if it can
-    /// be had without drawing it: from its hint, or from a drawing it already
+    /// 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>(
         &mut self,
         child: &StrongWidget<W>,
         axis: Axis,
         region: UiRegion,
-        placement: [Option<UiSpan>; 2],
     ) -> Option<LayoutLen> {
         let declared = self.declared_lens(child);
         let align = self.rsc.widgets().alignment(child.id());
-        let (local, placement) = ask_box(region, declared, align, placement);
-        let first_ask = self.at_offer && !self.offered.contains(&child.id());
-
+        let local = declared_box(region, declared, align);
+        let first_ask = self.offer(child.id());
+        if first_ask && let Some(active) = self.state.active.get_mut(&child.id()) {
+            active.offer_len = local.size();
+        }
         if let Some(hint) = self.size_hint(child, axis) {
             return Some(hint);
         }
         let px = local.size().to_px(self.px);
-        let (size, holds) = self.state.retained_size(
-            child.id(),
-            px,
-            placement,
-            self.move_idx,
-            self.rsc.widgets(),
-        )?;
+        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 {
-            self.offered.push(child.id());
             let active = self.state.active.get_mut(&child.id()).unwrap();
-            active.offer_len = local.size();
-            active.offer_placement = placement;
+            active.answer = (size, holds);
         }
-        let placement = UiRegion {
-            x: placement[0].unwrap_or(UiSpan::FULL),
-            y: placement[1].unwrap_or(UiSpan::FULL),
-        };
-        let holds = holds.in_frame(placement);
         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(in_parent_frame(size, local.size(), declared).axis(axis))
+        Some(size.axis(axis))
     }
 
     /// Whether this is the first box a child is asked about in during a draw
@@ -396,24 +330,20 @@ impl<'a> Painter<'a> {
         ui.text.render(buffer, attrs, width)
     }
 
-    /// Writes glyphs in the selected frame or extent coordinates.
     // TODO: merge the text methods into the primitive ones.
-    pub fn glyphs(&mut self, text: &RenderedText, origin: impl Into<DrawRegion>) {
-        let origin = origin.into();
+    pub fn glyphs(&mut self, text: &RenderedText, origin: UiRegion) {
         let kind = self.rsc.ui_mut().primitives.kind::<GlyphPrimitive>();
         for glyph in text.glyphs.iter() {
-            let region = origin.map(|mut region| {
-                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);
-                region
-            });
+            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);
             self.write(
                 kind,
                 GlyphPrimitive {
@@ -428,26 +358,12 @@ impl<'a> Painter<'a> {
         }
     }
 
-    /// The box this widget's parent gave it, in the coordinates its own
-    /// primitives are written in -- so a region composed `within` it may be
-    /// drawn directly. Its own box is [`Self::placement`] of this one.
+    /// 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's drawing goes inside the box it was given, in that
-    /// box's coordinates: what its own answer took of it, or what its parent
-    /// chose for it. `FULL` on the ask that measures, since nothing has been
-    /// placed yet.
-    ///
-    /// Reading it is what says the drawing depends on it, so a widget that
-    /// positions its own content reads it and is drawn again once its box is
-    /// known, and one that fills whatever it is given never is.
-    pub fn placement(&mut self) -> UiRegion {
-        self.reads_placement = true;
-        self.placement
-    }
-
     /// 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.
@@ -481,44 +397,20 @@ impl<'a> Painter<'a> {
         placed_box(UiRegion::FULL, lens, RegionAlign::NEAR)
     }
 
-    /// This widget's own box in pixels. Reading it makes the drawing one
-    /// that holds for this box only, until `holds` says how far it goes.
+    /// 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 {
-        PxVec2::new(self.px_len(Axis::X), self.px_len(Axis::Y))
+        for (own, len) in self.own.iter_mut().zip([self.px.x, self.px.y]) {
+            if *own == Holds::ANY {
+                *own = Holds::at(len);
+            }
+        }
+        self.px
     }
 
-    /// One axis of this widget's own box in pixels. Prefer this to
+    /// 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 part = self.placement.axis(axis).len();
-        let len = part.to_px(self.px.axis(axis));
-        let own = &mut self.extent_own[axis as usize];
-        if *own == Holds::ANY {
-            *own = Holds::at(len);
-        }
-        len
-    }
-
-    /// The lengths of this widget's own 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 part = self.placement.axis(axis).len();
-        let holds = holds.into();
-        debug_assert!(
-            holds.contains(part.to_px(self.px.axis(axis))),
-            "'{}' ({:?}) says its drawing holds for lengths that leave out its own box",
-            self.label(),
-            self.id
-        );
-        self.extent_own[axis as usize] = holds;
-    }
-
-    /// One axis of the box this widget's parent gave it, in pixels -- what a
-    /// fraction of its area resolves against, and so what a container divides
-    /// among its children. Its own box is a part of this one.
-    pub fn region_px_len(&mut self, axis: Axis) -> Px {
         let len = self.px.axis(axis);
         let own = &mut self.own[axis as usize];
         if *own == Holds::ANY {
@@ -527,14 +419,15 @@ impl<'a> Painter<'a> {
         len
     }
 
-    /// [`Self::holds`] stated about the region rather than about this
-    /// widget's own box, for a container whose drawing turns on the box it
-    /// was given rather than on the part of it it took.
-    pub fn region_holds(&mut self, axis: Axis, holds: impl Into<Holds>) {
+    /// 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.px.axis(axis)),
-            "'{}' ({:?}) says its drawing holds for lengths that leave out its region",
+            "'{}' ({:?}) says its drawing holds for lengths that leave out its own box",
             self.label(),
             self.id
         );
@@ -624,21 +517,6 @@ impl PrimitiveLike for &TextureHandle {
     }
 }
 
-/// A child's answer as lengths of the parent's own region. A widget reports
-/// a fraction of its own region, and `of` is that region as a length of this
-/// one. Pixels come through untouched, being that many pixels wherever they
-/// end up. A declared axis is already the parent's: it resolved the rule in
-/// its own region, and the rule is what the report says.
-fn in_parent_frame(size: Size, of: UiVec2, declared: [Option<LayoutLen>; 2]) -> Size {
-    let mut size = size;
-    for (axis, declared) in AXES.into_iter().zip(declared) {
-        if declared.is_none() {
-            *size.axis_mut(axis) = size.axis(axis).within_len(of.axis(axis));
-        }
-    }
-    size
-}
-
 /// 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.
@@ -662,9 +540,9 @@ pub(crate) fn declared_lens(widgets: &Widgets, id: WidgetId) -> [Option<LayoutLe
 /// Whether what a widget reported along an axis is the whole of the box it
 /// is in rather than a part to be placed inside it. 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 does too: the rule already gave
-/// the region its length, and the rule's length is what the widget reports
-/// there. And an axis the parent decided from the answer is
+/// that handed down this box. A declared axis does too: `declared_box`
+/// already placed it, in the parent's box, and the rule's length is what the
+/// widget reports there. And an axis the parent decided from the answer is
 /// the answer already.
 pub(crate) fn fills(reported: LayoutLen, declared: Option<LayoutLen>, decided: bool) -> bool {
     reported.leftover != Weight::ZERO || declared.is_some() || decided
@@ -712,35 +590,21 @@ pub(crate) fn placed_box(region: UiRegion, lens: UiVec2, align: RegionAlign) ->
     placed
 }
 
-/// A child's own region and where in it its drawing goes, from the box it is
-/// offered, the lengths its rules declare, and what its parent chose.
-///
-/// A rule gives the region its length outright -- that is what makes a rule
-/// win, and it is why a widget under one never learns of it -- and the region
-/// then sits where its parent placed it, or where its alignment says if its
-/// parent left the axis open. With no rule the region is the whole of what
-/// was offered, since that is the area a fraction under it is a fraction of,
-/// and what the parent chose is where in it the drawing goes. So the two
-/// coordinate spaces are the same one wherever a placement survives.
-pub(crate) fn ask_box(
+/// 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<LayoutLen>; 2],
     align: RegionAlign,
-    placement: [Option<UiSpan>; 2],
-) -> (UiRegion, [Option<UiSpan>; 2]) {
-    let mut placed = [None; 2];
-    for (axis, (len, chosen)) in AXES.into_iter().zip(declared.into_iter().zip(placement)) {
-        let Some(len) = len else {
-            placed[axis as usize] = chosen;
-            continue;
-        };
+) -> UiRegion {
+    for (axis, len) in AXES.into_iter().zip(declared) {
+        let Some(len) = len else { continue };
         let span = region.axis_mut(axis);
         let len = Len::from_parts(len.rel, len.px);
-        span.start = match chosen {
-            Some(chosen) => chosen.start,
-            None => span.start + (span.len() - len).scale(align.axis(axis).rel()),
-        };
+        span.start += (span.len() - len).scale(align.axis(axis).rel());
         span.end = span.start + len;
     }
-    (region, placed)
+    region
 }

core/src/ui/render_state.rs

@@ -1,10 +1,10 @@
 #[cfg(feature = "layout-diagnostics")]
 use crate::layout_diagnostics::{self as diag, Counter, ReuseOutcome, TimerKind};
-use crate::ui::painter::{ask_box, declared_lens, placed_box, placed_lens};
+use crate::ui::painter::{declared_box, declared_lens, placed_box, placed_lens};
 use crate::{
-    ActiveData, Axis, DrawLayers, Holds, IdLike, LayoutHolds, LayoutLen, Len, MaskIdx, MoveIdx,
-    Moves, Painter, PixelRegion, Px, PxVec2, Rel, Size, StrongWidget, UiRegion, UiRsc, UiSpan,
-    UiVec2, Weight, WidgetId, Widgets,
+    ActiveData, Axis, DrawLayers, Holds, IdLike, LayoutLen, Len, MaskIdx, MoveIdx, Moves, Painter,
+    PixelRegion, Px, PxVec2, Rel, Size, StrongWidget, UiRegion, UiRsc, UiSpan, UiVec2, Weight,
+    WidgetId, Widgets,
     util::{HashMap, Vec2},
 };
 
@@ -26,32 +26,14 @@ pub(super) struct DrawInfo {
     /// carries them unchanged while its own region is the placement inside.
     pub given_len: UiVec2,
     pub offer_len: UiVec2,
-    pub offer_placement: [Option<UiSpan>; 2],
     /// This ask's box in pixels, and the offer's: one multiply from the
     /// parent's own, which is where every pixel length in layout comes from.
     pub px: PxVec2,
     pub offered_px: PxVec2,
-    /// What of that region the parent chose to put the drawing in, per axis.
-    /// `None` leaves the axis to the widget's own answer and its alignment.
-    /// See [`Painter::widget_at`].
-    pub placement: [Option<UiSpan>; 2],
-}
-
-impl DrawInfo {
-    /// The axes the parent chose the placement on, which are the axes the
-    /// answer is not placed inside its region again.
-    fn decided(&self) -> [bool; 2] {
-        self.placement.map(|span| span.is_some())
-    }
-
-    /// The placement to draw in before the answer is known: what the parent
-    /// chose, and the whole region on any axis it left open.
-    fn offered_placement(&self) -> UiRegion {
-        UiRegion {
-            x: self.placement[0].unwrap_or(UiSpan::FULL),
-            y: self.placement[1].unwrap_or(UiSpan::FULL),
-        }
-    }
+    /// The axes along which the parent chose this box from the widget's own
+    /// answer, so the answer is not placed inside it again. See
+    /// [`Painter::widget_at`].
+    pub decided: [bool; 2],
 }
 
 pub struct UiRenderState {
@@ -61,9 +43,7 @@ pub struct UiRenderState {
 
     old_root: Option<WidgetId>,
     /// Whether the output has changed since the last update. A frame is
-    /// owed for that whether or not anything has to be drawn again: every
-    /// fraction becomes pixels against the output, in the shader's uniform
-    /// as well as here.
+    /// owed for that whether or not anything has to be drawn again.
     resized: bool,
     /// A widget's move slot, which outlives any one `ActiveData`: a redraw
     /// replaces that while its children go on pointing at the slot.
@@ -103,28 +83,13 @@ impl UiRenderState {
     /// size is applied where a fraction becomes pixels -- here in `to_px`,
     /// and in the shader by its uniform. A resize therefore rewrites no
     /// retained entry at all.
-    ///
-    /// The root is the only widget a resize marks, and only where the new
-    /// output falls outside what its answer holds for: that range is the
-    /// intersection of everything under it, so admitting the new output says
-    /// the whole tree still stands. Where it does not, the ordinary walk
-    /// draws the root, and each widget's own range decides how far down the
-    /// new length reaches.
-    pub fn resize(&mut self, size: impl Into<Vec2>, widgets: &mut Widgets) {
+    pub fn resize(&mut self, size: impl Into<Vec2>) {
         let size = PxVec2::from_f32(size.into());
         if size == self.output_size {
             return;
         }
         self.output_size = size;
         self.resized = true;
-        let Some(root) = self.old_root else { return };
-        let stands = self
-            .active
-            .get(&root)
-            .is_some_and(|active| active.answers_at(active.given_len.to_px(size)));
-        if !stands {
-            widgets.needs_redraw.insert(root);
-        }
     }
 
     /// The root is asked about in the output: the window is where a fraction
@@ -143,10 +108,9 @@ impl UiRenderState {
             mask: MaskIdx::NONE,
             given_len: region.size(),
             offer_len: UiVec2::FULL_SIZE,
-            offer_placement: [None; 2],
             px,
             offered_px: px,
-            placement: [None; 2],
+            decided: [false; 2],
         }
     }
 
@@ -179,6 +143,17 @@ impl UiRenderState {
         if self.root_changed(root) {
             self.redraw_all(root, rsc);
             self.old_root = root.map(|r| r.id());
+        } else if let Some(root) = root
+            && self.resized
+        {
+            // The output is the root's box, so a resize is that box changing
+            // length, found the way every other box change is found. Before
+            // anything dirty settles, so that whatever a new output draws
+            // again is drawn once, in the box it will have.
+            let region = Self::root_region(root.id(), rsc.widgets());
+            let info = self.root_info(region);
+            let answer = self.draw_inner(root.id(), region, info, None, rsc);
+            self.active.get_mut(&root.id()).unwrap().answer = answer;
         }
         self.resized = false;
         if rsc.widgets().has_updates() {
@@ -200,13 +175,11 @@ impl UiRenderState {
     }
 
     fn root_region(id: WidgetId, widgets: &Widgets) -> UiRegion {
-        ask_box(
+        declared_box(
             UiRegion::FULL,
             declared_lens(widgets, id),
             widgets.alignment(id),
-            [None; 2],
         )
-        .0
     }
 
     pub(super) fn draw_inner(
@@ -216,108 +189,83 @@ impl UiRenderState {
         info: DrawInfo,
         mut old: Option<ActiveData>,
         rsc: &mut dyn UiRsc,
-    ) -> (Size, LayoutHolds) {
+    ) -> (Size, [Holds; 2]) {
         #[cfg(feature = "layout-diagnostics")]
         {
             diag::bump(Counter::DrawRequests);
             diag::draw_request(id, info.parent, region, info.px, info.region_node);
         }
         let align = rsc.widgets().alignment(id);
-        // Nothing this widget measured can be dirty while it draws: layout is
-        // one bottom-up walk, so anything deeper has settled or deferred to
-        // its own parent, and a deferred one leaves that parent marked.
-        let stale = rsc.widgets().needs_redraw.contains(&id);
+        // Nothing this widget has is an answer while something it measured
+        // is dirty: settling that changes what it would report, and a widget
+        // settled inside its parent's draw tells nobody -- the comparison
+        // that marks a reader is in `redraw`, which is not what asked here.
+        // Both retained routes are an answer, so the question is asked once
+        // rather than by each of them.
+        let stale =
+            rsc.widgets().needs_redraw.contains(&id) || self.dirty_size_under(id, rsc.widgets());
         let replace_answer = self.answer_invalid.remove(&id) || (self.replace_answers && stale);
         let retained = match replace_answer || stale {
             true => None,
             false => self
                 .retained_answer(id, info)
-                .or_else(|| self.try_reuse(id, region, info.offered_placement(), info, rsc)),
+                .or_else(|| self.try_reuse(id, region, info, rsc)),
         };
         let answer = retained.unwrap_or_else(|| {
             if old.is_none() {
                 old = self.remove(id, false, rsc);
             }
-            self.draw_at(id, region, info.offered_placement(), info, old.take(), rsc)
+            self.draw_at(id, region, info, old.take(), rsc)
         });
 
         let declared = declared_lens(rsc.widgets(), id);
-        // Where the drawing goes, in the region's own coordinates: what the
-        // parent chose, and on any axis it left open, what the answer took of
-        // the region placed by the widget's alignment. The region itself does
-        // not change, so nothing under it resolves a fraction a second time.
-        let lens = placed_lens(answer.0, declared, info.decided());
-        let own = placed_box(UiRegion::FULL, lens, align);
-        let placement = UiRegion {
-            x: info.placement[0].unwrap_or(own.x),
-            y: info.placement[1].unwrap_or(own.y),
+        // The second, final ask is in a box chosen from the answer on both
+        // axes, which is also what makes it terminate.
+        let lens = placed_lens(answer.0, declared, info.decided);
+        let placed = placed_box(region, lens, align);
+        let placed_info = DrawInfo {
+            px: lens.to_px(info.px),
+            decided: [true; 2],
+            ..info
         };
-        self.place(id, region, placement, info, rsc);
+        self.place(id, placed, placed_info, rsc);
 
-        // On axes chosen by the parent, measurement and drawing share an
-        // extent. Otherwise the answer fixes the final extent as a function
-        // of the frame, so pull that drawing's validity back through it.
+        // The answer is only reusable while both parts of the operation are:
+        // what the widget reported in the box it was asked in, and what it
+        // drew in the box its report selected. Express the latter's contract
+        // back in terms of the box asked in before handing it to the parent.
         let drawing_holds = self.active[&id].holds;
         let mut settled = answer;
         for axis in AXES {
-            let n = axis as usize;
-            settled.1.frame[n] = settled.1.frame[n].and(drawing_holds.frame[n]);
-            if info.placement[n].is_some() {
-                settled.1.extent[n] = settled.1.extent[n].and(drawing_holds.extent[n]);
-            } else {
-                settled.1.frame[n] = settled.1.frame[n]
-                    .and(drawing_holds.extent[n].through(placement.axis(axis).len()));
-            }
-        }
-        if drawing_holds.placement.is_some() && info.placement.iter().any(Option::is_some) {
-            settled.1.placement = Some(info.offered_placement());
+            settled.1[axis as usize] =
+                settled.1[axis as usize].and(drawing_holds[axis as usize].through(lens.axis(axis)));
         }
 
         let active = self.active.get_mut(&id).unwrap();
         // Whoever asked owns how the box was reached: the box it stated, and
         // what of that box the answer then took. A local redraw asks the
         // same question again from these.
-        active.region = region;
+        active.given = region;
         active.given_len = info.given_len;
         active.offer_len = info.offer_len;
-        if info.placement == info.offer_placement && info.px == info.offered_px {
-            active.answer = Some(settled);
-            active.offer_placement = info.offer_placement;
-        }
-        active.decided = info.decided();
+        active.answer = settled;
+        active.decided = info.decided;
         active.own_align = align;
-        // A subtree can be reused whole under a different parent -- same box,
-        // same layer, same region node -- and nothing in the drawing says it
-        // changed hands. Two things read who its parent is: a deferral, which
-        // marks whoever has it to draw, and the old parent's list of children,
-        // which its next draw undraws whatever is missing from.
-        let old_parent = std::mem::replace(&mut active.parent, info.parent);
-        if old_parent != info.parent
-            && let Some(old_parent) = old_parent
-            && let Some(old_parent) = self.active.get_mut(&old_parent)
-        {
-            old_parent.children.retain(|child| *child != id);
-            old_parent.inherited_children.retain(|child| *child != id);
-        }
+        active.depth = info.depth;
         settled
     }
 
-    /// Recompose retained geometry when the evaluation still holds at this extent.
-    fn place(
-        &mut self,
-        id: WidgetId,
-        region: UiRegion,
-        placement: UiRegion,
-        info: DrawInfo,
-        rsc: &mut dyn UiRsc,
-    ) {
-        if self.try_reuse(id, region, placement, info, rsc).is_some() {
-            return;
+    /// Draws a widget in the final box its answer chose, reusing the drawing
+    /// already there where its retained contract holds for that box. The
+    /// symbolic box can be unchanged while the box it sits in changed pixel
+    /// length, so what reuse checks is the box in pixels.
+    fn place(&mut self, id: WidgetId, placed: UiRegion, info: DrawInfo, rsc: &mut dyn UiRsc) {
+        if self.try_reuse(id, placed, info, rsc).is_none() {
+            #[cfg(feature = "layout-diagnostics")]
+            diag::bump(Counter::PlaceRedraws);
+            let old = self.remove(id, false, rsc);
+            self.draw_at(id, placed, info, old, rsc);
         }
-        #[cfg(feature = "layout-diagnostics")]
-        diag::bump(Counter::PlaceRedraws);
-        let old = self.remove(id, false, rsc);
-        self.draw_at(id, region, placement, info, old, rsc);
     }
 
     /// Calls a widget's `draw` and keeps what it drew in `region`.
@@ -325,11 +273,10 @@ impl UiRenderState {
         &mut self,
         id: WidgetId,
         region: UiRegion,
-        placement: UiRegion,
         info: DrawInfo,
         old: Option<ActiveData>,
         rsc: &mut dyn UiRsc,
-    ) -> (Size, LayoutHolds) {
+    ) -> (Size, [Holds; 2]) {
         let (move_idx, local, retired_move) = match info.region_node {
             // Its box becomes its movable region, so it draws in that
             // region's coordinates and its box is one entry to rewrite.
@@ -343,25 +290,20 @@ impl UiRenderState {
             false => (info.parent_move, region, self.slots.remove(&id)),
         };
         let (old_children, old_answer) = match old {
-            Some(old) => (old.children, old.answer),
+            Some(old) => (old.children, Some(old.answer)),
             None => (Vec::new(), None),
         };
         rsc.widgets_mut().needs_redraw.remove(&id);
-        // Only evaluation at the original offer establishes the children's
-        // offers. A placing evaluation must not overwrite that question.
+        // A box of the offered lengths asks the offer's question wherever it
+        // sits, since what a drawing depends on is its lengths -- and
+        // equality is the comparison, these being counts of a step rather
+        // than floats to be compared for nearness.
         let px = info.px;
-        let at_offer = px == info.offered_px
-            && placement
-                == UiRegion {
-                    x: info.offer_placement[0].unwrap_or(UiSpan::FULL),
-                    y: info.offer_placement[1].unwrap_or(UiSpan::FULL),
-                };
+        let at_offer = px == info.offered_px;
 
         let mut painter = Painter {
             state: self,
             region: local,
-            placement,
-            reads_placement: false,
             px,
             mask: info.mask,
             layer: info.layer,
@@ -369,8 +311,6 @@ impl UiRenderState {
             id,
             textures: Vec::new(),
             primitives: Vec::new(),
-            mask_region: None,
-            inherited_children: Vec::new(),
             children: Vec::new(),
             offered: Vec::new(),
             offered_px: info.offered_px,
@@ -378,8 +318,6 @@ impl UiRenderState {
             size_deps: Vec::new(),
             own: [Holds::ANY; 2],
             under: [Holds::ANY; 2],
-            extent_own: [Holds::ANY; 2],
-            extent_under: [Holds::ANY; 2],
             depth: info.depth,
             move_idx,
             rsc,
@@ -400,16 +338,10 @@ impl UiRenderState {
             state: _,
             rsc: _,
             region: _,
-            placement: _,
-            reads_placement,
             px: _,
             mask,
             textures,
             primitives,
-            mask_region,
-            inherited_children,
-            extent_own,
-            extent_under,
             children,
             offered: _,
             offered_px: _,
@@ -447,16 +379,9 @@ impl UiRenderState {
             "'{}' ({id:?}) clips to {px:?} and reports {size}",
             rsc.widgets().label(id),
         );
-        let holds = LayoutHolds {
-            frame: [own[0].and(under[0]), own[1].and(under[1])],
-            extent: [
-                extent_own[0].and(extent_under[0]),
-                extent_own[1].and(extent_under[1]),
-            ],
-            placement: reads_placement.then_some(placement),
-        };
+        let holds = [own[0].and(under[0]), own[1].and(under[1])];
         debug_assert!(
-            holds.contains(px, placement),
+            holds[0].contains(px.x) && holds[1].contains(px.y),
             "'{}' ({id:?}) drew in {px:?}, outside the ranges it reported: {holds:?}",
             rsc.widgets().label(id),
         );
@@ -485,10 +410,9 @@ impl UiRenderState {
                         mask,
                         given_len: UiVec2::FULL_SIZE,
                         offer_len: UiVec2::FULL_SIZE,
-                        offer_placement: [None; 2],
                         px,
                         offered_px: px,
-                        placement: [None; 2],
+                        decided: [false; 2],
                     },
                     rsc,
                 );
@@ -499,12 +423,14 @@ impl UiRenderState {
         let active = ActiveData {
             id,
             region,
-            placement,
+            // The box a placing ask draws in is a part of the one its parent
+            // gave, which `draw_inner` writes back over these once the
+            // placement is done.
+            given: region,
             given_len: info.given_len,
             offer_len: info.offer_len,
-            offer_placement: info.offer_placement,
             // Whoever asked writes the answer, if this was the asking.
-            answer: old_answer,
+            answer: old_answer.unwrap_or((size, holds)),
             size,
             holds,
             drawn: true,
@@ -512,12 +438,10 @@ impl UiRenderState {
             depth: info.depth,
             textures,
             primitives,
-            mask_region,
-            inherited_children,
             children,
             size_deps,
             declared: declared_lens(rsc.widgets(), id),
-            decided: info.decided(),
+            decided: info.decided,
             own_align: rsc.widgets().alignment(id),
             move_idx,
             parent_move: info.parent_move,
@@ -557,24 +481,18 @@ impl UiRenderState {
         &self,
         id: WidgetId,
         px: PxVec2,
-        placement: [Option<UiSpan>; 2],
         parent_move: MoveIdx,
         widgets: &Widgets,
-    ) -> Option<(Size, LayoutHolds)> {
-        if widgets.needs_redraw.contains(&id) {
+    ) -> Option<(Size, [Holds; 2])> {
+        if widgets.needs_redraw.contains(&id) || self.dirty_size_under(id, widgets) {
             return None;
         }
         let active = self.active.get(&id)?;
-        let (size, holds) = active.answer?;
+        let (size, holds) = active.answer;
         let valid = active.drawn
             && active.parent_move == parent_move
-            && holds.contains(
-                px,
-                UiRegion {
-                    x: placement[0].unwrap_or(UiSpan::FULL),
-                    y: placement[1].unwrap_or(UiSpan::FULL),
-                },
-            );
+            && holds[0].contains(px.x)
+            && holds[1].contains(px.y);
         valid.then_some((size, holds))
     }
 
@@ -582,7 +500,7 @@ impl UiRenderState {
     /// drawing ended up. Alignment is exactly that case: the first box is the
     /// question and the smaller placed box holds the drawing. Whether the
     /// answer is stale at all is its caller's question, asked once there.
-    fn retained_answer(&self, id: WidgetId, info: DrawInfo) -> Option<(Size, LayoutHolds)> {
+    fn retained_answer(&self, id: WidgetId, info: DrawInfo) -> Option<(Size, [Holds; 2])> {
         let active = self.active.get(&id)?;
         let has_region_node = active.move_idx != active.parent_move;
         if !active.drawn
@@ -591,11 +509,22 @@ impl UiRenderState {
         {
             return None;
         }
-        let answer = active.answer?;
-        answer
-            .1
-            .contains(info.px, info.offered_placement())
-            .then_some(answer)
+        let (size, holds) = active.answer;
+        (holds[0].contains(info.px.x) && holds[1].contains(info.px.y)).then_some((size, holds))
+    }
+
+    /// Whether anything whose size this widget's own size was read from is
+    /// dirty, which makes what it would answer not yet known. It also keeps
+    /// a reader that asks first from laying out twice, which is all it was
+    /// here for while a changed size was thought to reach its reader in any
+    /// order; it does not, where the change settles inside the reader's own
+    /// draw.
+    fn dirty_size_under(&self, id: WidgetId, widgets: &Widgets) -> bool {
+        self.active.get(&id).is_some_and(|active| {
+            active.size_deps.iter().any(|child| {
+                widgets.needs_redraw.contains(child) || self.dirty_size_under(*child, widgets)
+            })
+        })
     }
 
     /// The pixel lengths of the box a widget was given and of the box it was
@@ -613,7 +542,11 @@ impl UiRenderState {
         // Nothing above the root: the window is where a fraction becomes
         // pixels, which is also the whole of the box the root is given.
         let (parent_px, parent_offer) = match active.parent.and_then(|p| self.active.get(&p)) {
-            Some(parent) => self.asked_px(parent.id),
+            Some(parent) => {
+                let (given, offer) = self.asked_px(parent.id);
+                let lens = placed_lens(parent.answer.0, parent.declared, parent.decided);
+                (lens.to_px(given), offer)
+            }
             None => (self.output_size, self.output_size),
         };
         let px = active.given_len.to_px(parent_px);
@@ -635,10 +568,9 @@ impl UiRenderState {
         &mut self,
         id: WidgetId,
         region: UiRegion,
-        placement: UiRegion,
         info: DrawInfo,
         rsc: &mut dyn UiRsc,
-    ) -> Option<(Size, LayoutHolds)> {
+    ) -> Option<(Size, [Holds; 2])> {
         #[cfg(feature = "layout-diagnostics")]
         diag::bump(Counter::ReuseAttempts);
         if rsc.widgets().needs_redraw.contains(&id) {
@@ -687,7 +619,7 @@ impl UiRenderState {
         // In pixels, because `region` is a fraction of the box its parent
         // drew in and that box may be what changed -- an unchanged fraction
         // of a box half the size is half the widget.
-        if !active.holds.contains(info.px, placement) {
+        if !active.holds_at(info.px) {
             #[cfg(feature = "layout-diagnostics")]
             {
                 diag::bump(Counter::ReuseOutside);
@@ -695,7 +627,6 @@ impl UiRenderState {
             }
             return None;
         }
-        let extent_moved = active.placement != placement;
         let moved = active.region != region;
         let (answer, old_region, slot) =
             ((active.size, active.holds), active.region, active.move_idx);
@@ -707,14 +638,12 @@ impl UiRenderState {
                 self.remap_subtree(id, &remap, info.parent_move, rsc);
             }
         }
-        if extent_moved {
-            self.reposition(id, region, placement, info, rsc);
-        }
-        self.redepth(id, info.depth);
         let active = self.active.get_mut(&id).unwrap();
         active.region = region;
+        active.given = region;
         active.given_len = info.given_len;
         active.offer_len = info.offer_len;
+        active.depth = info.depth;
         #[cfg(feature = "layout-diagnostics")]
         {
             match (moved, has_region_node) {
@@ -738,88 +667,6 @@ impl UiRenderState {
         Some(answer)
     }
 
-    fn reposition(
-        &mut self,
-        id: WidgetId,
-        region: UiRegion,
-        placement: UiRegion,
-        info: DrawInfo,
-        rsc: &mut dyn UiRsc,
-    ) {
-        let active = self.active.get_mut(&id).unwrap();
-        active.region = region;
-        active.placement = placement;
-        let local = if info.region_node {
-            UiRegion::FULL
-        } else {
-            region
-        };
-        for primitive in &active.primitives {
-            let handle = &primitive.handle;
-            *self.layers[handle.layer].region_mut(handle) =
-                primitive.region.resolve(local, placement);
-        }
-        if let Some(mask_region) = active.mask_region {
-            rsc.ui_mut().masks.get_mut(active.mask).region = mask_region.resolve(local, placement);
-        }
-        let parent_move = active.move_idx;
-        let mask = active.mask;
-        let children = active.inherited_children.len();
-        for index in 0..children {
-            let child = self.active[&id].inherited_children[index];
-            let active = &self.active[&child];
-            let (child_local, chosen) = ask_box(
-                UiRegion::FULL,
-                active.declared,
-                active.own_align,
-                [Some(placement.x), Some(placement.y)],
-            );
-            let child_placement = UiRegion {
-                x: chosen[0].unwrap_or(UiSpan::FULL),
-                y: chosen[1].unwrap_or(UiSpan::FULL),
-            };
-            let child_info = DrawInfo {
-                layer: active.layer,
-                parent: Some(id),
-                depth: info.depth + 1,
-                parent_move,
-                region_node: active.move_idx != active.parent_move,
-                mask,
-                given_len: child_local.size(),
-                offer_len: active.offer_len,
-                offer_placement: active.offer_placement,
-                px: child_local.size().to_px(info.px),
-                offered_px: active.offer_len.to_px(info.offered_px),
-                placement: chosen,
-            };
-            self.place(
-                child,
-                child_local.within(&local),
-                child_placement,
-                child_info,
-                rsc,
-            );
-        }
-    }
-
-    /// A reused subtree keeps its shape, so every widget in it moves by the
-    /// same amount -- and where the top of it did not move, none of it did,
-    /// which is what makes this free in the ordinary case.
-    fn redepth(&mut self, id: WidgetId, depth: usize) {
-        let Some(active) = self.active.get_mut(&id) else {
-            return;
-        };
-        if active.depth == depth {
-            return;
-        }
-        active.depth = depth;
-        let children = active.children.len();
-        for index in 0..children {
-            let child = self.active[&id].children[index];
-            self.redepth(child, depth + 1);
-        }
-    }
-
     /// Re-expresses an ordinary retained subtree in a new parent region.
     /// An independently movable descendant needs only its own region changed;
     /// its contents stay in that region's coordinate space.
@@ -831,18 +678,18 @@ impl UiRenderState {
         rsc: &mut dyn UiRsc,
     ) {
         let active = self.active.get_mut(&id).unwrap();
+        active.given = remap.apply(active.given);
         if active.move_idx != parent_move {
             let region = remap.apply(active.region);
             active.region = region;
             self.moves.set(active.move_idx, region);
             return;
         }
-        active.region = remap.apply(active.region);
-        for primitive in &active.primitives {
-            let handle = &primitive.handle;
-            *self.layers[handle.layer].region_mut(handle) =
-                primitive.region.resolve(active.region, active.placement);
+        for handle in &active.primitives {
+            let region = self.layers[handle.layer].region_mut(handle);
+            *region = remap.apply(*region);
         }
+        active.region = remap.apply(active.region);
         let own_mask = (active.mask != active.parent_mask).then_some(active.mask);
         let children = active.children.len();
         // A mask the widget set itself moves with it; one it inherited
@@ -850,10 +697,7 @@ impl UiRenderState {
         if let Some(idx) = own_mask {
             let mask = rsc.ui_mut().masks.get_mut(idx);
             debug_assert_eq!(mask.move_idx, parent_move);
-            mask.region = active
-                .mask_region
-                .unwrap()
-                .resolve(active.region, active.placement);
+            mask.region = remap.apply(mask.region);
         }
         for index in 0..children {
             let child = self.active[&id].children[index];
@@ -876,8 +720,8 @@ impl UiRenderState {
     fn remove(&mut self, id: WidgetId, undraw: bool, rsc: &mut dyn UiRsc) -> Option<ActiveData> {
         let mut active = self.active.remove(&id);
         if let Some(active) = &mut active {
-            for primitive in &active.primitives {
-                let mask = self.layers.free(&primitive.handle);
+            for h in &active.primitives {
+                let mask = self.layers.free(h);
                 if mask != MaskIdx::NONE {
                     rsc.ui_mut().masks.remove(mask);
                 }
@@ -932,20 +776,17 @@ impl UiRenderState {
             ActiveData {
                 id,
                 region: UiRegion::FULL,
-                placement: UiRegion::FULL,
+                given: UiRegion::FULL,
                 given_len: UiVec2::FULL_SIZE,
                 offer_len: UiVec2::FULL_SIZE,
-                offer_placement: [None; 2],
-                answer: None,
+                answer: (size, [Holds::ANY; 2]),
                 size,
-                holds: LayoutHolds::ANY,
+                holds: [Holds::ANY; 2],
                 drawn: false,
                 parent: info.parent,
                 depth: info.depth,
                 textures: Vec::new(),
                 primitives: Vec::new(),
-                mask_region: None,
-                inherited_children: Vec::new(),
                 children: Vec::new(),
                 size_deps: Vec::new(),
                 move_idx: info.parent_move,
@@ -1094,9 +935,8 @@ impl UiRenderState {
     pub fn window_region(&self, id: &impl IdLike) -> Option<PixelRegion> {
         let active = self.active.get(&id.id())?;
         active.drawn.then(|| {
-            let placed = active.placement.within(&active.region);
             self.moves
-                .resolve(active.parent_move, placed)
+                .resolve(active.parent_move, active.region)
                 .to_px(self.output_size)
         })
     }
@@ -1117,7 +957,7 @@ impl UiRenderState {
         let declared_changed = declared_lens(rsc.widgets(), id) != active.declared;
         let alignment_changed = rsc.widgets().alignment(id) != active.own_align;
         if let Some(parent) = active.parent
-            && (declared_changed || alignment_changed || !active.drawn || active.answer.is_none())
+            && (declared_changed || alignment_changed || !active.drawn)
         {
             if declared_changed {
                 self.replace_answers = true;
@@ -1173,30 +1013,19 @@ impl UiRenderState {
             mask: active.parent_mask,
             given_len: active.given_len,
             offer_len: active.offer_len,
-            offer_placement: active.offer_placement,
             px: given_px,
             offered_px,
-            // The same question its parent asked: the axes its parent chose
-            // the placement on, put back where they were.
-            placement: AXES
-                .map(|axis| active.decided[axis as usize].then(|| *active.placement.axis(axis))),
+            decided: active.decided,
         };
-        let (given, was_answer) = (active.region, active.answer);
+        let (given, was_answer) = (active.given, active.answer);
         #[cfg(feature = "layout-diagnostics")]
         diag::bump(Counter::LocalRedraws);
 
         let old = self.remove(id, false, rsc);
-        // Refresh the original measurement before restoring the assigned slot.
-        // Its lengths may differ even though the fraction reference is unchanged.
-        let offered = DrawInfo {
-            placement: info.offer_placement,
-            ..info
-        };
-        let answer = self.draw_inner(id, given, offered, old, rsc);
-        if info.placement != offered.placement {
-            self.draw_inner(id, given, info, None, rsc);
-        }
-        if Some(answer) != was_answer {
+        // `draw_inner` places the answer inside that box itself, which is the
+        // ask that leaves the widget where its parent put it.
+        let answer = self.draw_inner(id, given, info, old, rsc);
+        if answer != was_answer {
             // Its parent chose its box knowing the old answer, so it lays out
             // again and chooses the box the new one asks for.
             #[cfg(feature = "layout-diagnostics")]

src/default/mod.rs

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

src/harness.rs

@@ -144,9 +144,9 @@ impl Harness {
         // bound that comes with `SyncSender` is far past anything a test
         // leaves unread.
         let (send, updates) = sync_channel(1024);
-        let mut rsc = DefaultRsc::init(Arc::new(Queue(send)));
+        let rsc = DefaultRsc::init(Arc::new(Queue(send)));
         let mut render = UiRenderState::new();
-        render.resize(size, rsc.widgets_mut());
+        render.resize(size);
         Self {
             rsc,
             render,
@@ -161,7 +161,7 @@ impl Harness {
     }
 
     pub fn resize(&mut self, size: impl Into<Vec2>) {
-        self.render.resize(size, self.rsc.widgets_mut());
+        self.render.resize(size);
     }
 
     /// Changes a length rule after the fact, the way `.width()` sets one.

src/widget/mask.rs

@@ -6,7 +6,7 @@ pub struct Masked {
 
 impl Widget for Masked {
     fn draw(&mut self, painter: &mut Painter) -> Size {
-        painter.set_mask(DrawRegion::Extent(UiRegion::FULL));
+        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

src/widget/position/pad.rs

@@ -9,12 +9,13 @@ impl Widget for Pad {
     fn draw(&mut self, painter: &mut Painter) -> Size {
         // The inner's own alignment, not the near edge. This reports the
         // inner's size plus the padding, so where the box is that answer the
-        // inset box is exactly the inner and alignment has no room to move
-        // it; where the box is bigger -- a share of a row, a rule over this
-        // widget -- the slack is the inner's to sit in, and forcing the near
-        // edge pinned it to a corner it had not asked for.
-        let inside = self.padding.region_of(painter.placement());
-        let inner = painter.widget_within(&self.inner, inside).size();
+        // inner is exactly what it asked for and alignment has no room to
+        // move it; where the box is bigger -- a share of a row, a rule over
+        // this widget -- the slack is the inner's to sit in, and forcing the
+        // near edge pinned it to a corner it had not asked for.
+        let inner = painter
+            .widget_within(&self.inner, self.padding.region())
+            .size();
         Size {
             x: LayoutLen {
                 px: inner.x.px + self.padding.left + self.padding.right,
@@ -28,6 +29,45 @@ impl Widget for Pad {
     }
 }
 
+/// Room taken off the inside rather than added round the outside: the child
+/// draws in what is left once both edges are gone, and this widget is
+/// exactly as long as the box it was given.
+///
+/// So `rel(1.0)` under an [`Inset`] is the room inside it, where the same
+/// rule under a [`Pad`] is the pad's whole box and overflows it by the
+/// padding. Both are wanted; which one a layout means is which widget it
+/// reaches for.
+pub struct Inset {
+    pub padding: Padding,
+    pub inner: StrongWidget,
+}
+
+impl Widget for Inset {
+    fn draw(&mut self, painter: &mut Painter) -> Size {
+        let region = self.padding.inset_region();
+        let inner = painter.widget_within(&self.inner, region).size();
+        // What a fraction the child reported is a fraction of is this
+        // widget's to say, and it says the room inside: the child asked for
+        // a part of the box it drew in, and that box is shorter than this
+        // one by both edges. Then the edges go back on, so this widget is
+        // its child and the room taken off around it.
+        let (x, y) = (
+            inner.x.within_len(region.x.len()),
+            inner.y.within_len(region.y.len()),
+        );
+        Size {
+            x: LayoutLen {
+                px: x.px + self.padding.left + self.padding.right,
+                ..x
+            },
+            y: LayoutLen {
+                px: y.px + self.padding.top + self.padding.bottom,
+                ..y
+            },
+        }
+    }
+}
+
 pub struct Padding {
     pub left: Px,
     pub right: Px,
@@ -52,18 +92,31 @@ impl Padding {
             bottom: amt,
         }
     }
-    /// `region` less this padding on each side.
-    pub fn region_of(&self, mut region: UiRegion) -> UiRegion {
+    /// The box a [`Pad`] gives its child: as long as the pad's own, moved in
+    /// by the near edge. Padding is outside what it pads, so a fraction the
+    /// child asks for is a fraction of the same length whether a rule beside
+    /// it states one or it reports one, and its pixels are the same pixels.
+    /// Shrinking the box instead would make `rel` mean the inner box while
+    /// `px` meant the outer one. [`Inset`] is the widget that shrinks.
+    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.left;
+        region.y.end.px += self.top;
+        region
+    }
+
+    /// The box an [`Inset`] gives its child: shorter than its own by both
+    /// edges, so what the child fills is the room left inside.
+    pub fn inset_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
     }
-
-    pub fn region(&self) -> UiRegion {
-        self.region_of(UiRegion::FULL)
-    }
     pub fn x(amt: impl UiNum) -> Self {
         let amt = Px::from_num(amt);
         Self {

src/widget/position/scroll.rs

@@ -14,13 +14,10 @@ impl Widget for Scroll {
         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 whole = UiRegion::FULL;
-        let own = painter.placement();
-        let answer_len =
-            match painter.known_len(&self.inner, self.axis, whole, [Some(own.x), Some(own.y)]) {
-                Some(len) => len,
-                None => painter.widget(&self.inner).size().axis(self.axis),
-            };
+        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);
@@ -66,11 +63,7 @@ impl Widget for Scroll {
             region = region.offset(offset);
             region.axis_mut(self.axis).end = region.axis(self.axis).start.offset(self.content_len);
         }
-        // The viewport is the inner's region, so a fraction it declares or
-        // reports is a fraction of what is on screen rather than of the
-        // content box its own answer decided. Where it is put is the content
-        // box, scrolled.
-        painter.widget_at(&self.inner, whole, [Some(region.x), Some(region.y)]);
+        painter.widget_at(&self.inner, region, [true; 2]);
         // 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

src/widget/position/span.rs

@@ -10,36 +10,23 @@ pub struct Span {
 impl Widget for Span {
     fn draw(&mut self, painter: &mut Painter) -> Size {
         let axis = self.dir.axis;
-        // The row: this span's own box, as a span of the region it was given.
-        // Its children are laid out along it, and what they declare or report
-        // is a fraction of the region -- the area this span was told it has,
-        // which it passes on unchanged.
-        let own = painter.placement();
-        let row = *own.axis(axis);
-        // Across itself the span's own box is the child's region: a span is
-        // what contains its children there, and nothing divides that axis.
-        // Along it the whole region is, so a fraction means the same thing
-        // for every child however much of the row is left when it is asked.
-        let region = UiRegion::from_axis(axis, UiSpan::FULL, *own.axis(!axis));
-        let along = |from: Len, to: Len| match self.dir.sign {
-            Sign::Pos => UiSpan::new(row.start + from, row.start + to),
-            Sign::Neg => UiSpan::new(row.end - to, row.end - from),
-        };
-        let far = row.len();
         // A length for every child before their final boxes are chosen: from
         // a hint where one exists, and from drawing otherwise.
         let mut cursor = Len::rel_min();
         let mut lens = Vec::with_capacity(self.children.len());
         for child in &self.children {
-            // The whole region is the child's, so `rel(0.5)` is half the area
-            // this span was given whatever else is in it and wherever this
-            // child sits among them. What it is placed in is the room left
-            // from the cursor, because a text has to wrap at the width
-            // actually there.
-            let room = axis.pair(Some(along(cursor, far)), None);
-            let len = match painter.known_len(child, axis, region, room) {
+            let mut span = UiSpan::new(cursor, Len::rel_max());
+            if self.dir.sign == Sign::Neg {
+                span.flip();
+            }
+            let region = UiRegion::from_axis(axis, span, UiSpan::FULL);
+            // Offered the room left from the cursor, because a text has to
+            // wrap at the width actually there, while what it reports is a
+            // fraction of the whole row: `rel(0.5)` is half the span
+            // whatever else is in it and wherever this child sits.
+            let len = match painter.known_len(child, axis, region) {
                 Some(len) => len,
-                None => painter.widget_at(child, region, room).len(axis),
+                None => painter.widget_at(child, region, [false; 2]).len(axis),
             };
             cursor.px += len.px + self.gap;
             cursor.rel += len.rel;
@@ -57,26 +44,43 @@ impl Widget for Span {
             |sum, len| sum + *len,
         );
 
-        // What is left for the shares to divide: the row less everything
-        // fixed, as a length of the region rather than a number of pixels.
-        let room = far - Len::from_parts(total.rel, total.px);
         // Whether anything is left over is a question in pixels: `rel(0.5)`
-        // beside 300 px is full at 600 and overfull at 400. Asked of `room`
-        // itself, and answered back through the same expression, so the
-        // boundary is the drawing's own and not a second way of finding it:
-        // the three cases a rounded division needed -- the fixed parts
-        // growing slower than the box, faster, or exactly with it -- are the
-        // sign of `room.rel`, which `through` already reads. What the
-        // generated oracle checks is the consequence, since which children
-        // exist at all turns on this.
+        // 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 {
-            shares = room.to_px(painter.region_px_len(axis)) > Px::ZERO;
-            let holds = match shares {
-                true => Holds::from(Px::STEP..=Px::MAX),
-                false => Holds::from(Px::MIN..=Px::ZERO),
+            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.region_holds(axis, holds.through(room));
+            painter.holds(axis, holds);
         }
 
         // Across itself a span is as long as its longest child -- unless a
@@ -93,6 +97,7 @@ impl Widget for Span {
         // row.
         let mut fixed = Len::rel_min();
         let mut taken = Weight::ZERO;
+        let room = Len::rel_max() - Len::from_parts(total.rel, total.px);
         let mut start = Len::rel_min();
         let mut ortho = LayoutLen::ZERO;
         for (child, len) in self.children.iter().zip(&lens) {
@@ -105,19 +110,23 @@ impl Widget for Span {
                 fixed.px += self.gap;
                 continue;
             }
-            let from = start;
+            let mut span = UiSpan::FULL;
+            span.start = start;
             if len.leftover > Weight::ZERO && shares {
                 taken += len.leftover;
             }
             fixed.px += len.px;
             fixed.rel += len.rel;
             start = shared(fixed, taken, total.leftover, room);
-            // Along the row the span says where the child goes; across it the
-            // child sits where its own alignment says. Its region is the
-            // whole of what this span was given either way, which is what its
-            // fractions are of.
-            let placed =
-                painter.widget_at(child, region, axis.pair(Some(along(from, start)), None));
+            span.end = start;
+            let mut region = UiRegion::from_axis(axis, span, UiSpan::FULL);
+            if self.dir.sign == Sign::Neg {
+                region.flip(axis);
+            }
+            // Along the row this box is the child's own answer, so the answer
+            // is not placed in it again; across it the child sits where its
+            // alignment says.
+            let placed = painter.widget_at(child, region, [axis == Axis::X, axis == Axis::Y]);
             if shrinks {
                 let used = placed.len(!axis);
                 // Choosing between a fixed and a relative length from the

src/widget/position/stack.rs

@@ -13,37 +13,31 @@ impl Widget for Stack {
             StackSize::Default => None,
             StackSize::Child(i) => Some(i),
         };
-        // This stack's own box, which is `FULL` until its answer is known.
-        let placement = painter.placement();
-        // Whichever child sizes the stack keeps the stack's whole region as
-        // its own -- the stack is the length that child asked for, so taking
-        // the fraction of the stack's box again would take it twice -- and is
-        // put where the stack itself is put.
+        // 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_at(
-                        child,
-                        UiRegion::FULL,
-                        [Some(placement.x), Some(placement.y)],
-                    )
-                    .size()
+                painter.widget(child).size()
             }
             None => Size::LEFTOVER,
         };
+        let region = painter.box_of(size);
         for (i, child) in self.children.iter().enumerate() {
-            if sizing == Some(i) {
-                continue;
-            }
             painter.child_layer_at(i);
-            // Every other child has the stack's own box for its region, since
-            // the stack is what contains it, and where it sits in one bigger
-            // than itself is its own business.
-            painter.widget_within(child, placement);
+            // The sizing child placed its own content in the box its answer
+            // decided, and this box was derived from that answer, so applying
+            // its alignment again here would place it twice. Every other
+            // child is handed a box that owes nothing to its own answer, and
+            // where it sits in one bigger than itself is its own business.
+            match sizing == Some(i) {
+                true => painter.widget_at(child, region, [true; 2]),
+                false => painter.widget_within(child, region),
+            };
         }
         size
     }

src/widget/text/mod.rs

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

src/widget/trait_fns.rs

@@ -12,6 +12,16 @@ widget_trait! {
         }
     }
 
+    fn inset(self, padding: impl Into<Padding>) -> impl WidgetFn<Rsc, Inset> {
+        // Room taken off the inside, where `pad` adds it round the outside:
+        // this is as long as the box it is given and the child fills what is
+        // left of it.
+        |state| Inset {
+            padding: padding.into(),
+            inner: self.add_strong(state),
+        }
+    }
+
     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.

tests/cases/layout.rs

@@ -20,12 +20,11 @@ fn a_span_gives_each_child_the_width_it_asked_for() {
     assert_corners!(h, right, (100, 0), (400, 200));
 }
 
-/// A span places each child in the room left after the one before, because a
-/// text has to wrap at the width actually there, but the child's region is
-/// the whole row. So two children asking for half each take the whole row
-/// between them, however much of it was left when each was asked, and a third
-/// overflows -- and a span passes its own region on unchanged, so a child of
-/// a nested span asking for half asks for half of the same row.
+/// A span offers each child the room left after the one before, because a
+/// text has to wrap at the width actually there, but reads what the child
+/// reports as a fraction of the whole row. So two children asking for half
+/// each take the whole row between them, however much of it was left when
+/// each was asked, and a third overflows.
 #[test]
 fn a_span_reads_a_child_report_as_a_fraction_of_the_row() {
     let mut h = Harness::new((400, 100));
@@ -35,10 +34,10 @@ fn a_span_reads_a_child_report_as_a_fraction_of_the_row() {
     let tail = rect(Color::BLUE).width(100).add(&mut h.rsc);
     h.set_root((half, nested, tail).span(Dir::RIGHT).width(rel(1.0)));
 
-    // The nested span is placed at the length it reported, and its own child
-    // asks for half of the row rather than half of that placement.
+    // The nested span is placed at the length it reported and drawn there
+    // once more; half of that final box is what its own child takes.
     assert_corners!(h, nested, (200, 0), (400, 100));
-    assert_corners!(h, inner, (200, 0), (400, 100));
+    assert_corners!(h, inner, (200, 0), (300, 100));
     assert_corners!(h, tail, (400, 0), (500, 100));
 }
 
@@ -83,11 +82,13 @@ fn a_text_in_a_span_wraps_at_the_room_left_rather_than_the_whole_row() {
     assert!(crowded > whole_row, "{crowded} against {whole_row}");
 }
 
-/// The same reading through a pad: its inset is the whole box less the
-/// padding, so half of the inset plus the padding is half the box plus one
-/// padding, not two.
+/// Padding is outside what it pads, so a fraction under one is a fraction of
+/// the box the padding is measured from: half of a 400 px row is 200, and
+/// the pad is that plus both edges. Inset it instead and `rel` would mean the
+/// inner box while `px` meant the outer one, which is the one thing a length
+/// may not do.
 #[test]
-fn a_pad_reports_a_fraction_of_its_inset_as_a_fraction_of_its_box() {
+fn a_pad_is_outside_the_fraction_its_child_asked_for() {
     let mut h = Harness::new((400, 100));
     let inner = rect(Color::GREEN).width(rel(0.5)).add(&mut h.rsc);
     let padded = (inner,).span(Dir::RIGHT).pad(10).add(&mut h.rsc);
@@ -96,8 +97,23 @@ fn a_pad_reports_a_fraction_of_its_inset_as_a_fraction_of_its_box() {
     // placed inside it by its own alignment, which is not what is under test.
     h.set_root((padded, tail).span(Dir::RIGHT).width(rel(1.0)));
 
-    assert_corners!(h, padded, (0, 0), (210, 100));
-    assert_corners!(h, tail, (210, 0), (310, 100));
+    assert_corners!(h, padded, (0, 0), (220, 100));
+    assert_corners!(h, tail, (220, 0), (320, 100));
+}
+
+/// The other half of the pair: an inset takes its room off the inside, so it
+/// is exactly as long as the box it was given and the fraction its child
+/// asked for is a fraction of what is left inside. Half of the 380 left in a
+/// 400 px row is 190, and the inset is the whole 400.
+#[test]
+fn an_inset_is_inside_the_fraction_its_child_asked_for() {
+    let mut h = Harness::new((400, 100));
+    let inner = rect(Color::GREEN).width(rel(0.5)).add(&mut h.rsc);
+    let inset = (inner,).span(Dir::RIGHT).inset(10).add(&mut h.rsc);
+    h.set_root((inset,).span(Dir::RIGHT).width(rel(1.0)));
+
+    assert_corners!(h, inset, (0, 0), (200, 100));
+    assert_corners!(h, inner, (10, 0), (200, 100));
 }
 
 #[test]
@@ -238,7 +254,7 @@ 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);
+    let row = inner.inset(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));
@@ -281,7 +297,7 @@ fn a_box_with_a_fixed_length_can_be_stretched_on_its_other_axis() {
     // 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 row = inner.inset(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.
@@ -699,20 +715,3 @@ fn equal_shares_differ_by_at_most_two_steps_and_fill_the_row() {
         }
     }
 }
-
-#[test]
-fn a_stack_sized_by_a_child_does_not_take_that_childs_fraction_twice() {
-    let mut h = Harness::new((400, 200));
-    let half = rect(Color::RED).width(rel(0.5)).add(&mut h.rsc);
-    let behind = rect(Color::BLUE).add(&mut h.rsc);
-    let stack = Stack {
-        children: vec![behind.add_strong(&mut h.rsc), half.add_strong(&mut h.rsc)],
-        size: StackSize::Child(1),
-    }
-    .add(&mut h.rsc);
-    h.set_root((stack,).span(Dir::RIGHT).width(rel(1.0)));
-
-    assert_corners!(h, stack, (0, 0), (200, 200));
-    assert_corners!(h, half, (0, 0), (200, 200));
-    assert_corners!(h, behind, (0, 0), (200, 200));
-}

tests/cases/retained.rs

@@ -156,9 +156,16 @@ fn a_span_child_that_declares_its_length_is_drawn_once() {
     h.set_root((hinted, asked).span(Dir::RIGHT));
 
     assert_eq!(told_draws.get(), 1);
-    // Only the available length changes: positioning the final slot does
-    // not invalidate a numeric size read.
-    assert_eq!(asked_draws.get(), 2);
+    // 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]
@@ -455,7 +462,7 @@ fn a_change_two_levels_under_its_reader_still_reaches_it() {
     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));
+    h.set_root((padded, below).span(Dir::DOWN).inset(12));
     assert_corners!(h, below, (12, 132), (388, 388));
 
     h.rsc[leaf].size = Size::px((100, 200).into());
@@ -621,190 +628,3 @@ fn a_masked_widget_redrawn_on_its_own_sets_its_mask_again() {
     h.frame();
     assert_corners!(h, inner, (100, 0), (400, 200));
 }
-
-/// The two spans a subtree changes hands between, and the branch that is not
-/// in the tree yet -- kept alive by the test until it is.
-struct Handover {
-    leaf: WidgetId,
-    first: WeakWidget<Span>,
-    second: WeakWidget<Span>,
-    root: WeakWidget<Span>,
-    spare: StrongWidget,
-}
-
-/// A subtree that changes hands while its box does not move, so nothing about
-/// reusing its drawing says it changed parents. `deeper` puts a span between
-/// the root and `second`, so it changes depth by changing hands as well.
-fn plant_handover(h: &mut Harness, moved: bool, deeper: bool, width: f32) -> Handover {
-    let leaf = rect(Color::RED).add(&mut h.rsc);
-    let sized = leaf.width(width).add(&mut h.rsc);
-    let holder = (sized,).span(Dir::RIGHT).add(&mut h.rsc);
-    let first = Span {
-        children: match moved {
-            true => Vec::new(),
-            false => vec![holder.add_strong(&mut h.rsc)],
-        },
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    let second = Span {
-        children: match moved {
-            true => vec![holder.add_strong(&mut h.rsc)],
-            false => Vec::new(),
-        },
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    let branch = match deeper {
-        true => (second,).span(Dir::RIGHT).add_strong(&mut h.rsc),
-        false => second.add_strong(&mut h.rsc),
-    };
-    let (in_tree, spare) = match moved {
-        true => (branch, first.add_strong(&mut h.rsc)),
-        false => (first.add_strong(&mut h.rsc), branch),
-    };
-    let root = Span {
-        children: vec![in_tree],
-        dir: Dir::RIGHT,
-        gap: Px::ZERO,
-    }
-    .add(&mut h.rsc);
-    h.state.root = Some(root.add_strong(&mut h.rsc));
-    Handover {
-        leaf: sized.id(),
-        first,
-        second,
-        root,
-        spare,
-    }
-}
-
-/// Moves the subtree and swaps the branch it sits in for the one it left.
-fn hand_over(h: &mut Harness, tree: Handover) -> WidgetId {
-    let holder = h.rsc[tree.first].children.remove(0);
-    h.rsc[tree.second].children.push(holder);
-    h.rsc[tree.root].children.clear();
-    h.rsc[tree.root].children.push(tree.spare);
-    h.frame();
-    tree.leaf
-}
-
-#[test]
-fn a_subtree_that_changed_parents_is_not_undrawn_by_the_one_it_left() {
-    let mut warm = Harness::new((400, 200));
-    let tree = plant_handover(&mut warm, false, false, 40.0);
-    warm.frame();
-    let leaf = hand_over(&mut warm, tree);
-
-    let mut cold = Harness::new((400, 200));
-    let grown = plant_handover(&mut cold, true, false, 40.0);
-    cold.frame();
-
-    assert_eq!(
-        warm.region(&leaf),
-        cold.region(&grown.leaf),
-        "the span it left still listed it and undrew it"
-    );
-}
-
-#[test]
-fn a_subtree_that_changed_parents_settles_at_the_depth_it_moved_to() {
-    let mut warm = Harness::new((400, 200));
-    let tree = plant_handover(&mut warm, false, true, 40.0);
-    warm.frame();
-    let leaf = hand_over(&mut warm, tree);
-    // After it has changed hands, so what has to reach the new parent is a
-    // change made under the subtree it now holds.
-    warm.set_len(leaf, Axis::X, LayoutLen::px(90.0));
-    warm.frame();
-
-    let mut cold = Harness::new((400, 200));
-    let grown = plant_handover(&mut cold, true, true, 90.0);
-    cold.frame();
-
-    assert_eq!(
-        warm.region(&leaf),
-        cold.region(&grown.leaf),
-        "the span it moved to is the one the change has to reach"
-    );
-}
-
-fn primitive_bounds(h: &Harness, id: WidgetId) -> Vec<PixelRegion> {
-    h.render.active[&id]
-        .primitives
-        .iter()
-        .map(|primitive| {
-            let handle = &primitive.handle;
-            let instance = &h.render.layers[handle.layer].primitives()[handle.kind as usize]
-                .as_ref()
-                .unwrap()
-                .instances()[handle.inst_idx];
-            h.render
-                .moves
-                .resolve(instance.move_idx, instance.region)
-                .to_px(h.render.output_size())
-        })
-        .collect()
-}
-
-#[test]
-fn frame_geometry_and_extent_geometry_keep_their_references() {
-    struct Both(Rc<Cell<usize>>);
-    impl Widget for Both {
-        fn draw(&mut self, painter: &mut Painter) -> Size {
-            self.0.set(self.0.get() + 1);
-            painter.primitive_within(RectPrimitive::color(Color::RED), UiRegion::FULL);
-            painter.primitive(RectPrimitive::color(Color::BLUE));
-            Size::LEFTOVER
-        }
-    }
-    for node in [false, true] {
-        let mut h = Harness::new((400, 200));
-        let first = rect(Color::GREEN).width(100).add(&mut h.rsc);
-        let draws = Rc::new(Cell::new(0));
-        let both = Both(draws.clone()).add(&mut h.rsc);
-        h.rsc.widgets_mut().set_region_node(both, node);
-        h.set_root((first, both).span(Dir::RIGHT));
-        let count = draws.get();
-        h.set_len(first, Axis::X, 200);
-        h.frame();
-        assert_eq!(draws.get(), count);
-        let bounds = primitive_bounds(&h, both.id());
-        assert_eq!(bounds[0].top_left.x, Px::ZERO);
-        assert_eq!(bounds[0].bot_right.x, Px::from_int(400));
-        assert_eq!(bounds[1].top_left.x, Px::from_int(200));
-        assert_eq!(bounds[1].bot_right.x, Px::from_int(400));
-    }
-}
-
-#[test]
-fn changing_an_inherited_extent_keeps_the_original_measurement_offer() {
-    fn build(h: &mut Harness, width: i32, text: &str) -> (WeakWidget<Text>, WeakWidget<Rect>) {
-        let first = rect(Color::RED).width(width).add(&mut h.rsc);
-        let words = wtext(text).size(20).wrap(true).add(&mut h.rsc);
-        let through = Stretchy {
-            inner: words.add_strong(&mut h.rsc),
-            draws: Rc::new(Cell::new(0)),
-        }
-        .add(&mut h.rsc);
-        h.set_root((first, through).span(Dir::RIGHT));
-        (words, first)
-    }
-    let short = "one two";
-    let long = "one two three four five six seven eight nine ten eleven twelve";
-    let mut warm = Harness::new((400, 200));
-    let (words, first) = build(&mut warm, 50, short);
-    warm.set_len(first, Axis::X, 200);
-    warm.frame();
-    *warm.rsc[words].content = long.to_string();
-    warm.frame();
-    let mut cold = Harness::new((400, 200));
-    let (other, _) = build(&mut cold, 200, long);
-    assert_eq!(warm.region(&words), cold.region(&other));
-    assert_eq!(
-        primitive_bounds(&warm, words.id()),
-        primitive_bounds(&cold, other.id())
-    );
-}

tests/cases/unsettled.rs

@@ -614,61 +614,3 @@ fn a_text_is_given_back_a_box_the_line_it_measured_fits_in() {
 
     assert_eq!(warm.region(&text), cold.region(&cold_text));
 }
-
-#[test]
-fn adding_text_to_a_reverse_row_keeps_its_shared_height() {
-    fn build(
-        h: &mut Harness,
-        changed: bool,
-    ) -> (WeakWidget<Span>, WeakWidget<Text>, Vec<StrongWidget>) {
-        let wrap = wtext("Wrapping shapes one source into as many lines as the box leaves room for, so a paragraph's height is an answer and not a setting.").size(16).wrap(true).add_strong(&mut h.rsc);
-        let one = || {
-            wtext("one line, overflowing whatever it is given")
-                .size(16)
-                .wrap(false)
-        };
-        let plain = one().add_strong(&mut h.rsc);
-        let shared = one()
-            .width(LayoutLen::LEFTOVER)
-            .height(LayoutLen::LEFTOVER)
-            .add(&mut h.rsc);
-        let mut extra: Vec<StrongWidget> = vec![
-            rect(Color::RED).add_strong(&mut h.rsc),
-            one().add_strong(&mut h.rsc),
-            one().add_strong(&mut h.rsc),
-        ];
-        let children: Vec<StrongWidget> = if changed {
-            let mut children: Vec<StrongWidget> = vec![plain, shared.add_strong(&mut h.rsc)];
-            children.append(&mut extra);
-            children
-        } else {
-            vec![wrap, plain, shared.add_strong(&mut h.rsc)]
-        };
-        let row = Span {
-            children,
-            dir: Dir::LEFT,
-            gap: Px::ZERO,
-        }
-        .height(LayoutLen::rel(1.0))
-        .add(&mut h.rsc);
-        let fill: StrongWidget = rect(Color::BLUE).add_strong(&mut h.rsc);
-        let children: Vec<StrongWidget> = vec![fill, row.add_strong(&mut h.rsc)];
-        let root = Span {
-            children,
-            dir: Dir::RIGHT,
-            gap: Px::from_int(4),
-        }
-        .height(LayoutLen::rel(1.0))
-        .add(&mut h.rsc);
-        h.set_root(root);
-        (row, shared, extra)
-    }
-    let mut warm = Harness::new((900, 1200));
-    let (row, shared, extra) = build(&mut warm, false);
-    warm.rsc[row].children.remove(0);
-    warm.rsc[row].children.extend(extra);
-    warm.frame();
-    let mut cold = Harness::new((900, 1200));
-    let (_, other, _) = build(&mut cold, true);
-    assert_eq!(warm.region(&shared), cold.region(&other));
-}