Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanek Bevendorff <janek@keepassxc.org>2022-10-23 14:58:35 +0300
committerJanek Bevendorff <janek@keepassxc.org>2022-10-23 15:48:04 +0300
commit2ac1e0ed49ba5427425c4b85fbd13ca7d95a7502 (patch)
treee29d8c41260583012148485c4c81e6036d488acc
parent0a0389ad564d9fedf03262bb8c1a547816962777 (diff)
Fix macOS window activation issues
Reverts part of 34b7d08a5, which introduced a regression.
-rw-r--r--src/gui/Application.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp
index 0be1101d0..a73fbda60 100644
--- a/src/gui/Application.cpp
+++ b/src/gui/Application.cpp
@@ -212,6 +212,12 @@ bool Application::event(QEvent* event)
emit openFile(static_cast<QFileOpenEvent*>(event)->file());
return true;
}
+#ifdef Q_OS_MACOS
+ // restore main window when clicking on the docker icon
+ else if (event->type() == QEvent::ApplicationActivate) {
+ emit applicationActivated();
+ }
+#endif
return QApplication::event(event);
}