summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorokamstudio <juan@okamstudio.com>2014-02-13 12:03:34 -0200
committerokamstudio <juan@okamstudio.com>2014-02-13 12:03:34 -0200
commit337d98a3e9d0e885448bb6187dcc4ded103c47df (patch)
treefd08fa94b2f967a9307a256bf0aa8686dc53126f
parent3319fd3afa40c2c4098ace04bf3d85d9343a90bc (diff)
parent335d963031bc081166b3a73d9be4bd2bef2661fc (diff)
Merge pull request #24 from jeremycw/osx-retina
Fix mouse coordinates on OS X retina displays
-rw-r--r--platform/osx/os_osx.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 86d1dbb4c2..8c224ad2db 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -378,8 +378,8 @@ static int button_mask=0;
prev_mouse_y=mouse_y;
const NSRect contentRect = [OS_OSX::singleton->window_view frame];
const NSPoint p = [event locationInWindow];
- mouse_x = p.x;
- mouse_y = contentRect.size.height - p.y;
+ mouse_x = p.x * [[event window] backingScaleFactor];
+ mouse_y = (contentRect.size.height - p.y) * [[event window] backingScaleFactor];
ev.mouse_motion.x=mouse_x;
ev.mouse_motion.y=mouse_y;
ev.mouse_motion.global_x=mouse_x;