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

Fix .app bundle crash on macOS 

(cherry picked from commit cfce8de0b5)
This commit is contained in:
bruvzg 2018-11-04 11:15:39 +02:00 committed by Rémi Verschelde
parent 9e91d4e5cb
commit 811b11c452
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/osx/os_osx.mm
View File

@ -330,13 +330,14 @@ static Vector2 get_mouse_pos(NSPoint locationInWindow, CGFloat backingScaleFacto
//_GodotInputWindowFocus(window, GL_TRUE); //_GodotInputWindowFocus(window, GL_TRUE);
//_GodotPlatformSetCursorMode(window, window->cursorMode); //_GodotPlatformSetCursorMode(window, window->cursorMode);
get_mouse_pos( if (OS_OSX::singleton->get_main_loop()) {
[OS_OSX::singleton->window_object mouseLocationOutsideOfEventStream], get_mouse_pos(
[OS_OSX::singleton->window_view backingScaleFactor]); [OS_OSX::singleton->window_object mouseLocationOutsideOfEventStream],
OS_OSX::singleton->input->set_mouse_position(Point2(mouse_x, mouse_y)); [OS_OSX::singleton->window_view backingScaleFactor]);
OS_OSX::singleton->input->set_mouse_position(Point2(mouse_x, mouse_y));
if (OS_OSX::singleton->get_main_loop())
OS_OSX::singleton->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_FOCUS_IN); OS_OSX::singleton->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_FOCUS_IN);
}
} }
- (void)windowDidResignKey:(NSNotification *)notification { - (void)windowDidResignKey:(NSNotification *)notification {