fixes iced-rs#2359

The current implementation strictly scrolls vertically without the shift modifier and horizontally with the shift modifier. This patch checks the modifier only when the direction is Both.
woelfman · May 14, 2024 · 41ef776 · 41ef776
1 parent e69e2c0
commit 41ef776
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
@@ -564,12 +564,18 @@ where
                 let delta = match delta {
                     mouse::ScrollDelta::Lines { x, y } => {
                         // TODO: Configurable speed/friction (?)
-                        let movement = if !cfg!(target_os = "macos") // macOS automatically inverts the axes when Shift is pressed
-                            && state.keyboard_modifiers.shift()
-                        {
-                            Vector::new(y, x)
-                        } else {
-                            Vector::new(x, y)
+                        let movement = match self.direction {
+                            Direction::Vertical(_) => Vector::new(x, y),
+                            Direction::Horizontal(_) => Vector::new(y, x),
+                            Direction::Both { vertical: _, horizontal: _ } => {
+                                if !cfg!(target_os = "macos") // macOS automatically inverts the axes when Shift is pressed
+                                    && state.keyboard_modifiers.shift()
+                                {
+                                    Vector::new(y, x)
+                                } else {
+                                    Vector::new(x, y)
+                                }
+                            }
                         };
 
                         movement * 60.0