aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-02-22 08:40:22 +0100
committertomaka <pierre.krieger1708@gmail.com>2015-02-22 08:40:22 +0100
commitd6ecbe6bfe745b8865a9fcc9ab2a70585d327b8e (patch)
tree67804a14ccf5745a146d4b08950008e86774a80e
parent424dbb29ed52b76dedfee752699635337277568c (diff)
parent246837adc8b8f531d5a7481b0fcb2687a3a27711 (diff)
downloadglutin-d6ecbe6bfe745b8865a9fcc9ab2a70585d327b8e.tar.gz
glutin-d6ecbe6bfe745b8865a9fcc9ab2a70585d327b8e.zip
Merge pull request #291 from mitchmindtree/master
Fix MouseMoved by checking for NSDrag events as well, closes #288
-rw-r--r--src/cocoa/mod.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cocoa/mod.rs b/src/cocoa/mod.rs
index 12f7a06..877a876 100644
--- a/src/cocoa/mod.rs
+++ b/src/cocoa/mod.rs
@@ -237,7 +237,10 @@ impl<'a> Iterator for PollEventsIterator<'a> {
NSLeftMouseUp => { Some(MouseInput(Released, MouseButton::Left)) },
NSRightMouseDown => { Some(MouseInput(Pressed, MouseButton::Right)) },
NSRightMouseUp => { Some(MouseInput(Released, MouseButton::Right)) },
- NSMouseMoved => {
+ NSMouseMoved |
+ NSLeftMouseDragged |
+ NSOtherMouseDragged |
+ NSRightMouseDragged => {
let window_point = event.locationInWindow();
let window: id = msg_send()(event, selector("window"));
let view_point = if window == 0 {