diff options
author | tomaka <pierre.krieger1708@gmail.com> | 2015-02-05 18:37:53 +0100 |
---|---|---|
committer | tomaka <pierre.krieger1708@gmail.com> | 2015-02-05 18:37:53 +0100 |
commit | 6b52bf95a4a5d0f6c1dbf5ac49036dbf7d9c1858 (patch) | |
tree | 762b32990ce7f800bf56c7952ac6a43b8d3978e5 /src/cocoa | |
parent | a6a43dbe658554c3259f73f5dc3c498461341b9f (diff) | |
parent | b2367fe2e6bded2c36d1b5e4f0dc595586b4bd08 (diff) | |
download | glutin-6b52bf95a4a5d0f6c1dbf5ac49036dbf7d9c1858.tar.gz glutin-6b52bf95a4a5d0f6c1dbf5ac49036dbf7d9c1858.zip |
Merge pull request #254 from aepsil0n/mousebutton-renaming
Rename enum variants of MouseButton
Diffstat (limited to 'src/cocoa')
-rw-r--r-- | src/cocoa/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cocoa/mod.rs b/src/cocoa/mod.rs index 2ff4ff9..1086a1b 100644 --- a/src/cocoa/mod.rs +++ b/src/cocoa/mod.rs @@ -29,7 +29,7 @@ use std::ascii::AsciiExt; use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel}; use events::ElementState::{Pressed, Released}; -use events::MouseButton::{LeftMouseButton, RightMouseButton}; +use events::MouseButton; use events; pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; @@ -433,10 +433,10 @@ impl Window { } match msg_send()(event, selector("type")) { - NSLeftMouseDown => { events.push_back(MouseInput(Pressed, LeftMouseButton)); }, - NSLeftMouseUp => { events.push_back(MouseInput(Released, LeftMouseButton)); }, - NSRightMouseDown => { events.push_back(MouseInput(Pressed, RightMouseButton)); }, - NSRightMouseUp => { events.push_back(MouseInput(Released, RightMouseButton)); }, + NSLeftMouseDown => { events.push_back(MouseInput(Pressed, MouseButton::Left)); }, + NSLeftMouseUp => { events.push_back(MouseInput(Released, MouseButton::Left)); }, + NSRightMouseDown => { events.push_back(MouseInput(Pressed, MouseButton::Right)); }, + NSRightMouseUp => { events.push_back(MouseInput(Released, MouseButton::Right)); }, NSMouseMoved => { let window_point: NSPoint = msg_send()(event, selector("locationInWindow")); // let window_point = event.locationInWindow(); |