table view displaying only needed cells

VladasZ · VladasZ · commit 24ed229a4040 · 2024-03-19T01:26:28.000+02:00
diff --git a/deps/ui/src/layout/placer.rs b/deps/ui/src/layout/placer.rs
@@ -6,7 +6,7 @@ use std::{
 
 use gm::{axis::Axis, flat::Size, IntoF32};
 use itertools::Itertools;
-use refs::{Own, Rglica, ToRglica};
+use refs::{Rglica, ToRglica};
 
 use crate::{
     layout::{layout_rule::LayoutRule, Anchor, Tiling},
@@ -507,15 +507,15 @@ impl Placer {
     }
 }
 
-fn place_vertically(views: &mut [Own<dyn View>], margin: f32) {
+fn place_vertically(views: Vec<WeakView>, margin: f32) {
     distribute::<{ Axis::Y }>(views, margin);
 }
 
-fn place_horizontally(views: &mut [Own<dyn View>], margin: f32) {
+fn place_horizontally(views: Vec<WeakView>, margin: f32) {
     distribute::<{ Axis::X }>(views, margin);
 }
 
-fn distribute<const AXIS: Axis>(views: &mut [Own<dyn View>], margin: f32) {
+fn distribute<const AXIS: Axis>(mut views: Vec<WeakView>, margin: f32) {
     let Some(mut last) = views.last_mut().map(|v| v.weak_view()) else {
         return;
     };
@@ -537,7 +537,7 @@ fn distribute<const AXIS: Axis>(views: &mut [Own<dyn View>], margin: f32) {
 
     let mut last_pos: f32 = 0.0;
 
-    for view in views.iter_mut() {
+    for view in &mut views {
         let mut frame = *view.frame();
 
         frame.set_position::<AXIS>(last_pos);
@@ -551,7 +551,7 @@ fn distribute<const AXIS: Axis>(views: &mut [Own<dyn View>], margin: f32) {
     }
 }
 
-fn distribute_with_ratio(size: Size, views: &mut [Own<dyn View>], ratios: &[f32]) {
+fn distribute_with_ratio(size: Size, mut views: Vec<WeakView>, ratios: &[f32]) {
     let total_ratio = 1.0 / ratios.iter().sum::<f32>();
 
     for i in 0..ratios.len() {
diff --git a/deps/ui/src/view/view_subviews.rs b/deps/ui/src/view/view_subviews.rs
@@ -13,7 +13,7 @@ pub trait ViewSubviews {
     fn __manually_set_superview(&mut self, superview: WeakView);
     fn superview(&self) -> &WeakView;
     fn subviews(&self) -> &[Own<dyn View>];
-    fn subviews_mut(&mut self) -> &mut [Own<dyn View>];
+    fn subviews_mut(&mut self) -> Vec<WeakView>;
     fn remove_from_superview(&mut self);
     fn take_from_superview(&mut self) -> Own<dyn View>;
     fn remove_all_subviews(&mut self);
@@ -45,8 +45,8 @@ impl<T: ?Sized + View> ViewSubviews for T {
         &self.base().subviews
     }
 
-    fn subviews_mut(&mut self) -> &mut [Own<dyn View>] {
-        &mut self.base_mut().subviews
+    fn subviews_mut(&mut self) -> Vec<WeakView> {
+        self.base_mut().subviews.iter().map(Own::weak).collect()
     }
 
     fn remove_from_superview(&mut self) {
diff --git a/deps/ui/ui_views/src/basic/scroll_view.rs b/deps/ui/ui_views/src/basic/scroll_view.rs
@@ -1,6 +1,7 @@
 use gm::flat::Size;
 use refs::Weak;
-use ui::{view, Sub, UIManager, ViewCallbacks, ViewData, ViewFrame, ViewSetup};
+use ui::{view, Sub, UIManager, ViewCallbacks, ViewData, ViewFrame, ViewSetup, ViewSubviews};
+use vents::Event;
 mod test_engine {
     pub(crate) use refs;
     pub(crate) use ui;
@@ -12,6 +13,21 @@ use crate::Slider;
 pub struct ScrollView {
     slider:           Sub<Slider>,
     pub content_size: Size,
+    pub on_scroll:    Event<f32>,
+}
+
+impl ScrollView {
+    pub fn remove_all_subviews(&mut self) {
+        let slider_addr = self.slider.addr();
+
+        for mut view in self.subviews_mut() {
+            if view.addr() == slider_addr {
+                continue;
+            }
+
+            view.remove_from_superview();
+        }
+    }
 }
 
 impl ViewSetup for ScrollView {
@@ -22,6 +38,7 @@ impl ViewSetup for ScrollView {
             let val = 1.0 - val;
             let range = self.content_size.height - self.height();
             self.content_offset.y = -range * val;
+            self.on_scroll.trigger(self.content_offset.y);
         });
 
         UIManager::on_scroll(self, move |scroll| {
@@ -59,5 +76,7 @@ impl ScrollView {
         self.content_offset.y = self.content_offset.y.clamp(-range, 0.0);
         let slider_val = -self.content_offset.y / range;
         self.slider.set_value_without_event(1.0 - slider_val);
+
+        self.on_scroll.trigger(self.content_offset.y);
     }
 }
diff --git a/deps/ui/ui_views/src/complex/spinner.rs b/deps/ui/ui_views/src/complex/spinner.rs
@@ -143,7 +143,7 @@ impl Spinner {
             let animation = UIAnimation::new(Animation::new(0.8, 0.0, 0.4), |sp, val| {
                 let color = sp.color();
                 sp.set_color(color.with_alpha(val));
-                for dot in sp.subviews_mut() {
+                for mut dot in sp.subviews_mut() {
                     let color = *dot.color();
                     dot.set_color(color.with_alpha(val));
                 }
diff --git a/deps/ui/ui_views/src/complex/table_view/table_view.rs b/deps/ui/ui_views/src/complex/table_view/table_view.rs
@@ -1,3 +1,4 @@
+use gm::LossyConvert;
 use refs::{weak_from_ref, Weak};
 use ui::{view, Sub, ViewCallbacks, ViewData, ViewFrame, ViewSetup, ViewSubviews};
 
@@ -26,6 +27,13 @@ impl ViewCallbacks for TableView {
 impl ViewSetup for TableView {
     fn setup(self: Weak<Self>) {
         self.scroll.place().back();
+        self.scroll.on_scroll.sub(move || {
+            self.layout_cells();
+        });
+
+        self.size_changed().sub(move || {
+            self.layout_cells();
+        })
     }
 }
 
@@ -37,13 +45,28 @@ impl TableView {
 }
 
 impl TableView {
-    pub fn layout_cells(mut self: Weak<Self>) {
-        let number_of_cells = self.data.number_of_cells() as f32;
+    fn layout_cells(mut self: Weak<Self>) {
+        self.scroll.remove_all_subviews();
+
+        let number_of_cells = self.data.number_of_cells();
+        let cell_height = self.data.cell_height();
 
-        let total_height = number_of_cells * self.data.cell_height();
+        let total_height = number_of_cells as f32 * cell_height;
         self.scroll.content_size.height = total_height;
 
-        for i in 0..self.data.number_of_cells() {
+        let number_of_cells_fits: usize = (self.height() / cell_height).ceil().lossy_convert();
+
+        let offset = self.scroll.content_offset.y;
+
+        let first_index: usize = (-offset / cell_height).floor().lossy_convert();
+
+        let mut last_index = first_index + number_of_cells_fits + 1;
+
+        if last_index > number_of_cells {
+            last_index = number_of_cells;
+        }
+
+        for i in first_index..last_index {
             let mut cell = self.data.make_cell();
 
             cell.place()
diff --git a/test_engine/src/app.rs b/test_engine/src/app.rs
@@ -192,7 +192,7 @@ impl App {
         view.calculate_absolute_frame();
         view.update();
         view.trigger_events();
-        for view in view.subviews_mut() {
+        for mut view in view.subviews_mut() {
             Self::update_view(view.deref_mut());
         }
     }
diff --git a/ui_test/src/views/complex/table_view.rs b/ui_test/src/views/complex/table_view.rs
@@ -1,13 +1,15 @@
 use std::{any::Any, ops::Deref};
 
 use anyhow::Result;
+use log::debug;
 use test_engine::{
     refs::{Own, Weak},
     ui::{
         view, AfterSetup, Color, Container, Label, Sub, TableData, TableView, View, ViewData, ViewSetup,
         ViewSubviews,
     },
-    App,
+    ui_test::inject_touches,
+    wait_for_next_frame, App,
 };
 
 #[view]
@@ -17,9 +19,8 @@ struct TestTableView {
 
 impl ViewSetup for TestTableView {
     fn setup(self: Weak<Self>) {
-        self.table.place().all_sides(150);
+        self.table.place().lr(280).tb(0);
         self.table.set_data_source(self.deref());
-        self.table.layout_cells();
     }
 }
 
@@ -29,7 +30,7 @@ impl TableData for TestTableView {
     }
 
     fn number_of_cells(&self) -> usize {
-        500
+        2_000_000
     }
 
     fn make_cell(&self) -> Own<dyn View> {
@@ -51,16 +52,68 @@ impl TableData for TestTableView {
 
     fn setup_cell(&self, cell: &mut dyn Any, index: usize) {
         let label = cell.downcast_mut::<Label>().unwrap();
-        label.set_text(format!("Cell number: {index}"));
+        label.set_text(format!("Cell number: {}", index + 1));
     }
 }
 
 pub async fn test_table_view() -> Result<()> {
-    let mut _view = App::init_test_view::<TestTableView>().await;
+    let view = App::init_test_view::<TestTableView>().await;
 
     App::set_window_size((1000, 1000));
 
-    //record_ui_test().await;
+    wait_for_next_frame().await;
+    wait_for_next_frame().await;
+    wait_for_next_frame().await;
+
+    assert_eq!(
+        view.table.scroll.subviews().last().unwrap().downcast::<Label>().unwrap().text(),
+        "Cell number: 26"
+    );
+
+    inject_touches(
+        "
+            865  126  m
+            877  111  m
+            745  74   m
+            680  41   m
+            691  28   m
+            696  28   m
+            699  27   m
+            699  27   b
+            698  36   m
+            697  66   m
+            697  123  m
+            694  186  m
+            693  228  m
+            692  272  m
+            692  323  m
+            693  384  m
+            696  422  m
+            701  473  m
+            707  536  m
+            710  653  m
+            707  736  m
+            698  783  m
+            691  820  m
+            685  868  m
+            678  925  m
+            676  959  m
+            675  978  m
+            674  994  m
+            674  1003 m
+            672  994  e
+            669  983  m
+            678  896  m
+        ",
+    )
+    .await;
+
+    assert_eq!(
+        view.table.scroll.subviews().last().unwrap().downcast::<Label>().unwrap().text(),
+        "Cell number: 2000000"
+    );
+
+    debug!("Table view test: OK");
 
     Ok(())
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use std::{`
`6`	`6`
`7`	`7`	`use gm::{axis::Axis, flat::Size, IntoF32};`
`8`	`8`	`use itertools::Itertools;`
`9`		`-use refs::{Own, Rglica, ToRglica};`
	`9`	`+use refs::{Rglica, ToRglica};`
`10`	`10`
`11`	`11`	`use crate::{`
`12`	`12`	`layout::{layout_rule::LayoutRule, Anchor, Tiling},`
`@@ -507,15 +507,15 @@ impl Placer {`
`507`	`507`	`}`
`508`	`508`	`}`
`509`	`509`
`510`		`-fn place_vertically(views: &mut [Own<dyn View>], margin: f32) {`
	`510`	`+fn place_vertically(views: Vec<WeakView>, margin: f32) {`
`511`	`511`	`distribute::<{ Axis::Y }>(views, margin);`
`512`	`512`	`}`
`513`	`513`
`514`		`-fn place_horizontally(views: &mut [Own<dyn View>], margin: f32) {`
	`514`	`+fn place_horizontally(views: Vec<WeakView>, margin: f32) {`
`515`	`515`	`distribute::<{ Axis::X }>(views, margin);`
`516`	`516`	`}`
`517`	`517`
`518`		`-fn distribute<const AXIS: Axis>(views: &mut [Own<dyn View>], margin: f32) {`
	`518`	`+fn distribute<const AXIS: Axis>(mut views: Vec<WeakView>, margin: f32) {`
`519`	`519`	`let Some(mut last) = views.last_mut().map(\|v\| v.weak_view()) else {`
`520`	`520`	`return;`
`521`	`521`	`};`
`@@ -537,7 +537,7 @@ fn distribute<const AXIS: Axis>(views: &mut [Own<dyn View>], margin: f32) {`
`537`	`537`
`538`	`538`	`let mut last_pos: f32 = 0.0;`
`539`	`539`
`540`		`- for view in views.iter_mut() {`
	`540`	`+ for view in &mut views {`
`541`	`541`	`let mut frame = *view.frame();`
`542`	`542`
`543`	`543`	`frame.set_position::<AXIS>(last_pos);`
`@@ -551,7 +551,7 @@ fn distribute<const AXIS: Axis>(views: &mut [Own<dyn View>], margin: f32) {`
`551`	`551`	`}`
`552`	`552`	`}`
`553`	`553`
`554`		`-fn distribute_with_ratio(size: Size, views: &mut [Own<dyn View>], ratios: &[f32]) {`
	`554`	`+fn distribute_with_ratio(size: Size, mut views: Vec<WeakView>, ratios: &[f32]) {`
`555`	`555`	`let total_ratio = 1.0 / ratios.iter().sum::<f32>();`
`556`	`556`
`557`	`557`	`for i in 0..ratios.len() {`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ impl Spinner {`
`143`	`143`	`let animation = UIAnimation::new(Animation::new(0.8, 0.0, 0.4), \|sp, val\| {`
`144`	`144`	`let color = sp.color();`
`145`	`145`	`sp.set_color(color.with_alpha(val));`
`146`		`- for dot in sp.subviews_mut() {`
	`146`	`+ for mut dot in sp.subviews_mut() {`
`147`	`147`	`let color = *dot.color();`
`148`	`148`	`dot.set_color(color.with_alpha(val));`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ impl App {`
`192`	`192`	`view.calculate_absolute_frame();`
`193`	`193`	`view.update();`
`194`	`194`	`view.trigger_events();`
`195`		`- for view in view.subviews_mut() {`
	`195`	`+ for mut view in view.subviews_mut() {`
`196`	`196`	`Self::update_view(view.deref_mut());`
`197`	`197`	`}`
`198`	`198`	`}`