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

Merge pull request #57797 from bruvzg/mac_no_focus

Browse Source
This commit is contained in:
Rémi Verschelde 2022-02-08 12:55:49 +01:00 committed by GitHub
commit b0fd01b50c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/osx/display_server_osx.mm
View File

@ -125,6 +125,7 @@ DisplayServerOSX::WindowID DisplayServerOSX::_create_window(WindowMode p_mode, V
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:NO]; defer:NO];
ERR_FAIL_COND_V_MSG(wd.window_object == nil, INVALID_WINDOW_ID, "Can't create a window"); ERR_FAIL_COND_V_MSG(wd.window_object == nil, INVALID_WINDOW_ID, "Can't create a window");
[wd.window_object setWindowID:window_id_counter];
wd.window_view = [[GodotContentView alloc] init]; wd.window_view = [[GodotContentView alloc] init];
ERR_FAIL_COND_V_MSG(wd.window_view == nil, INVALID_WINDOW_ID, "Can't create a window view"); ERR_FAIL_COND_V_MSG(wd.window_view == nil, INVALID_WINDOW_ID, "Can't create a window view");

4
platform/osx/godot_window.mm
View File

@ -45,7 +45,7 @@
} }
- (BOOL)canBecomeKeyWindow { - (BOOL)canBecomeKeyWindow {
// Required for NSBorderlessWindowMask windows. // Required for NSWindowStyleMaskBorderless windows.
DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton(); DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
if (!ds || !ds->has_window(window_id)) { if (!ds || !ds->has_window(window_id)) {
return YES; return YES;
@ -56,7 +56,7 @@
} }
- (BOOL)canBecomeMainWindow { - (BOOL)canBecomeMainWindow {
// Required for NSBorderlessWindowMask windows. // Required for NSWindowStyleMaskBorderless windows.
DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton(); DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
if (!ds || !ds->has_window(window_id)) { if (!ds || !ds->has_window(window_id)) {
return YES; return YES;