From 11afd7311725e345482f75f279fa069c552fd7ad Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 1 Jun 2021 06:19:47 -0400
Subject: [PATCH] Correct macOS window activation from hidden state (#6575)

* Fix #6234 - properly set NSApplication activation policies when the window is hidden and shown
---
 src/gui/osutils/macutils/AppKitImpl.mm | 5 ++---
 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 35465e7cb..15a044e12 100644
--- a/src/gui/osutils/macutils/AppKitImpl.mm
+++ b/src/gui/osutils/macutils/AppKitImpl.mm
@@ -206,11 +206,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 a3128ea5c..6e4b478bf 100644
--- a/src/gui/osutils/macutils/MacUtils.cpp
+++ b/src/gui/osutils/macutils/MacUtils.cpp
@@ -70,6 +70,7 @@ bool MacUtils::raiseWindow(WId pid)
 
 bool MacUtils::raiseOwnWindow()
 {
+    m_appkit->toggleForegroundApp(true);
     return m_appkit->activateProcess(m_appkit->ownProcessId());
 }