iris: fold render state into Ui

src/layout_tests.rs

@@ -2,14 +2,14 @@ use crate::prelude::*;
 use std::{cell::Cell, cell::RefCell, rc::Rc};
 
 pub(crate) struct TestRsc {
-    pub(crate) ui: UiData,
+    pub(crate) ui: Ui,
 }
 
 impl UiRsc for TestRsc {
-    fn ui(&self) -> &UiData {
+    fn ui(&self) -> &Ui {
         &self.ui
     }
-    fn ui_mut(&mut self) -> &mut UiData {
+    fn ui_mut(&mut self) -> &mut Ui {
         &mut self.ui
     }
 }
@@ -87,9 +87,7 @@ impl Widget for TracedParent {
 
 #[test]
 fn a_widget_retains_its_entry_layer_not_its_child_cursor() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let back = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE));
     let front = rsc.ui.widgets.add_strong(Rect::new(PaintId::RED));
     let stack = rsc.ui.widgets.add_strong(Stack {
@@ -125,9 +123,7 @@ fn a_widget_retains_its_entry_layer_not_its_child_cursor() {
 
 #[test]
 fn a_size_dependent_parent_is_invalidated_before_layout_runs_downward() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let trace = Rc::new(RefCell::new(Vec::new()));
     let child = rsc.ui.widgets.add_strong(TracedLeaf {
         height: 20.0,
@@ -155,9 +151,7 @@ fn a_size_dependent_parent_is_invalidated_before_layout_runs_downward() {
 
 #[test]
 fn a_parent_that_ignores_child_size_is_not_invalidated_with_it() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let trace = Rc::new(RefCell::new(Vec::new()));
     let child = rsc.ui.widgets.add_strong(TracedLeaf {
         height: 20.0,
@@ -183,9 +177,7 @@ fn a_parent_that_ignores_child_size_is_not_invalidated_with_it() {
 
 #[test]
 fn a_span_reuses_unchanged_sibling_sizes_when_only_its_along_extent_changes() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let changed_draws = Rc::new(Cell::new(0));
     let sibling_draws = Rc::new(Cell::new(0));
     let changed = rsc.ui.widgets.add_strong(CountedLeaf {
@@ -230,9 +222,7 @@ fn a_span_reuses_unchanged_sibling_sizes_when_only_its_along_extent_changes() {
 
 #[test]
 fn a_child_coordinate_offset_moves_only_the_child_subtree() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let child = rsc.ui.widgets.add_strong(FixedRect(40.0));
     let child_weak = child.weak();
     let parent = rsc.ui.widgets.add_strong(ChildOffset {
@@ -274,9 +264,7 @@ fn a_child_coordinate_offset_moves_only_the_child_subtree() {
 
 #[test]
 fn a_hinted_rest_draws_once_and_only_moves_the_fixed_child_after_it() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let first = rsc.ui.widgets.add_strong(FixedRect(40.0));
     let fill = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE));
     let fill = rsc.ui.widgets.add_strong(Sized {
@@ -330,9 +318,7 @@ fn scrolled_rects(
 
 #[test]
 fn an_unchanged_frame_draws_and_rewrites_nothing() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (_scroll, root, _rects) = scrolled_rects(&mut rsc, 500);
     let mut render = UiRenderState::new();
     render.resize((800.0, 20000.0));
@@ -348,9 +334,7 @@ fn an_unchanged_frame_draws_and_rewrites_nothing() {
 
 #[test]
 fn scrolling_moves_in_o1_without_a_redraw() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (scroll, root, _rects) = scrolled_rects(&mut rsc, 500);
     let mut render = UiRenderState::new();
     render.resize((800.0, 600.0));
@@ -370,9 +354,7 @@ fn scrolling_moves_in_o1_without_a_redraw() {
 
 #[test]
 fn hit_testing_follows_a_scrolled_widget() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (scroll, root, rects) = scrolled_rects(&mut rsc, 500);
     let mut render = UiRenderState::new();
     render.resize((800.0, 600.0));
@@ -398,9 +380,7 @@ fn hit_testing_follows_a_scrolled_widget() {
 
 #[test]
 fn redrawing_a_masked_widget_does_not_nest_its_own_mask() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (_scroll, inner_root, _rects) = scrolled_rects(&mut rsc, 8);
     let masked = rsc.ui.widgets.add_strong(Masked {
         shape: None,
@@ -424,9 +404,7 @@ fn redrawing_a_masked_widget_does_not_nest_its_own_mask() {
 
 #[test]
 fn a_mask_stays_put_while_its_scrolled_content_moves() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (scroll, inner_root, _rects) = scrolled_rects(&mut rsc, 500);
     let masked = rsc.ui.widgets.add_strong(Masked {
         shape: None,
@@ -473,9 +451,7 @@ fn composer_like_tree(rsc: &mut TestRsc) -> (WeakWidget<TextEdit>, StrongWidget)
 
 #[test]
 fn composing_text_after_a_keyboard_resize_lands_in_the_bars_own_region() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (field, root) = composer_like_tree(&mut rsc);
     let mut render = UiRenderState::new();
 
@@ -515,9 +491,7 @@ fn composing_text_after_a_keyboard_resize_lands_in_the_bars_own_region() {
 
 #[test]
 fn a_scroll_measures_the_box_it_was_offered_not_the_window() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let rect = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE));
     let tall = rsc.ui.widgets.add_strong(Sized {
         inner: rect.any(),
@@ -565,9 +539,7 @@ fn a_scroll_measures_the_box_it_was_offered_not_the_window() {
 
 #[test]
 fn a_panned_widgets_own_hit_box_moves_exactly_once() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let rect = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE));
     let tall = rsc.ui.widgets.add_strong(Sized {
         inner: rect.any(),
@@ -601,9 +573,7 @@ fn a_panned_widgets_own_hit_box_moves_exactly_once() {
 
 #[test]
 fn a_masked_widget_keeps_one_mask_slot_that_is_always_its_own_region() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (_scroll, inner_root, _rects) = scrolled_rects(&mut rsc, 8);
     let masked = rsc.ui.widgets.add_strong(Masked {
         shape: None,
@@ -648,9 +618,7 @@ fn a_masked_widget_keeps_one_mask_slot_that_is_always_its_own_region() {
 
 #[test]
 fn a_dp_cap_is_reported_in_pixels_so_a_span_can_place_it() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let rect = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE));
     let tall = rsc.ui.widgets.add_strong(Sized {
         inner: rect.any(),
@@ -690,9 +658,7 @@ fn a_dp_cap_is_reported_in_pixels_so_a_span_can_place_it() {
 
 #[test]
 fn a_size_independent_widget_moved_by_its_parent_has_the_hit_box_it_is_drawn_at() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let top = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE));
     let spacer = rsc.ui.widgets.add_strong(Sized {
         inner: top.any(),
@@ -757,9 +723,7 @@ impl Widget for MoveThenPlace {
 
 #[test]
 fn a_widget_moved_by_its_parent_and_then_placed_inside_it_lands_at_the_placement() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let rect = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE));
     let child = rsc.ui.widgets.add_strong(Sized {
         inner: rect.any(),
@@ -839,9 +803,7 @@ fn rounded_container(rsc: &mut TestRsc) -> (UiRenderState, MaskIdx, WidgetId, u3
 
 #[test]
 fn a_masked_child_is_clipped_by_its_container_s_own_corner() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (render, mask, _child, slot) = rounded_container(&mut rsc);
     let corners = render.primitive_corners(slot, &rsc);
     let radius = render
@@ -879,9 +841,7 @@ fn a_masked_child_is_clipped_by_its_container_s_own_corner() {
 
 #[test]
 fn a_mask_s_shape_decides_what_can_be_pressed() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (render, mask, _child, slot) = rounded_container(&mut rsc);
     let corners = render.primitive_corners(slot, &rsc);
 
@@ -907,9 +867,7 @@ fn a_mask_s_shape_decides_what_can_be_pressed() {
 
 #[test]
 fn nested_masks_multiply_their_coverage() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let child = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE));
     let child_id = child.id();
 
@@ -970,9 +928,7 @@ fn nested_masks_multiply_their_coverage() {
 
 #[test]
 fn a_plain_mask_still_clips_to_a_square_box() {
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let (_scroll, inner_root, _rects) = scrolled_rects(&mut rsc, 8);
     let root = rsc
         .ui
@@ -1002,9 +958,7 @@ fn a_plain_mask_still_clips_to_a_square_box() {
 #[test]
 fn a_scroll_area_opens_at_the_start_of_content_it_has_not_measured_yet() {
     for (name, pin, want) in [("read", Pin::Start, 0.0), ("written", Pin::End, 4900.0)] {
-        let mut rsc = TestRsc {
-            ui: UiData::default(),
-        };
+        let mut rsc = TestRsc { ui: Ui::default() };
         let fill = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE)).any();
         let tall = rsc.ui.widgets.add_strong(Sized {
             inner: fill,
@@ -1037,9 +991,7 @@ fn a_span_of_padded_children_inside_a_span_draws_each_where_its_box_is() {
     const PAD: f32 = 4.0;
     const ROW: f32 = 20.0;
     const HEADER: f32 = 30.0;
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let header_fill = rsc.ui.widgets.add_strong(Rect::new(PaintId::RED)).any();
     let header_id = header_fill.id();
     let header = rsc.ui.widgets.add_strong(Sized {
@@ -1120,9 +1072,7 @@ fn a_new_child_in_a_growing_lazy_row_uses_its_final_box_immediately() {
     const SECOND: f32 = 70.0;
     const GAP: f32 = 8.0;
 
-    let mut rsc = TestRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = TestRsc { ui: Ui::default() };
     let first = rsc.ui.widgets.add_strong(Rect::new(PaintId::WHITE));
     let first_id = first.id();
     let first = rsc.ui.widgets.add_strong(Sized {