leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Express scroll deltas as either line or pixel deltas

Browse source 
Depending on the platform and device, scroll deltas may either
be represented as pixel deltas specifying the amount
in pixels to scroll or they may be expressed in 'lines' or 'chunks'
for low resolution devices (eg. a traditional mouse wheel).

Pixel deltas are currently available on OS X. X11 currently
supports only integer line deltas, though pixel deltas
are available via XInput2. Windows supports fractional
line deltas.
This commit is contained in:
Robert Knight 2015-06-12 15:32:11 +01:00
parent a0e29d9410
commit f0bab95c4d
5 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/cocoa/mod.rs
View file

@ -275,7 +275,11 @@ impl<'a> Iterator for PollEventsIterator<'a> {
self.window.delegate.state.pending_events.lock().unwrap().extend(events.into_iter());
event
},
NSScrollWheel => { Some(MouseWheel(event.scrollingDeltaX() as f64, event.scrollingDeltaY() as f64)) },
NSScrollWheel => {
use events::MouseScrollDelta::PixelDelta;
let delta = PixelDelta(event.scrollingDeltaX() as f32, event.scrollingDeltaY() as f32);
Some(MouseWheel(delta))
},
_ => { None },
};

5
src/api/win32/callback.rs
View file

@ -112,12 +112,13 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
winapi::WM_MOUSEWHEEL => {
use events::Event::MouseWheel;
use events::MouseScrollDelta::LineDelta;
let value = (wparam >> 16) as i16;
let value = value as i32;
let value = value as f64 / winapi::WHEEL_DELTA as f64;
let value = value as f32 / winapi::WHEEL_DELTA as f32;
send_event(window, MouseWheel(0.0, value));
send_event(window, MouseWheel(LineDelta(0.0, value)));
0
},

7
src/api/x11/window.rs
View file

@ -219,6 +219,7 @@ impl<'a> Iterator for PollEventsIterator<'a> {
use events::Event::{MouseInput, MouseWheel};
use events::ElementState::{Pressed, Released};
use events::MouseButton::{Left, Right, Middle};
use events::MouseScrollDelta::{LineDelta};
let event: &ffi::XButtonEvent = unsafe { mem::transmute(&xev) };
@ -229,11 +230,13 @@ impl<'a> Iterator for PollEventsIterator<'a> {
ffi::Button2 => Some(Middle),
ffi::Button3 => Some(Right),
ffi::Button4 => {
self.window.pending_events.lock().unwrap().push_back(MouseWheel(0.0, 1.0));
let delta = LineDelta(0.0, 1.0);
self.window.pending_events.lock().unwrap().push_back(MouseWheel(delta));
None
}
ffi::Button5 => {
self.window.pending_events.lock().unwrap().push_back(MouseWheel(0.0, -1.0));
let delta = LineDelta(0.0, -1.0);
self.window.pending_events.lock().unwrap().push_back(MouseWheel(delta));
None
}
_ => None