iris: fold render state into Ui

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));