Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-10-16 07:21:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix flickering & not restoring from tray on some Linuxes (#1595).

Browse source 
Fix/work around KeePassXC flickering and not restoring from tray on some Linux systems, which happens if the window is hidden and minimized by code at the same time (see issue #1595).
This commit is contained in:
Joan Bruguera 2018-03-11 14:03:48 +01:00 • committed by TheZ3ro
parent f620ad979f
commit 319c8201be
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/gui/MainWindow.cpp
View file

@ -971,9 +971,6 @@ void MainWindow::trayIconTriggered(QSystemTrayIcon::ActivationReason reason)
void MainWindow::hideWindow() void MainWindow::hideWindow()
{ {
saveWindowInformation(); saveWindowInformation();
#ifndef Q_OS_MAC
setWindowState(windowState() | Qt::WindowMinimized);
#endif
QTimer::singleShot(0, this, SLOT(hide())); QTimer::singleShot(0, this, SLOT(hide()));
if (config()->get("security/lockdatabaseminimize").toBool()) { if (config()->get("security/lockdatabaseminimize").toBool()) {

2
src/main.cpp
View file

@ -127,7 +127,7 @@ int main(int argc, char** argv)
// start minimized if configured // start minimized if configured
bool minimizeOnStartup = config()->get("GUI/MinimizeOnStartup").toBool(); bool minimizeOnStartup = config()->get("GUI/MinimizeOnStartup").toBool();
bool minimizeToTray = config()->get("GUI/MinimizeToTray").toBool(); bool minimizeToTray = config()->get("GUI/MinimizeToTray").toBool();
if (minimizeOnStartup) { if (minimizeOnStartup && !minimizeToTray) {
mainWindow.setWindowState(Qt::WindowMinimized); mainWindow.setWindowState(Qt::WindowMinimized);
} }
if (!(minimizeOnStartup && minimizeToTray)) { if (!(minimizeOnStartup && minimizeToTray)) {