Revert "Merge pull request #289 from hecrj/fix/cursor-events"

`winit` seems to produce `CursorEntered` and `CursorLeft` events after wheel scrolling for no apparent reason (?). This causes annoying flickering when hovering some widgets on a scrollable. I should investigate this further. We are rolling back the fix for the time being.
iced-rs · Apr 17, 2020 · ae546a5 · ae546a5
1 parent b44f14e
commit ae546a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs
@@ -188,15 +188,8 @@ where
         let mut messages = Vec::new();
 
         for event in events {
-            match event {
-                Event::Mouse(mouse::Event::CursorMoved { x, y }) => {
-                    self.cursor_position = Point::new(x, y);
-                }
-                Event::Mouse(mouse::Event::CursorLeft) => {
-                    // TODO: Encode cursor availability
-                    self.cursor_position = Point::new(-1.0, -1.0);
-                }
-                _ => {}
+            if let Event::Mouse(mouse::Event::CursorMoved { x, y }) = event {
+                self.cursor_position = Point::new(x, y);
             }
 
             self.root.widget.on_event(

diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
@@ -27,12 +27,6 @@ pub fn window_event(
                 height: logical_size.height,
             }))
         }
-        WindowEvent::CursorEntered { .. } => {
-            Some(Event::Mouse(mouse::Event::CursorEntered))
-        }
-        WindowEvent::CursorLeft { .. } => {
-            Some(Event::Mouse(mouse::Event::CursorLeft))
-        }
         WindowEvent::CursorMoved { position, .. } => {
             let position = position.to_logical::<f64>(scale_factor);