iris: fold render state into Ui

app-rust/tests/fence_fling.rs

@@ -3,7 +3,9 @@ use iris::harness::{Harness, TouchAction};
 use iris::prelude::*;
 
 fn fence_scroll_in(h: &Harness, top: f32, bottom: f32) -> Option<(WidgetId, PixelRegion)> {
-    h.render
+    let render_handle = h.rsc.ui.render_state();
+    let render_state = render_handle.get();
+    render_state
         .active
         .keys()
         .copied()
@@ -16,7 +18,7 @@ fn fence_scroll_in(h: &Harness, top: f32, bottom: f32) -> Option<(WidgetId, Pixe
                 .is_some_and(|s| s.axis() == Axis::X)
         })
         .find_map(|id| {
-            let r = h.render.window_region(&id, &h.rsc)?;
+            let r = render_state.window_region(&id, &h.rsc)?;
             (r.top_left.y >= top && r.bot_right.y <= bottom).then_some((id, r))
         })
 }

app-rust/tests/phone_screen.rs

@@ -158,7 +158,10 @@ fn the_composer_sits_above_a_simulated_ime_inset() {
     let (mut h, screen) = opened();
     let height = h.size().y;
     let field_bottom = |h: &mut Harness| {
-        h.render
+        h.rsc
+            .ui
+            .render_state()
+            .get()
             .window_region(&screen.composer.field, &h.rsc)
             .expect("the composer field is on screen")
             .bot_right
@@ -203,7 +206,10 @@ fn a_space_in_the_composer_finishes_layout() {
 
     assert_eq!(screen.composer.field.edit(&mut h.rsc).text.text(), "hi ");
     let region = h
-        .render
+        .rsc
+        .ui
+        .render_state()
+        .get()
         .window_region(&screen.composer.field, &h.rsc)
         .expect("the composer field is drawn");
     let size = region.bot_right - region.top_left;
@@ -231,14 +237,13 @@ fn a_newline_leaves_the_caret_inside_the_composers_padding() {
         screen.composer.field.edit(&mut h.rsc).insert("a\n");
         h.frame(PHONE_FRAME_MS);
     }
-    let message = h
-        .render
+    let render_handle = h.rsc.ui.render_state();
+    let render_state = render_handle.get();
+    let message = render_state
         .debug(h.rsc.widgets(), "Message")
         .find(|a| !a.primitives.is_empty())
         .expect("the composer field is drawn");
-    let caret = h
-        .render
-        .primitive_corners(message.primitives.last().unwrap().slot, &h.rsc);
+    let caret = render_state.primitive_corners(message.primitives.last().unwrap().slot, &h.rsc);
     let bar_bottom = height - ime;
     let padding = 12.0 * PHONE_SCALE;
     assert!(
@@ -249,11 +254,11 @@ fn a_newline_leaves_the_caret_inside_the_composers_padding() {
     );
 
     let mask = h.rsc.ui.masks[message.mask.idx()];
-    let bar = h.render.primitive_corners(mask.primitive, &h.rsc);
+    let bar = render_state.primitive_corners(mask.primitive, &h.rsc);
     let visible_content_top = message
         .primitives
         .iter()
-        .map(|p| h.render.primitive_corners(p.slot, &h.rsc))
+        .map(|p| render_state.primitive_corners(p.slot, &h.rsc))
         .filter(|r| r.bot_right.y > bar.top_left.y)
         .map(|r| r.top_left.y)
         .fold(f32::INFINITY, f32::min);

app-rust/tests/top_edge.rs

@@ -21,20 +21,24 @@ fn opened() -> (Harness, ai_app::ui::TranscriptScreen) {
 }
 
 fn list_box(h: &Harness, screen: &ai_app::ui::TranscriptScreen) -> PixelRegion {
-    h.render
+    h.rsc
+        .ui
+        .render_state()
+        .get()
         .window_region(&screen.list.id(), &h.rsc)
         .expect("the list is on screen")
 }
 
 fn drawn_rows(h: &Harness, screen: &ai_app::ui::TranscriptScreen) -> Vec<(f32, f32)> {
-    let mut rows: Vec<(f32, f32)> = h
-        .render
+    let render_handle = h.rsc.ui.render_state();
+    let render_state = render_handle.get();
+    let mut rows: Vec<(f32, f32)> = render_state
         .active
         .get(&screen.list.id())
         .expect("the list is drawn")
         .children
         .iter()
-        .filter_map(|id| h.render.window_region(id, &h.rsc))
+        .filter_map(|id| render_state.window_region(id, &h.rsc))
         .map(|px| (px.top_left.y, px.bot_right.y))
         .collect();
     rows.sort_by(|a, b| a.0.total_cmp(&b.0));
@@ -76,12 +80,14 @@ fn the_row_across_the_top_edge_is_drawn() {
 #[test]
 fn the_list_is_clipped_to_its_own_box() {
     let (h, screen) = opened();
-    let active = h.render.active.get(&screen.list.id()).expect("drawn");
+    let render_handle = h.rsc.ui.render_state();
+    let render_state = render_handle.get();
+    let active = render_state.active.get(&screen.list.id()).expect("drawn");
     assert!(
         active.mask != MaskIdx::NONE,
         "the transcript's list is drawn with nothing clipping it",
     );
-    let clip = h.render.mask_region(active.mask, &h.rsc);
+    let clip = render_state.mask_region(active.mask, &h.rsc);
     let list = list_box(&h, &screen);
     assert!(
         clip.top_left.y >= list.top_left.y - 0.5 && clip.bot_right.y <= list.bot_right.y + 0.5,
@@ -89,8 +95,7 @@ fn the_list_is_clipped_to_its_own_box() {
          edge still draws past it",
     );
 
-    let rows = h
-        .render
+    let rows = render_state
         .active
         .get(&screen.list.id())
         .expect("the list is drawn")
@@ -116,14 +121,16 @@ fn the_list_is_clipped_to_its_own_box() {
 }
 
 fn primitives_under(h: &Harness, id: WidgetId) -> Vec<MaskIdx> {
-    let Some(active) = h.render.active.get(&id) else {
+    let render_handle = h.rsc.ui.render_state();
+    let render_state = render_handle.get();
+    let Some(active) = render_state.active.get(&id) else {
         return Vec::new();
     };
     let mut out: Vec<MaskIdx> = active
         .primitives
         .iter()
         .filter(|p| p.binding != IMAGE_BINDING)
-        .map(|p| h.render.primitives.instance(p.slot).mask_idx)
+        .map(|p| render_state.primitives.instance(p.slot).mask_idx)
         .collect();
     for child in &active.children {
         out.extend(primitives_under(h, *child));