Add zero wheel_delta to all remaining instances of MouseEvent

linebender · May 2, 2020 · 4db45bd · 4db45bd
1 parent dcae42d
commit 4db45bd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/druid-shell/src/platform/mac/window.rs b/druid-shell/src/platform/mac/window.rs
@@ -373,6 +373,7 @@ fn mouse_event(nsevent: id, view: id, count: u8, button: MouseButton) -> MouseEv
             mods: modifiers,
             count,
             button,
+            wheel_delta: Vec2::ZERO,
         }
     }
 }

diff --git a/druid-shell/src/platform/web/window.rs b/druid-shell/src/platform/web/window.rs
@@ -148,6 +148,7 @@ fn setup_mouse_down_callback(ws: &Rc<WindowState>) {
                 mods: get_modifiers!(event),
                 count: 1,
                 button,
+                wheel_delta: Vec2::ZERO,
             };
             state.handler.borrow_mut().mouse_down(&event);
         }
@@ -165,6 +166,7 @@ fn setup_mouse_up_callback(ws: &Rc<WindowState>) {
                 mods: get_modifiers!(event),
                 count: 0,
                 button,
+                wheel_delta: Vec2::ZERO,
             };
             state.handler.borrow_mut().mouse_up(&event);
         }
@@ -181,6 +183,7 @@ fn setup_mouse_move_callback(ws: &Rc<WindowState>) {
             mods: get_modifiers!(event),
             count: 0,
             button: MouseButton::None,
+            wheel_delta: Vec2::ZERO,
         };
         state.handler.borrow_mut().mouse_move(&event);
     });

diff --git a/druid-shell/src/platform/x11/window.rs b/druid-shell/src/platform/x11/window.rs
@@ -25,7 +25,7 @@ use xcb::ffi::XCB_COPY_FROM_PARENT;
 use crate::dialog::{FileDialogOptions, FileInfo};
 use crate::keyboard::{KeyEvent, KeyModifiers};
 use crate::keycodes::KeyCode;
-use crate::kurbo::{Point, Rect, Size};
+use crate::kurbo::{Point, Rect, Size, Vec2};
 use crate::mouse::{Cursor, MouseButton, MouseButtons, MouseEvent};
 use crate::piet::{Piet, RenderContext};
 use crate::window::{IdleToken, Text, TimerToken, WinHandler};
@@ -456,6 +456,7 @@ impl Window {
             },
             count: 1,
             button: MouseButton::Left,
+            wheel_delta: Vec2::ZERO,
         };
         if let Ok(mut handler) = self.handler.try_borrow_mut() {
             handler.mouse_down(&mouse_event);
@@ -480,6 +481,7 @@ impl Window {
             },
             count: 0,
             button: MouseButton::Left,
+            wheel_delta: Vec2::ZERO,
         };
         if let Ok(mut handler) = self.handler.try_borrow_mut() {
             handler.mouse_up(&mouse_event);
@@ -504,6 +506,7 @@ impl Window {
             },
             count: 0,
             button: MouseButton::None,
+            wheel_delta: Vec2::ZERO,
         };
         if let Ok(mut handler) = self.handler.try_borrow_mut() {
             handler.mouse_move(&mouse_event);

diff --git a/druid/src/tests/mod.rs b/druid/src/tests/mod.rs
@@ -27,6 +27,7 @@ use crate::widget::*;
 use crate::*;
 use harness::*;
 use helpers::*;
+use kurbo::Vec2;
 
 /// This function creates a temporary directory and returns a PathBuf to it.
 ///
@@ -80,6 +81,7 @@ fn propogate_hot() {
             mods: KeyModifiers::default(),
             count: 0,
             button: MouseButton::None,
+            wheel_delta: Vec2::ZERO,
         }
     }
     #[allow(clippy::cognitive_complexity)]