diff options
| author | Paul Rouget <me@paulrouget.com> | 2016-03-04 01:28:43 +0100 |
|---|---|---|
| committer | Paul Rouget <me@paulrouget.com> | 2016-03-04 01:28:43 +0100 |
| commit | e843206c1303475678482f623477408468b8a74b (patch) | |
| tree | 1243ddf9e5b337b0b8ad91eabc269ce429072a4b /src/api/x11 | |
| parent | 2638db665afc175cf128c3e25bc883f4c114bb5a (diff) | |
| parent | 7886ff9acdbc4961359725536c1a15e2cbb3d4f5 (diff) | |
| download | glutin-e843206c1303475678482f623477408468b8a74b.tar.gz glutin-e843206c1303475678482f623477408468b8a74b.zip | |
Merge pull request #735 from metajack/overscroll-tomaka
Add phases to wheel events.
Diffstat (limited to 'src/api/x11')
| -rw-r--r-- | src/api/x11/input.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/api/x11/input.rs b/src/api/x11/input.rs index 2ebc989..a05b22e 100644 --- a/src/api/x11/input.rs +++ b/src/api/x11/input.rs @@ -201,7 +201,7 @@ impl XInputEventHandler { } else { -1.0 }; - Some(MouseWheel(LineDelta(0.0, delta))) + Some(MouseWheel(LineDelta(0.0, delta), TouchPhase::Moved)) } else { // emulated button event from a touch/smooth-scroll // event. Ignore these events and handle scrolling @@ -235,7 +235,8 @@ impl XInputEventHandler { } if scroll_delta.0.abs() > 0.0 || scroll_delta.1.abs() > 0.0 { - Some(MouseWheel(LineDelta(scroll_delta.0 as f32, scroll_delta.1 as f32))) + Some(MouseWheel(LineDelta(scroll_delta.0 as f32, scroll_delta.1 as f32), + TouchPhase::Moved)) } else { let new_cursor_pos = (event_data.event_x, event_data.event_y); if new_cursor_pos != self.current_state.cursor_pos { |