From 2482aa1362402ca26d41007b9a2fa49d84fa53aa Mon Sep 17 00:00:00 2001 From: James Emselle Date: Thu, 26 Jun 2014 22:46:55 +1000 Subject: Fixed mouse motion events with captured mouse mode in OS X --- platform/osx/os_osx.mm | 9 ++------- 1 file 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); -- cgit v1.2.3