Merge pull request #271 from iced-rs/menu_fix

Menu fix
iced-rs · Jul 21, 2024 · 8fdab86 · 8fdab86
2 parents 5cb704d + a1a897c
commit 8fdab86
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/widgets/menu/menu_tree.rs b/src/widgets/menu/menu_tree.rs
@@ -70,7 +70,7 @@ impl Default for MenuState {
             active: None,
             slice: MenuSlice {
                 start_index: 0,
-                end_index: usize::MAX,
+                end_index: usize::MAX - 1,
                 lower_bound_rel: 0.0,
                 upper_bound_rel: f32::MAX,
             },
@@ -390,10 +390,12 @@ where
 
         let menu_state = tree.state.downcast_ref::<MenuState>();
         let slice = &menu_state.slice;
+        let max_item_slice = self.items.len()-1.min(slice.end_index);
+        let max_tree_slice = tree.children.len()-1.min(slice.end_index);
 
-        self.items[slice.start_index..=slice.end_index]
+        self.items[slice.start_index..=max_item_slice]
             .iter()
-            .zip(tree.children[slice.start_index..=slice.end_index].iter()) // [item_tree...]
+            .zip(tree.children[slice.start_index..=max_tree_slice].iter()) // [item_tree...]
             .zip(slice_layout.children()) // [item_layout...]
             .map(|((item, tree), layout)| {
                 item.mouse_interaction(tree, layout, cursor, viewport, renderer)