diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-05 09:39:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-05 09:39:57 +0100 |
| commit | 5d5227104e98f7fb248986d847165e6f8515372a (patch) | |
| tree | 9c8b0b82ad22c4220c44e50799d7bbba87e3bf54 | |
| parent | 118c78372e5b33901c88f4011ce6f4628f64aff5 (diff) | |
| parent | 07aee14dd775397156056a9ff8526b586aaabef8 (diff) | |
Merge pull request #23499 from bruvzg/fix_osx_app_crash_and_black_spash
[macOS] Fix .app bundle crash and blank initial window
| -rw-r--r-- | platform/osx/os_osx.mm | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 77bf8a8146..985811e166 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -328,14 +328,14 @@ static Vector2 get_mouse_pos(NSPoint locationInWindow, CGFloat backingScaleFacto //_GodotPlatformSetCursorMode(window, window->cursorMode); [OS_OSX::singleton->context update]; - get_mouse_pos( - [OS_OSX::singleton->window_object mouseLocationOutsideOfEventStream], - [OS_OSX::singleton->window_view backingScaleFactor]); - if (OS_OSX::singleton->input) + if (OS_OSX::singleton->get_main_loop()) { + get_mouse_pos( + [OS_OSX::singleton->window_object mouseLocationOutsideOfEventStream], + [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); + } } - (void)windowDidResignKey:(NSNotification *)notification { @@ -365,6 +365,8 @@ static Vector2 get_mouse_pos(NSPoint locationInWindow, CGFloat backingScaleFacto bool imeMode; } - (void)cancelComposition; +- (BOOL)wantsUpdateLayer; +- (void)updateLayer; @end @implementation GodotContentView @@ -375,6 +377,14 @@ static Vector2 get_mouse_pos(NSPoint locationInWindow, CGFloat backingScaleFacto } } +- (BOOL)wantsUpdateLayer { + return YES; +} + +- (void)updateLayer { + [OS_OSX::singleton->context update]; +} + - (id)init { self = [super init]; trackingArea = nil; |