summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Emselle <james.e.0111.2@gmail.com>2014-06-26 22:46:55 +1000
committerJames Emselle <james.e.0111.2@gmail.com>2014-06-26 22:46:55 +1000
commit2482aa1362402ca26d41007b9a2fa49d84fa53aa (patch)
treef729f369010819193203cdd78bf1933b6f9ce5be
parent911914adad997b6ab6ceba9bd45349254498ed37 (diff)
Fixed mouse motion events with captured mouse mode in OS X
-rw-r--r--platform/osx/os_osx.mm9
1 files changed, 2 insertions, 7 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index c09a45bbad..12f98cebe2 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -384,15 +384,10 @@ static int button_mask=0;
ev.mouse_motion.y=mouse_y;
ev.mouse_motion.global_x=mouse_x;
ev.mouse_motion.global_y=mouse_y;
- ev.mouse_motion.relative_x=mouse_x - prev_mouse_x;
- ev.mouse_motion.relative_y=mouse_y - prev_mouse_y;
+ ev.mouse_motion.relative_x=[event deltaX] * [[event window] backingScaleFactor];
+ ev.mouse_motion.relative_y=[event deltaY] * [[event window] backingScaleFactor];
ev.mouse_motion.mod = translateFlags([event modifierFlags]);
-
-// ev.mouse_motion.relative_x=[event deltaX];
-// ev.mouse_motion.relative_y=[event deltaY];
-
-
OS_OSX::singleton->input->set_mouse_pos(Point2(mouse_x,mouse_y));
OS_OSX::singleton->push_input(ev);