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 49f4a91e491a4d866f6545e0d295a9b4)

Currently displaying revision 49f4a91e491a4d866f6545e0d295a9b4 , Show latest

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

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

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 src/core/Clock.cpp     |  5 +++++
 src/core/Clock.h       |  1 +
 src/gui/MainWindow.cpp | 22 ++++++++++++++++++++++
 src/gui/MainWindow.h   |  4 ++++
 4 files changed, 32 insertions(+)

diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
index be9e91dcf03f..a1bd694389e5 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 8f81b0961ac3..ec6a28adcbe2 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 6452c051bb46..e3ffdcd74357 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1235,6 +1235,28 @@ void MainWindow::processTrayIconTrigger()
     }
 }
 
+void MainWindow::show()
+{
+    m_lastShowTime = Clock::currentMiliSecondsSinceEpoch();
+    QMainWindow::show();
+}
+
+bool MainWindow::shouldHide()
+{
+    qint64 current_time = Clock::currentMiliSecondsSinceEpoch();
+
+    if (current_time - m_lastShowTime < 1000)
+        return false;
+
+    return true;
+}
+
+void MainWindow::hide()
+{
+    if (shouldHide())
+        QMainWindow::hide();
+}
+
 void MainWindow::hideWindow()
 {
     saveWindowInformation();
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 89501eff37af..f29afb553e04 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -70,6 +70,8 @@ public slots:
     void hideGlobalMessage();
     void showYubiKeyPopup();
     void hideYubiKeyPopup();
+    void hide();
+    void show();
     void hideWindow();
     void toggleWindow();
     void bringToFront();
@@ -132,6 +134,7 @@ private:
 
     static const QString BaseWindowTitle;
 
+    bool shouldHide();
     void saveWindowInformation();
     bool saveLastDatabases();
     void updateTrayIcon();
@@ -163,6 +166,7 @@ private:
     bool m_appExiting = false;
     bool m_contextMenuFocusLock = false;
     uint m_lastFocusOutTime = 0;
+    qint64 m_lastShowTime = 0;
     QTimer m_trayIconTriggerTimer;
     QSystemTrayIcon::ActivationReason m_trayIconTriggerReason;
 };
-- 
2.23.0

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

Print stacktrace when window is hidden just after it's shown.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 CMakeLists.txt         | 11 +++++------
 src/CMakeLists.txt     |  3 +++
 src/gui/MainWindow.cpp | 29 ++++++++++++++++++++++-------
 src/gui/MainWindow.h   |  1 +
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac4c8a9ac611..721fdf9988be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -213,8 +213,6 @@ endif()
 add_gcc_compiler_flags("-fno-common")
 add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
 add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute")
-add_gcc_compiler_flags("-fvisibility=hidden")
-add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden")
 
 if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
     add_gcc_compiler_flags("-Werror")
@@ -228,7 +226,7 @@ else()
 endif()
 endif()
 
-add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti")
+add_gcc_compiler_cxxflags("-fexceptions -fno-rtti -rdynamic")
 add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual")
 add_gcc_compiler_cflags("-Wchar-subscripts -Wwrite-strings")
 
@@ -281,9 +279,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     endif()
     add_gcc_compiler_flags("-pie -fPIE")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed -Wl,--no-undefined")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now -rdynamic")
     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-add-needed -Wl,--as-needed")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
+    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro,-z,now -rdynamic")
 endif()
 
 add_gcc_compiler_cflags("-std=c99")
@@ -421,6 +419,7 @@ find_package(Argon2 REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(QREncode REQUIRED)
 find_package(sodium 1.0.12 REQUIRED)
+find_package(Boost 1.4 REQUIRED)
 
 set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
 
@@ -428,7 +427,7 @@ if(ZLIB_VERSION_STRING VERSION_LESS "1.2.0")
     message(FATAL_ERROR "zlib 1.2.0 or higher is required to use the gzip format")
 endif()
 
-include_directories(SYSTEM ${ARGON2_INCLUDE_DIR} ${sodium_INCLUDE_DIR})
+include_directories(SYSTEM ${ARGON2_INCLUDE_DIR} ${sodium_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
 
 # Optional
 if(WITH_XC_YUBIKEY)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af9b9bb586e6..d916aeb6888a 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/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index e3ffdcd74357..eddf1dfca86e 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_BACKTRACE
+#include <boost/stacktrace.hpp>
+
 #include "config-keepassx.h"
 
 #include "autotype/AutoType.h"
@@ -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(timerHide()));
         }
 
         if (config()->get("security/lockdatabaseminimize").toBool()) {
@@ -1245,12 +1250,21 @@ bool MainWindow::shouldHide()
 {
     qint64 current_time = Clock::currentMiliSecondsSinceEpoch();
 
-    if (current_time - m_lastShowTime < 1000)
+    if (current_time - m_lastShowTime < 1000) {
+        std::cerr << "Hiding after " << current_time - m_lastShowTime << "ms" << std::endl
+                  << boost::stacktrace::stacktrace() << std::endl;
         return false;
+    }
 
     return true;
 }
 
+void MainWindow::timerHide()
+{
+    std::cerr << "timerHide" << std::endl;
+
+}
+
 void MainWindow::hide()
 {
     if (shouldHide())
@@ -1260,14 +1274,15 @@ void MainWindow::hide()
 void MainWindow::hideWindow()
 {
     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
-    // the same time (which would happen if both minimize on startup and minimize to tray are set)
-    // since otherwise it causes problems on restore as seen on issue #1595. Hiding it is enough.
-    // TODO: Add an explanation for why this is also not done on Mac (or remove the check)
+#if defined(Q_OS_WIN32)
+    // In X11 the window should NOT be minimized and hidden (i.e. not shown) at
+    // the same time (which would happen if both minimize on startup and
+    // minimize to tray are set) since otherwise it causes problems on restore
+    // as seen on issue #1595. Hiding it is enough.
     setWindowState(windowState() | Qt::WindowMinimized);
 #endif
     // Only hide if tray icon is active, otherwise window will be gone forever
+    std::cerr << "hideWindow" << std::endl;
     if (isTrayIconEnabled()) {
         hide();
     } else {
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index f29afb553e04..873f91dd522a 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -70,6 +70,7 @@ public slots:
     void hideGlobalMessage();
     void showYubiKeyPopup();
     void hideYubiKeyPopup();
+    void timerHide();
     void hide();
     void show();
     void hideWindow();
-- 
2.23.0

Places

File keepassxc-Fix-window-hiding-after-shown.patch of Package keepassxc (Revision 49f4a91e491a4d866f6545e0d295a9b4)

Places