table: Fix to only handle one way scrolling at same time. (#507)

Closes #314
longbridge · Dec 20, 2024 · 500aa2d · 500aa2d
1 parent 28463d3
commit 500aa2d
Showing 1 changed file with 24 additions and 15 deletions.
diff --git a/crates/ui/src/scroll/scrollable_mask.rs b/crates/ui/src/scroll/scrollable_mask.rs
@@ -126,29 +126,38 @@ impl Element for ScrollableMask {
                 let hitbox = hitbox.clone();
                 let mouse_position = cx.mouse_position();
                 let scroll_handle = self.scroll_handle.clone();
-                let old_offset = scroll_handle.offset();
+                let last_offset = scroll_handle.offset();
                 let view_id = self.view.entity_id();
-                let is_horizontal = self.axis == ScrollableAxis::Horizontal;
+                let is_horizontal = matches!(self.axis, ScrollableAxis::Horizontal);
 
                 move |event: &ScrollWheelEvent, phase, cx| {
                     if bounds.contains(&mouse_position) && phase.bubble() && hitbox.is_hovered(cx) {
-                        let delta = event.delta.pixel_delta(line_height);
-
-                        if is_horizontal && !delta.x.is_zero() {
-                            // When is horizontal scroll, move the horizontal scroll handle to make scrolling.
-                            let mut offset = scroll_handle.offset();
-                            offset.x += delta.x;
-                            scroll_handle.set_offset(offset);
+                        let mut delta = event.delta.pixel_delta(line_height);
+                        let mut offset = scroll_handle.offset();
+
+                        // Limit for only one way scrolling at same time.
+                        // When use MacBook touchpad we may get both x and y delta,
+                        // only allows the one that more to scroll.
+                        if !delta.x.is_zero() && !delta.y.is_zero() {
+                            if delta.x.abs() > delta.y.abs() {
+                                delta.y = px(0.);
+                            } else {
+                                delta.x = px(0.);
+                            }
                         }
 
-                        if !is_horizontal && !delta.y.is_zero() {
-                            // When is vertical scroll, move the vertical scroll handle to make scrolling.
-                            let mut offset = scroll_handle.offset();
-                            offset.y += delta.y;
-                            scroll_handle.set_offset(offset);
+                        if is_horizontal {
+                            if !delta.x.is_zero() {
+                                offset.x += delta.x;
+                            }
+                        } else {
+                            if !delta.y.is_zero() {
+                                offset.y += delta.y;
+                            }
                         }
 
-                        if old_offset != scroll_handle.offset() {
+                        if last_offset != offset {
+                            scroll_handle.set_offset(offset);
                             cx.notify(Some(view_id));
                             cx.stop_propagation();
                         }