Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-24 05:59:37 -04:00
Code Issues Projects Releases Packages Wiki Activity

Correct macOS window activation from hidden state (#6575)

Browse source 
* Fix #6234 - properly set NSApplication activation policies when the window is hidden and shown
This commit is contained in:
Jonathan White 2021-06-01 06:19:47 -04:00 • committed by GitHub
parent 33bf6eb892
commit 11afd73117
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/gui/osutils/macutils/AppKitImpl.mm
View file

@ -206,11 +206,10 @@
- (void) toggleForegroundApp:(bool) foreground - (void) toggleForegroundApp:(bool) foreground
{ {
ProcessSerialNumber psn = {0, kCurrentProcess};
if (foreground) { if (foreground) {
TransformProcessType(&psn, kProcessTransformToForegroundApplication); [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
} else { } else {
TransformProcessType(&psn, kProcessTransformToUIElementApplication); [NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
} }
} }

1
src/gui/osutils/macutils/MacUtils.cpp
View file

@ -70,6 +70,7 @@ bool MacUtils::raiseWindow(WId pid)
bool MacUtils::raiseOwnWindow() bool MacUtils::raiseOwnWindow()
{ {
m_appkit->toggleForegroundApp(true);
return m_appkit->activateProcess(m_appkit->ownProcessId()); return m_appkit->activateProcess(m_appkit->ownProcessId());
} }