From 49505608699cd27f2c2208c7e240bac961304194 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Wed, 18 Nov 2020 22:54:38 -0500 Subject: WIP - Attempting to improve unlock dialog behavior * See #5390 --- src/gui/DatabaseOpenDialog.cpp | 3 ++- src/gui/DatabaseTabWidget.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/DatabaseOpenDialog.cpp b/src/gui/DatabaseOpenDialog.cpp index e7194b7e2..0d3bd4251 100644 --- a/src/gui/DatabaseOpenDialog.cpp +++ b/src/gui/DatabaseOpenDialog.cpp @@ -25,7 +25,8 @@ DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent) , m_view(new DatabaseOpenWidget(this)) { setWindowTitle(tr("Unlock Database - KeePassXC")); - setWindowFlags(Qt::Dialog | Qt::WindowStaysOnTopHint); + setWindowFlags((windowFlags() | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint) + & ~Qt::WindowContextHelpButtonHint); connect(m_view, SIGNAL(dialogFinished(bool)), this, SLOT(complete(bool))); auto* layout = new QVBoxLayout(); layout->setMargin(0); diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index 2683cecec..2aff51a26 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -49,7 +49,7 @@ DatabaseTabWidget::DatabaseTabWidget(QWidget* parent) : QTabWidget(parent) , m_dbWidgetStateSync(new DatabaseWidgetStateSync(this)) , m_dbWidgetPendingLock(nullptr) - , m_databaseOpenDialog(new DatabaseOpenDialog(this)) + , m_databaseOpenDialog(new DatabaseOpenDialog()) { auto* tabBar = new DragTabBar(this); setTabBar(tabBar); -- cgit v1.2.3