Correct macOS window activation from hidden state (keepassxreboot#6575)

* Fix keepassxreboot#6234 - properly set NSApplication activation policies when the window is hidden and shown
AlexGTII · Jun 1, 2021 · 11afd73 · 11afd73
1 parent 33bf6eb
commit 11afd73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/gui/osutils/macutils/AppKitImpl.mm b/src/gui/osutils/macutils/AppKitImpl.mm
@@ -206,11 +206,10 @@ - (bool) enableScreenRecording
 
 - (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
@@ -70,6 +70,7 @@ bool MacUtils::raiseWindow(WId pid)
 
 bool MacUtils::raiseOwnWindow()
 {
+    m_appkit->toggleForegroundApp(true);
     return m_appkit->activateProcess(m_appkit->ownProcessId());
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,6 +70,7 @@ bool MacUtils::raiseWindow(WId pid) @@
     bool MacUtils::raiseOwnWindow()
     {
+        m_appkit->toggleForegroundApp(true);
         return m_appkit->activateProcess(m_appkit->ownProcessId());
     }
@@ Expand Down @@