diff options
author | tomaka <pierre.krieger1708@gmail.com> | 2015-05-06 16:56:24 +0200 |
---|---|---|
committer | tomaka <pierre.krieger1708@gmail.com> | 2015-05-06 16:56:24 +0200 |
commit | 119bd6393f5f3b8e1510ba6ab3281c8fb387449f (patch) | |
tree | 05340ea2480ff82440c55bbf968604a44447b0cf /src/api/cocoa | |
parent | 2d97e0380feb90aa802bc1e56aad0936eda8cc81 (diff) | |
parent | d9f0d92584af1d76779cb8cb4a70762c889970f5 (diff) | |
download | glutin-119bd6393f5f3b8e1510ba6ab3281c8fb387449f.tar.gz glutin-119bd6393f5f3b8e1510ba6ab3281c8fb387449f.zip |
Merge pull request #405 from tomaka/win32-wheel
[Breaking change] Fix mouse wheel value on win32 and return a f64 instead of i32 in the MouseWheel event
Diffstat (limited to 'src/api/cocoa')
-rw-r--r-- | src/api/cocoa/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs index a3c58f9..55ae617 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -275,7 +275,7 @@ impl<'a> Iterator for PollEventsIterator<'a> { self.window.delegate.state.pending_events.lock().unwrap().extend(events.into_iter()); event }, - NSScrollWheel => { Some(MouseWheel(event.scrollingDeltaY() as i32)) }, + NSScrollWheel => { Some(MouseWheel(event.scrollingDeltaX() as f64, event.scrollingDeltaY() as f64)) }, _ => { None }, }; |