Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-25 17:01:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve minimize to tray

Browse Source
This commit is contained in:
Janek Bevendorff 2017-02-08 15:37:13 +01:00 committed by Jonathan White
parent d1b403333c
commit 38d64a34a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/MainWindow.cpp
View File

@ -554,7 +554,7 @@ void MainWindow::closeEvent(QCloseEvent* event)
if (minimizeOnClose && !appExitCalled) if (minimizeOnClose && !appExitCalled)
{ {
event->ignore(); event->ignore();
hide(); toggleWindow();
if (config()->get("security/lockdatabaseminimize").toBool()) { if (config()->get("security/lockdatabaseminimize").toBool()) {
m_ui->tabWidget->lockDatabases(); m_ui->tabWidget->lockDatabases();
@ -722,6 +722,7 @@ void MainWindow::trayIconTriggered(QSystemTrayIcon::ActivationReason reason)
void MainWindow::toggleWindow() void MainWindow::toggleWindow()
{ {
if ((QApplication::activeWindow() == this) && isVisible() && !isMinimized()) { if ((QApplication::activeWindow() == this) && isVisible() && !isMinimized()) {
setWindowState(windowState() | Qt::WindowMinimized);
hide(); hide();
if (config()->get("security/lockdatabaseminimize").toBool()) { if (config()->get("security/lockdatabaseminimize").toBool()) {
@ -730,8 +731,8 @@ void MainWindow::toggleWindow()
} }
else { else {
ensurePolished(); ensurePolished();
setWindowState(windowState() & ~Qt::WindowMinimized);
show(); show();
setWindowState(windowState() & ~Qt::WindowMinimized);
raise(); raise();
activateWindow(); activateWindow();
} }