diff options
| author | Bil Bas (Spooner) <bil.bagpuss@gmail.com> | 2015-02-18 13:53:40 +0000 |
|---|---|---|
| committer | Bil Bas (Spooner) <bil.bagpuss@gmail.com> | 2015-02-18 13:53:40 +0000 |
| commit | 33ed0efeefff16589888e3ed8010f47f044ff109 (patch) | |
| tree | 440a726fdf642bb06775baaec2e4842c7eb711d8 | |
| parent | 335cd90441953502f2f37c311f1a722c027c814d (diff) | |
| parent | 63165d80d5bbd6ecbd8a47e8f526db169cbb8dc7 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
| -rw-r--r-- | platform/osx/os_osx.mm | 2 |
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}; |