Skip to content

Commit

Permalink
Revert "Merge pull request #289 from hecrj/fix/cursor-events"
Browse files Browse the repository at this point in the history
`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.
  • Loading branch information
hecrj committed Apr 26, 2020
1 parent 4808fcb commit 4ce7357
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
11 changes: 2 additions & 9 deletions native/src/user_interface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 0 additions & 6 deletions winit/src/conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 4ce7357

Please sign in to comment.