File keepassxc-Fix-window-hiding-after-shown.patch of Package keepassxc

Overview Repositories Revisions Requests Users Attributes Meta

File keepassxc-Fix-window-hiding-after-shown.patch of Package keepassxc (Revision 1e32db1b7add996d5b71f03e28cc02c6)

Currently displaying revision 1e32db1b7add996d5b71f03e28cc02c6 , Show latest

From 5fbf4cdbbbf46a401a67a7cc04124b4594645d4d Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Sun, 16 Feb 2020 22:38:35 +0100
Subject: [PATCH] gui: Fix window hiding after shown

Sometimes the window hides just after clicking the tray icon to show it.
Add a timer to not hide window immediately after it is shown.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac4c8a9a..d59d6bc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,7 +228,7 @@ else()
 endif()
 endif()
 
-add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
+add_gcc_compiler_cxxflags("-fexceptions -fno-rtti")
 add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
 add_gcc_compiler_cflags("-Wchar-subscripts -Wwrite-strings")
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af9b9bb5..d916aeb6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,8 @@ if(NOT ZXCVBN_LIBRARIES)
     set(ZXCVBN_LIBRARIES zxcvbn)
 endif(NOT ZXCVBN_LIBRARIES)
 
+find_library(LIBDL dl)
+
 set(keepassx_SOURCES
         core/Alloc.cpp
         core/AutoTypeAssociations.cpp
@@ -307,6 +309,7 @@ target_link_libraries(keepassx_core
         ${ARGON2_LIBRARIES}
         ${GCRYPT_LIBRARIES}
         ${GPGERROR_LIBRARIES}
+        ${LIBDL}
         ${ZLIB_LIBRARIES})
 
 if(WITH_XC_SSHAGENT)
diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
index be9e91dc..a1bd6943 100644
--- a/src/core/Clock.cpp
+++ b/src/core/Clock.cpp
@@ -34,6 +34,11 @@ uint Clock::currentSecondsSinceEpoch()
     return instance().currentDateTimeImpl().toTime_t();
 }
 
+qint64 Clock::currentMiliSecondsSinceEpoch()
+{
+    return instance().currentDateTimeImpl().toMSecsSinceEpoch();
+}
+
 QDateTime Clock::serialized(const QDateTime& dateTime)
 {
     auto time = dateTime.time();
diff --git a/src/core/Clock.h b/src/core/Clock.h
index 8f81b096..ec6a28ad 100644
--- a/src/core/Clock.h
+++ b/src/core/Clock.h
@@ -28,6 +28,7 @@ public:
     static QDateTime currentDateTime();
 
     static uint currentSecondsSinceEpoch();
+    static qint64 currentMiliSecondsSinceEpoch();
 
     static QDateTime serialized(const QDateTime& dateTime);
 
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 6452c051..5040118d 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -27,6 +27,11 @@
 #include <QTimer>
 #include <QWindow>
 
+#include <iostream>
+
+#define BOOST_STACKTRACE_USE_ADDR2LINE
+#include <boost/stacktrace.hpp>
+
 #include "config-keepassx.h"
 
 #include "autotype/AutoType.h"
@@ -216,7 +221,7 @@ MainWindow::MainWindow()
     // clang-format off
 	 connect(m_ui->globalMessageWidget, &MessageWidget::linkActivated, &MessageWidget::openHttpUrl);
 	 connect(m_ui->globalMessageWidget, SIGNAL(showAnimationStarted()), m_ui->globalMessageWidgetContainer, SLOT(show()));
-	 connect(m_ui->globalMessageWidget, SIGNAL(hideAnimationFinished()), m_ui->globalMessageWidgetContainer, SLOT(hide()));
+	 connect(m_ui->globalMessageWidget, SIGNAL(hideAnimationFinished()), m_ui->globalMessageWidgetContainer, SLOT(doHide()));
     // clang-format on
 
     m_clearHistoryAction = new QAction(tr("Clear history"), m_ui->menuFile);
@@ -1024,7 +1029,7 @@ void MainWindow::changeEvent(QEvent* event)
         if (isTrayIconEnabled() && m_trayIcon && m_trayIcon->isVisible()
             && config()->get("GUI/MinimizeToTray").toBool()) {
             event->ignore();
-            QTimer::singleShot(0, this, SLOT(hide()));
+            QTimer::singleShot(0, this, SLOT(doHide()));
         }
 
         if (config()->get("security/lockdatabaseminimize").toBool()) {
@@ -1235,8 +1240,30 @@ void MainWindow::processTrayIconTrigger()
     }
 }
 
+bool MainWindow::shouldHide()
+{
+    qint64 current_time = Clock::currentMiliSecondsSinceEpoch();
+
+    if (current_time - m_lastHideTime < 1000) {
+        std::cerr << "Hiding after " << current_time - m_lastHideTime << "ms" << std::endl << boost::stacktrace::stacktrace() << std::endl;
+        return false;
+    }
+
+    m_lastHideTime = current_time;
+    return true;
+}
+
+void MainWindow::doHide()
+{
+    if (shouldHide())
+        hide();
+}
+
 void MainWindow::hideWindow()
 {
+    if (!shouldHide())
+        return;
+
     saveWindowInformation();
 #if !defined(Q_OS_LINUX) && !defined(Q_OS_MACOS)
     // On some Linux systems, the window should NOT be minimized and hidden (i.e. not shown), at
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 89501eff..4260d918 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -70,6 +70,7 @@ public slots:
     void hideGlobalMessage();
     void showYubiKeyPopup();
     void hideYubiKeyPopup();
+    void doHide();
     void hideWindow();
     void toggleWindow();
     void bringToFront();
@@ -132,6 +133,7 @@ private:
 
     static const QString BaseWindowTitle;
 
+    bool shouldHide();
     void saveWindowInformation();
     bool saveLastDatabases();
     void updateTrayIcon();
@@ -163,6 +165,7 @@ private:
     bool m_appExiting = false;
     bool m_contextMenuFocusLock = false;
     uint m_lastFocusOutTime = 0;
+    qint64 m_lastHideTime = 0;
     QTimer m_trayIconTriggerTimer;
     QSystemTrayIcon::ActivationReason m_trayIconTriggerReason;
 };
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index 9118d3e2..c700f417 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -1402,18 +1402,25 @@ void TestGui::testTrayRestoreHide()
     trayIcon->activated(QSystemTrayIcon::Trigger);
     QTRY_VERIFY(m_mainWindow->isVisible());
 
+    // Wait for the hide timer to expire
+    Tools::sleep(2000);
+
     trayIcon->activated(QSystemTrayIcon::Trigger);
     QTRY_VERIFY(!m_mainWindow->isVisible());
 
     trayIcon->activated(QSystemTrayIcon::MiddleClick);
     QTRY_VERIFY(m_mainWindow->isVisible());
 
+    Tools::sleep(2000);
+
     trayIcon->activated(QSystemTrayIcon::MiddleClick);
     QTRY_VERIFY(!m_mainWindow->isVisible());
 
     trayIcon->activated(QSystemTrayIcon::DoubleClick);
     QTRY_VERIFY(m_mainWindow->isVisible());
 
+    Tools::sleep(2000);
+
     trayIcon->activated(QSystemTrayIcon::DoubleClick);
     QTRY_VERIFY(!m_mainWindow->isVisible());
 }
-- 
2.25.0

Places

File keepassxc-Fix-window-hiding-after-shown.patch of Package keepassxc (Revision 1e32db1b7add996d5b71f03e28cc02c6)

Places