diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-12 11:37:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 11:37:37 +0100 |
| commit | adf8af86f8ae4f9577013f6f4640c5214517e2d0 (patch) | |
| tree | 8802b59062db234064c9a4b10c40b1e009642be2 | |
| parent | f135c950a543e2b52030ff91784a462dbd63bac0 (diff) | |
| parent | 927105692fe42fb0192a190f20e662c94060194c (diff) | |
Merge pull request #56700 from bruvzg/macos_terminal_activation
| -rw-r--r-- | platform/osx/os_osx.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 7d07b0076b..821036de9c 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -82,9 +82,9 @@ @implementation GodotApplicationDelegate - (void)forceUnbundledWindowActivationHackStep1 { - // Step1: Switch focus to macOS Dock. + // Step 1: Switch focus to macOS SystemUIServer process. // Required to perform step 2, TransformProcessType will fail if app is already the in focus. - for (NSRunningApplication *app in [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.dock"]) { + for (NSRunningApplication *app in [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.systemuiserver"]) { [app activateWithOptions:NSApplicationActivateIgnoringOtherApps]; break; } @@ -107,8 +107,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notice { NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"]; - if (nsappname == nil) { - // If executable is not a bundled, macOS WindowServer won't register and activate app window correctly (menu and title bar are grayed out and input ignored). + if (nsappname == nil || isatty(STDOUT_FILENO) || isatty(STDIN_FILENO) || isatty(STDERR_FILENO)) { + // If the executable is started from terminal or is not bundled, macOS WindowServer won't register and activate app window correctly (menu and title bar are grayed out and input ignored). [self performSelector:@selector(forceUnbundledWindowActivationHackStep1) withObject:nil afterDelay:0.02]; } } |