iris: fold render state into Ui

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