smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Use tray icon to hide and show from tray correctly

Browse source 
Remove show / hide from the tray menu
 Remove always disabled "show" action from window menu
This commit is contained in:
sithlord48 2024-12-06 18:30:38 -05:00 committed by Nick Bolton
parent 482aa7a049
commit 5026eea60a
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/src/MainWindow.cpp
View file

@ -288,14 +288,9 @@ void MainWindow::onAppConfigTlsChanged()
void MainWindow::onTrayIconActivated(QSystemTrayIcon::ActivationReason reason) void MainWindow::onTrayIconActivated(QSystemTrayIcon::ActivationReason reason)
{ {
if (reason != QSystemTrayIcon::Trigger)
if (reason == QSystemTrayIcon::DoubleClick) { return;
if (isVisible()) { isVisible() ? hide() : showAndActivate();
hide();
} else {
showAndActivate();
}
}
} }
void MainWindow::onVersionCheckerUpdateFound(const QString &version) void MainWindow::onVersionCheckerUpdateFound(const QString &version)
@ -514,9 +509,7 @@ void MainWindow::moveEvent(QMoveEvent *event)
void MainWindow::open() void MainWindow::open()
{ {
std::vector<QAction *> trayMenu = {ui->m_pActionStartCore, ui->m_pActionStopCore, nullptr, std::vector<QAction *> trayMenu = {ui->m_pActionStartCore, ui->m_pActionStopCore, nullptr, ui->m_pActionQuit};
ui->m_pActionMinimize, ui->m_pActionRestore, nullptr,
ui->m_pActionQuit};
m_TrayIcon.create(trayMenu); m_TrayIcon.create(trayMenu);
@ -580,7 +573,6 @@ void MainWindow::createMenuBar()
m_pMenuEdit->addAction(ui->m_pActionSettings); m_pMenuEdit->addAction(ui->m_pActionSettings);
m_pMenuWindow->addAction(ui->m_pActionMinimize); m_pMenuWindow->addAction(ui->m_pActionMinimize);
m_pMenuWindow->addAction(ui->m_pActionRestore);
m_pMenuHelp->addAction(ui->m_pActionAbout); m_pMenuHelp->addAction(ui->m_pActionAbout);
m_pMenuHelp->addAction(ui->m_pActionHelp); m_pMenuHelp->addAction(ui->m_pActionHelp);