summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorElectricSolstice <repairagent@yahoo.com>2015-02-17 23:10:56 -0800
committerElectricSolstice <repairagent@yahoo.com>2015-02-17 23:10:56 -0800
commitc0efa3fb5b8c545c34859cc722c3c8a2ada13e02 (patch)
treebc9ea9c35e7690365fa9f5574d7e5adabf165be2 /platform
parent0e1f34b49da3066bed94b316f22e6dd805509bf3 (diff)
parent63165d80d5bbd6ecbd8a47e8f526db169cbb8dc7 (diff)
Merge branch 'master' into wparentheses_removal
Diffstat (limited to 'platform')
-rw-r--r--platform/osx/os_osx.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index af2552496b..1c0d1f9991 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1100,7 +1100,7 @@ void OS_OSX::warp_mouse_pos(const Point2& p_to) {
NSPoint localPoint = { p_to.x, p_to.y };
NSPoint pointInWindow = [window_view convertPoint:localPoint toView:nil];
- NSPoint pointOnScreen = [[window_view window] convertRectToScreen:(CGRect){.origin=pointInWindow}];
+ NSPoint pointOnScreen = [[window_view window] convertRectToScreen:(NSRect){.origin=pointInWindow}].origin;
//point in scren coords
CGPoint lMouseWarpPos = { pointOnScreen.x, pointOnScreen.y};