infinite_scroll: Only set loading state to loading when a loader exists

lucasmerlin · Feb 9, 2024 · 94636fa · 94636fa
1 parent d440b32
commit 94636fa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/crates/egui_infinite_scroll/CHANGELOG.md b/crates/egui_infinite_scroll/CHANGELOG.md
@@ -1,5 +1,8 @@
 # egui_infinite_scroll changelog
 
+## 0.2.1
+- fix loading() returning true when the list is completely empty
+
 ## 0.2.0
 - update egui to 0.26
 

diff --git a/crates/egui_infinite_scroll/examples/infinite_scroll_async.rs b/crates/egui_infinite_scroll/examples/infinite_scroll_async.rs
@@ -26,6 +26,10 @@ pub async fn main() -> eframe::Result<()> {
                     infinite_scroll.ui(ui, 10, |ui, _index, item| {
                         ui.label(format!("Item {}", item));
                     });
+
+                    if infinite_scroll.bottom_loading_state().loading() {
+                        ui.spinner();
+                    }
                 });
             });
         },

diff --git a/crates/egui_infinite_scroll/src/lib.rs b/crates/egui_infinite_scroll/src/lib.rs
@@ -313,10 +313,9 @@ impl<T: Debug + Send + Sync + 'static, Cursor: Clone + Debug + Send + 'static>
         if item_range.end + end_prefetch >= items.len()
             && matches!(self.bottom_loading_state, LoadingState::Idle { .. })
         {
-            self.bottom_loading_state = LoadingState::Loading;
-            let sender = self.bottom_inbox.sender();
-
             if let Some(end_loader) = &mut self.end_loader {
+                self.bottom_loading_state = LoadingState::Loading;
+                let sender = self.bottom_inbox.sender();
                 end_loader(
                     self.end_cursor.clone(),
                     Box::new(move |result| match result {
@@ -334,10 +333,9 @@ impl<T: Debug + Send + Sync + 'static, Cursor: Clone + Debug + Send + 'static>
         if item_range.start < end_prefetch
             && matches!(self.top_loading_state, LoadingState::Idle { .. })
         {
-            self.top_loading_state = LoadingState::Loading;
-            let sender = self.top_inbox.sender();
-
             if let Some(start_loader) = &mut self.start_loader {
+                self.top_loading_state = LoadingState::Loading;
+                let sender = self.top_inbox.sender();
                 start_loader(
                     self.start_cursor.clone(),
                     Box::new(move |result| match result {