godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into wparentheses_removal

This commit is contained in:
ElectricSolstice 2015-02-17 23:10:56 -08:00
parent 0e1f34b49d 63165d80d5
commit c0efa3fb5b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/osx/os_osx.mm
View File

@ -1100,7 +1100,7 @@ void OS_OSX::warp_mouse_pos(const Point2& p_to) {
NSPoint localPoint = { p_to.x, p_to.y }; NSPoint localPoint = { p_to.x, p_to.y };
NSPoint pointInWindow = [window_view convertPoint:localPoint toView:nil]; 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 //point in scren coords
CGPoint lMouseWarpPos = { pointOnScreen.x, pointOnScreen.y}; CGPoint lMouseWarpPos = { pointOnScreen.x, pointOnScreen.y};