From c8099b73da8cf6beb98f3dd7c78ee6fec8786c68 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 31 May 2021 15:28:30 -0400 Subject: [PATCH] mainapplication: on tray icon click close window if open and focused Only do so on non-Windows platforms, though; apparently this is not a common pattern for desktop applications on Windows. Change-Id: Ie1f8f4dd087d4e2798be4d102eb1d421fa9490f7 --- src/mainapplication.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mainapplication.cpp b/src/mainapplication.cpp index f0d00477..e380da7b 100644 --- a/src/mainapplication.cpp +++ b/src/mainapplication.cpp @@ -492,8 +492,17 @@ MainApplication::initSystray() connect(systemTray_.get(), &QSystemTrayIcon::activated, [this](QSystemTrayIcon::ActivationReason reason) { - if (reason != QSystemTrayIcon::ActivationReason::Context) + if (reason != QSystemTrayIcon::ActivationReason::Context) { +#ifdef Q_OS_WINDOWS restoreApp(); +#else + QWindow* window = focusWindow(); + if (window) + window->close(); + else + restoreApp(); +#endif + } }); systrayMenu->addAction(quitAction);