diff options
| author | tomaka <pierre.krieger1708@gmail.com> | 2014-12-18 08:03:41 +0100 |
|---|---|---|
| committer | tomaka <pierre.krieger1708@gmail.com> | 2014-12-18 08:03:41 +0100 |
| commit | 94348113281828a2045efcf24536ab6b1aad837e (patch) | |
| tree | f4371bffa15e3537523e683c7b2f1e63b78e8dc4 /src | |
| parent | 452514a863c310a1fd5096f6967b75caab9abeec (diff) | |
| parent | 3c1a803d8d244d0004f982578e5534804f9d5da0 (diff) | |
| download | glutin-94348113281828a2045efcf24536ab6b1aad837e.tar.gz glutin-94348113281828a2045efcf24536ab6b1aad837e.zip | |
Merge pull request #164 from glennw/scroll-wheel
Add scroll wheel events for mac.
Diffstat (limited to 'src')
| -rw-r--r-- | src/osx/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osx/mod.rs b/src/osx/mod.rs index c69486a..7ea6cb4 100644 --- a/src/osx/mod.rs +++ b/src/osx/mod.rs @@ -23,7 +23,7 @@ use std::mem; use std::ptr; use std::sync::atomic::{AtomicBool, Relaxed}; -use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput}; +use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel}; use events::ElementState::{Pressed, Released}; use events::MouseButton::{LeftMouseButton, RightMouseButton}; use events; @@ -338,7 +338,7 @@ impl Window { events.push(alt_modifier.unwrap()); } }, - NSScrollWheel => { }, + NSScrollWheel => { events.push(MouseWheel(-event.scrollingDeltaY() as i32)); }, NSOtherMouseDown => { }, NSOtherMouseUp => { }, NSOtherMouseDragged => { }, |