A box in pixels was composed back up the move chain, on a grid fine enough that the walk rounded once, while a widget's offer was threaded down through its ancestors' offers. Two routes to one length, which is what `Holds::through` allowed for -- and the offer's route broke at a region node. `offered_region` fell back to `UiRegion::FULL` there, and `redraw` resolved that against the node's slot entry, which holds the box its parent *placed* the node in. Under a `Scroll` that is as long as the content rather than the viewport, so everything below was re-asked at a width its own answer had produced and the old answer confirmed itself: shrinker seed 220 on `reorder` left a widget 290px out. `ActiveData` now keeps a widget's box as lengths of its parent's box -- `given_len`, and `offer_len` for the box it was first asked about -- and `DrawInfo` carries the pixel lengths, threaded down one `Len::to_px` at a time: the box its parent gave it, then the part of that box its own answer placed the drawing in, which `placed_lens` states once for both `placed_box` and the walk. `Painter::px_size` and `px_len` read that value, and `UiRenderState::asked_px` takes the same steps back up the parent chain where a local redraw starts part-way down the tree. Neither chain has a coordinate frame in it, so neither can break at a region node, and warm and cold reach every length by the same expression. Three things follow. `Holds::through` is the exact preimage of `px + floor(rel * box)` -- two divisions, no allowance, the whole of a box mapping back to itself. A local redraw asks in the box its parent gave it and only where that box is as long as the offer, which retires `redraw`'s third ask and the region-node exception beside it; `draw_inner` places the answer inside that box itself. And symbolic regions are left to the GPU, hit testing and remaps, where `Moves::resolve` is the only walk: `wide.rs`, `Moves::compose`, `Moves::size_of`, `px_of`, `px_region`, `offered_region` and `slot_wide` are gone, 252 lines of `core/` net. `px` is deliberately not stored beside those lengths. A resize every widget's `Holds` admits redraws nothing, so a stored pixel length would be stale on every widget in the tree with nothing on it to say so, and refreshing it costs a walk down every reused subtree on the resize path. Instructions:u, medians of 21 runs, seed 1 at depth 8: | phase | before | after | | | --- | ---: | ---: | ---: | | `cold`, 200 frames | 313.1M | 312.9M | -0.04% | | `resize` | 408.1M | 405.6M | -0.61% | | `many` | 1,924M | 1,756M | -8.75% | | `scroll` | 357.3M | 323.4M | -9.49% | | `repaint` | 363.3M | 315.4M | -13.18% | `cold` and `resize` have all twenty-five work counters identical, so those two rows say the draw path costs the same threaded as composed. The other three do less work: `repaint` goes from 23 draw requests and 13 widget draws a frame to 1 and 1, `scroll` from 20 and 11 to 8 and 2, `many` from 273 and 186 to 207 and 157. Primitive writes are unmoved in every phase. Verified: `view`, `minimal`, `random`, `tabs` and `text` render byte-identical at 1920x1200 against `5b78002`, as does the `tabs` touch replay before and after the gesture, and a live resize of `random` to 1280x800 is identical both to the old head's and to a cold render at that size. The oracle passes 100 seeds in release and 120 in debug -- the debug run is the one that exercises the `Holds` assertion -- and the fifteen shrinker cases pass at 400 seeds of depth 5 and 1000 of depth 6. Seed 220 is `unsettled::a_widget_under_a_region_node_is_asked_in_the_box_that_node_was_offered`, which needs both halves of this to fail: the old chain with the old allowance passes it, and the old chain with the exact preimage does not. `AGREE_STEPS` stays 2. One step passes the 100-seed oracle and fails the 400-seed shrinker on `resize-size` by 0.002 px, so what is left there is the resize path re-expressing a part as a fraction of a box that changed length, not a length reached two ways. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
146 lines
4.4 KiB
Rust
146 lines
4.4 KiB
Rust
use crate::{
|
|
Mask, MoveIdx, MoveOffset, PrimitiveRegistry, TextData, Textures, UiRegion, WeakWidget,
|
|
WidgetId, Widgets,
|
|
util::{Arena, Id, TrackedArena},
|
|
};
|
|
|
|
/// How far the shader will walk a move chain. It bounds a malformed cycle
|
|
/// rather than any real tree; `Moves::resolve` uses the same number so the
|
|
/// two agree on what a deep tree resolves to.
|
|
pub const CHAIN_LIMIT: u32 = 64;
|
|
|
|
mod active;
|
|
mod holds;
|
|
mod painter;
|
|
mod render_state;
|
|
|
|
pub use active::*;
|
|
pub use holds::*;
|
|
pub use painter::{Painter, PrimitiveLike};
|
|
pub use render_state::*;
|
|
|
|
#[derive(Default)]
|
|
pub struct UiData {
|
|
pub widgets: Widgets,
|
|
/// Every primitive this ui can draw.
|
|
pub primitives: PrimitiveRegistry,
|
|
pub textures: Textures,
|
|
pub text: TextData,
|
|
pub masks: TrackedArena<Mask, u32>,
|
|
}
|
|
|
|
/// Where each widget's drawing sits relative to its parent's slot, so moving
|
|
/// a subtree writes one entry rather than every descendant's primitives.
|
|
#[derive(Default)]
|
|
pub struct Moves {
|
|
arena: Arena<MoveOffset, u32>,
|
|
pub changed: bool,
|
|
}
|
|
|
|
impl Moves {
|
|
pub fn push(&mut self, parent: MoveIdx, region: UiRegion) -> MoveIdx {
|
|
self.changed = true;
|
|
MoveIdx::slot(self.arena.push(MoveOffset::new(parent, region)).idx())
|
|
}
|
|
|
|
/// Re-points a slot at a different parent, for a widget drawn somewhere
|
|
/// else in the tree than it was.
|
|
pub fn set_parent(&mut self, idx: MoveIdx, parent: MoveIdx) {
|
|
let entry = self.arena.get_mut(Id::preset(idx.idx() as u32));
|
|
if entry.parent != parent {
|
|
entry.parent = parent;
|
|
self.changed = true;
|
|
}
|
|
}
|
|
|
|
pub fn remove(&mut self, idx: MoveIdx) {
|
|
self.changed = true;
|
|
self.arena.remove(Id::preset(idx.idx() as u32));
|
|
}
|
|
|
|
/// Sets the box a slot's contents are placed within, itself given in the
|
|
/// coordinates of its parent slot.
|
|
pub fn set(&mut self, idx: MoveIdx, region: UiRegion) {
|
|
let entry = self.arena.get_mut(Id::preset(idx.idx() as u32));
|
|
if entry.region != region {
|
|
entry.region = region;
|
|
self.changed = true;
|
|
}
|
|
}
|
|
|
|
/// The same walk the vertex shader does, in the same `Len` the shader is
|
|
/// handed, for asking where a drawing will actually land -- hit testing,
|
|
/// and nothing layout decides on. Layout threads its lengths down the
|
|
/// draw instead, so no box it compares is composed back up this chain.
|
|
pub fn resolve(&self, idx: MoveIdx, local: UiRegion) -> UiRegion {
|
|
let mut region = local;
|
|
self.walk(idx, |entry| region = region.within(entry));
|
|
region
|
|
}
|
|
|
|
fn walk(&self, idx: MoveIdx, mut step: impl FnMut(&UiRegion)) {
|
|
let mut at = idx;
|
|
for _ in 0..CHAIN_LIMIT {
|
|
if at == MoveIdx::NONE {
|
|
return;
|
|
}
|
|
let entry = &self.arena[at.idx()];
|
|
step(&entry.region);
|
|
at = entry.parent;
|
|
}
|
|
debug_assert!(
|
|
at == MoveIdx::NONE,
|
|
"a move chain longer than {CHAIN_LIMIT} resolves to the wrong place, \
|
|
and the shader stops at the same depth"
|
|
);
|
|
}
|
|
|
|
/// How many slots a region in `idx` is composed through, which is what
|
|
/// the shader's walk costs per primitive.
|
|
pub fn depth(&self, idx: MoveIdx) -> usize {
|
|
let mut depth = 0;
|
|
let mut at = idx;
|
|
while at != MoveIdx::NONE && depth < CHAIN_LIMIT as usize {
|
|
at = self.arena[at.idx()].parent;
|
|
depth += 1;
|
|
}
|
|
depth
|
|
}
|
|
|
|
pub fn entries(&self) -> &[MoveOffset] {
|
|
&self.arena
|
|
}
|
|
|
|
pub fn clear(&mut self) {
|
|
self.changed = true;
|
|
self.arena = Arena::default();
|
|
}
|
|
}
|
|
|
|
pub trait UiRsc {
|
|
fn ui(&self) -> &UiData;
|
|
fn ui_mut(&mut self) -> &mut UiData;
|
|
|
|
#[allow(unused_variables)]
|
|
fn on_add(&mut self, id: WeakWidget) {}
|
|
#[allow(unused_variables)]
|
|
fn on_remove(&mut self, id: WidgetId) {}
|
|
#[allow(unused_variables)]
|
|
fn on_draw(&mut self, active: &ActiveData) {}
|
|
#[allow(unused_variables)]
|
|
fn on_undraw(&mut self, active: &ActiveData) {}
|
|
|
|
fn widgets(&self) -> &Widgets {
|
|
&self.ui().widgets
|
|
}
|
|
fn widgets_mut(&mut self) -> &mut Widgets {
|
|
&mut self.ui_mut().widgets
|
|
}
|
|
fn free(&mut self) {
|
|
while let Some(id) = self.widgets_mut().free_next() {
|
|
self.on_remove(id);
|
|
}
|
|
self.ui_mut().textures.free();
|
|
}
|
|
}
|