diff options
| author | Jonathan White <support@dmapps.us> | 2021-06-01 13:19:47 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2021-06-02 04:50:20 +0300 |
| commit | 205ffd30ed73176b6074ba4f5005331dd1a94d4d (patch) | |
| tree | 4ce60e407cb715d13d8a386c1ed44c1a881c611c | |
| parent | 5cfbde0bb73e66385b0f714ed0e9f0b7b69ba830 (diff) | |
Correct macOS window activation from hidden state (#6575)
* Fix #6234 - properly set NSApplication activation policies when the window is hidden and shown
| -rw-r--r-- | src/gui/osutils/macutils/AppKitImpl.mm | 5 | ||||
| -rw-r--r-- | src/gui/osutils/macutils/MacUtils.cpp | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/osutils/macutils/AppKitImpl.mm b/src/gui/osutils/macutils/AppKitImpl.mm index faf061106..31362c8e6 100644 --- a/src/gui/osutils/macutils/AppKitImpl.mm +++ b/src/gui/osutils/macutils/AppKitImpl.mm @@ -203,11 +203,10 @@ - (void) toggleForegroundApp:(bool) foreground { - ProcessSerialNumber psn = {0, kCurrentProcess}; if (foreground) { - TransformProcessType(&psn, kProcessTransformToForegroundApplication); + [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; } else { - TransformProcessType(&psn, kProcessTransformToUIElementApplication); + [NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited]; } } diff --git a/src/gui/osutils/macutils/MacUtils.cpp b/src/gui/osutils/macutils/MacUtils.cpp index ebcc627e0..9c107df77 100644 --- a/src/gui/osutils/macutils/MacUtils.cpp +++ b/src/gui/osutils/macutils/MacUtils.cpp @@ -69,6 +69,7 @@ bool MacUtils::raiseWindow(WId pid) bool MacUtils::raiseOwnWindow() { + m_appkit->toggleForegroundApp(true); return m_appkit->activateProcess(m_appkit->ownProcessId()); } |