From 5026eea60a61358e544cabc878ef1f17fd0234e1 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 6 Dec 2024 18:30:38 -0500 Subject: [PATCH] Fix: Use tray icon to hide and show from tray correctly Remove show / hide from the tray menu Remove always disabled "show" action from window menu --- src/gui/src/MainWindow.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp index 8d535fba1..dea931364 100644 --- a/src/gui/src/MainWindow.cpp +++ b/src/gui/src/MainWindow.cpp @@ -288,14 +288,9 @@ void MainWindow::onAppConfigTlsChanged() void MainWindow::onTrayIconActivated(QSystemTrayIcon::ActivationReason reason) { - - if (reason == QSystemTrayIcon::DoubleClick) { - if (isVisible()) { - hide(); - } else { - showAndActivate(); - } - } + if (reason != QSystemTrayIcon::Trigger) + return; + isVisible() ? hide() : showAndActivate(); } void MainWindow::onVersionCheckerUpdateFound(const QString &version) @@ -514,9 +509,7 @@ void MainWindow::moveEvent(QMoveEvent *event) void MainWindow::open() { - std::vector trayMenu = {ui->m_pActionStartCore, ui->m_pActionStopCore, nullptr, - ui->m_pActionMinimize, ui->m_pActionRestore, nullptr, - ui->m_pActionQuit}; + std::vector trayMenu = {ui->m_pActionStartCore, ui->m_pActionStopCore, nullptr, ui->m_pActionQuit}; m_TrayIcon.create(trayMenu); @@ -580,7 +573,6 @@ void MainWindow::createMenuBar() m_pMenuEdit->addAction(ui->m_pActionSettings); m_pMenuWindow->addAction(ui->m_pActionMinimize); - m_pMenuWindow->addAction(ui->m_pActionRestore); m_pMenuHelp->addAction(ui->m_pActionAbout); m_pMenuHelp->addAction(ui->m_pActionHelp);