iris: fold render state into Ui
This commit is contained in:
iris committed
1 parent
44a5da378b
commit
9b4c690916
25 files changed
+421
-390
No files matched your search
@@ -833,14 +833,14 @@ mod tests {
|
||||
}
|
||||
|
||||
struct TestRsc {
|
||||
ui: UiData,
|
||||
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
|
||||
}
|
||||
}
|
||||
@@ -882,9 +882,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_list_shorter_than_the_viewport_is_drawn_whole_and_stays_at_the_bottom() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
push_rows(&mut rsc, &mut list, &[0, 1, 2], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -912,9 +910,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_dir_up_span_grows_upward_from_item_zero() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::UP, Pin::End);
|
||||
let rows = push_rows(&mut rsc, &mut list, &[0, 1, 2], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -949,9 +945,7 @@ mod tests {
|
||||
#[test]
|
||||
fn a_delta_moves_both_directions_the_same_way_on_screen() {
|
||||
let moved_by = |dir: Dir| {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(dir, Pin::End);
|
||||
let keys: Vec<RowKey> = (0..10).collect();
|
||||
let rows = push_rows(&mut rsc, &mut list, &keys, 20.0);
|
||||
@@ -1003,9 +997,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_reversed_span_hit_tests_in_screen_space() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::UP, Pin::End);
|
||||
push_rows(&mut rsc, &mut list, &[0, 1, 2], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -1030,9 +1022,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn bottom_anchored_by_default() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
push_rows(&mut rsc, &mut list, &[0, 1, 2, 3, 4], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -1078,9 +1068,7 @@ mod tests {
|
||||
fn a_row_that_changes_height_draws_its_background_at_the_new_height_immediately() {
|
||||
for key_to_change in 0..5u64 {
|
||||
for new_height in [50.0f32, 8.0] {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
let mut rows = Vec::new();
|
||||
for key in 0..5u64 {
|
||||
@@ -1118,9 +1106,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_fill_shaped_background_is_not_left_oversized() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
let mut bg_ids = Vec::new();
|
||||
for key in 0..5u64 {
|
||||
@@ -1148,9 +1134,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn insert_above_anchor_is_o1_and_does_not_move_visible_rows() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
push_rows(&mut rsc, &mut list, &[10, 11, 12], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -1188,9 +1172,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn expanding_a_row_holds_the_edge_nearest_the_tap() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
let rows = push_rows(&mut rsc, &mut list, &[0, 1, 2, 3, 4], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -1234,9 +1216,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn expanding_a_row_holds_the_bottom_edge_when_tap_is_lower() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
let rows = push_rows(&mut rsc, &mut list, &[0, 1, 2, 3, 4], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -1270,9 +1250,7 @@ mod tests {
|
||||
#[test]
|
||||
fn moves_stay_o1_across_list_size() {
|
||||
for &n in &[20usize, 200, 2000] {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
let keys: Vec<RowKey> = (0..n as u64).collect();
|
||||
push_rows(&mut rsc, &mut list, &keys, 20.0);
|
||||
@@ -1300,9 +1278,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_large_accumulated_offset_rebases_without_moving_the_content() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
let keys: Vec<RowKey> = (0..100).collect();
|
||||
let rows = push_rows(&mut rsc, &mut list, &keys, 1_000.0);
|
||||
@@ -1348,9 +1324,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn replacing_the_last_row_stays_pinned_to_the_bottom() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
push_rows(&mut rsc, &mut list, &[0, 1, 2, 3, 4], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -1392,9 +1366,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn replace_back_forgets_the_evicted_keys_own_height() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
push_rows(&mut rsc, &mut list, &[0, 1, 2, 3, 4], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -1429,9 +1401,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn replacing_the_last_row_out_of_view_does_not_move_visible_rows() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
push_rows(&mut rsc, &mut list, &[0, 1, 2, 3, 4], 20.0);
|
||||
let (list_weak, root) = add_list(&mut rsc, list);
|
||||
@@ -1474,9 +1444,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn replacing_the_last_row_many_times_does_not_leak_primitives() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
for key in 0..5u64 {
|
||||
let (_bg_id, row) = background_styled_row(&mut rsc, 20.0);
|
||||
@@ -1511,9 +1479,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn an_ancestor_redrawing_a_dirty_row_leaves_no_stale_copy() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let mut list = LazySpan::new(Dir::DOWN, Pin::End);
|
||||
let mut rows = Vec::new();
|
||||
for key in 0..5u64 {
|
||||
@@ -1574,9 +1540,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_fling_moves_the_list_and_then_settles() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let (scroll, root, mut render) = build_flingable_list(&mut rsc);
|
||||
let list_weak = scroll;
|
||||
|
||||
@@ -1602,9 +1566,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_registered_fling_is_driven_by_tick_animations_and_then_unregisters() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let (scroll, root, mut render) = build_flingable_list(&mut rsc);
|
||||
let list_weak = scroll;
|
||||
let before = scroll_position(rsc.ui.widgets.get(&list_weak).unwrap());
|
||||
@@ -1637,9 +1599,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_negative_delta_moves_toward_the_end() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let (scroll, root, mut render) = build_flingable_list(&mut rsc);
|
||||
let list_weak = scroll;
|
||||
rsc.ui.widgets.get_mut(&scroll).unwrap().scroll(2000.0);
|
||||
@@ -1661,9 +1621,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn amt_counts_only_what_the_child_could_take() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let (scroll, root, mut render) = build_flingable_list(&mut rsc);
|
||||
rsc.ui.widgets.get_mut(&scroll).unwrap().scroll(100.0);
|
||||
render.update(&root, &mut rsc);
|
||||
@@ -1684,9 +1642,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_fling_stops_at_the_first_row() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let (scroll, root, mut render) = build_flingable_list(&mut rsc);
|
||||
let list_weak = scroll;
|
||||
rsc.ui.widgets.get_mut(&scroll).unwrap().fling(50_000.0);
|
||||
@@ -1710,9 +1666,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn scrolling_past_the_start_lands_on_it_in_the_same_frame() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let (scroll, root, mut render) = build_flingable_list(&mut rsc);
|
||||
let list_weak = scroll;
|
||||
rsc.ui.widgets.get_mut(&scroll).unwrap().scroll(100_000.0);
|
||||
@@ -1734,9 +1688,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn anchor_position_display_reports_slot_and_offset() {
|
||||
let mut rsc = TestRsc {
|
||||
ui: UiData::default(),
|
||||
};
|
||||
let mut rsc = TestRsc { ui: Ui::default() };
|
||||
let (list_weak, root, mut render) = build_flingable_list(&mut rsc);
|
||||
let _ = (&root, &mut render);
|
||||
let list_ref = rsc.ui.widgets.get(&list_weak).unwrap();
|
||||
|
||||
Reference in new issue
Block a user