Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan White <support@dmapps.us>2020-11-19 06:54:38 +0300
committerJonathan White <support@dmapps.us>2020-11-19 06:54:38 +0300
commit49505608699cd27f2c2208c7e240bac961304194 (patch)
tree75c205b9b932340a9eb649acb07ba40835906005
parent3d10f3121161fb76611f19b6945158383536e146 (diff)
WIP - Attempting to improve unlock dialog behaviorfix/unlock-dialog
* See #5390
-rw-r--r--src/gui/DatabaseOpenDialog.cpp3
-rw-r--r--src/gui/DatabaseTabWidget.cpp2
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);