diff options
| author | volzhs | 2015-06-28 22:28:02 +0900 |
|---|---|---|
| committer | volzhs | 2015-06-28 22:28:02 +0900 |
| commit | 584dd4db878d0a9ebf44dc529dad35bf8dd4796b (patch) | |
| tree | c601222ba20cacc80fba7ff43b5de425db13519c /platform | |
| parent | 81a1f32f0c1e4f64bb102c6aa46bcbb4e18bcd55 (diff) | |
| parent | 2b64f73b0459190d20b2f6de39275ee7979317c4 (diff) | |
| download | godot-584dd4db878d0a9ebf44dc529dad35bf8dd4796b.tar.gz godot-584dd4db878d0a9ebf44dc529dad35bf8dd4796b.tar.zst godot-584dd4db878d0a9ebf44dc529dad35bf8dd4796b.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/os_osx.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index e2ff8d111..72699366c 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1113,7 +1113,9 @@ 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:(NSRect){.origin=pointInWindow}].origin; + NSRect pointInWindowRect; + pointInWindowRect.origin = pointInWindow; + NSPoint pointOnScreen = [[window_view window] convertRectToScreen:pointInWindowRect].origin; //point in scren coords CGPoint lMouseWarpPos = { pointOnScreen.x, pointOnScreen.y}; |