Fix Message Box button size on macOS and Linux

* Fixes #10381
keepassxreboot · Mar 31, 2024 · db0b659 · db0b659
1 parent 9521f63
commit db0b659
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
@@ -322,6 +322,7 @@ void DatabaseOpenWidget::openDatabase()
             auto btn = msgBox->addButton(tr("Open database anyway"), QMessageBox::ButtonRole::AcceptRole);
             msgBox->setDefaultButton(btn);
             msgBox->addButton(QMessageBox::Cancel);
+            msgBox->layout()->setSizeConstraint(QLayout::SetMinimumSize);
             msgBox->exec();
             if (msgBox->clickedButton() != btn) {
                 m_db.reset(new Database());

diff --git a/src/gui/MessageBox.cpp b/src/gui/MessageBox.cpp
@@ -19,6 +19,7 @@
 #include "MessageBox.h"
 
 #include <QCheckBox>
+#include <QLayout>
 #include <QMap>
 #include <QPushButton>
 #include <QWindow>
@@ -126,6 +127,7 @@ MessageBox::Button MessageBox::messageBox(QWidget* parent,
             msgBox.activateWindow();
             msgBox.raise();
         }
+        msgBox.layout()->setSizeConstraint(QLayout::SetMinimumSize);
         msgBox.exec();
 
         Button returnButton = m_addedButtonLookup[msgBox.clickedButton()];

diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp
@@ -168,6 +168,7 @@ bool DatabaseSettingsWidgetDatabaseKey::save()
         auto btn = msgBox->addButton(tr("Continue without password"), QMessageBox::ButtonRole::AcceptRole);
         msgBox->addButton(QMessageBox::Cancel);
         msgBox->setDefaultButton(QMessageBox::Cancel);
+        msgBox->layout()->setSizeConstraint(QLayout::SetMinimumSize);
         msgBox->exec();
         if (msgBox->clickedButton() != btn) {
             return false;

diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp
@@ -287,6 +287,7 @@ bool DatabaseSettingsWidgetEncryption::save()
         auto ok = warning.addButton(tr("Understood, keep number"), QMessageBox::ButtonRole::AcceptRole);
         auto cancel = warning.addButton(tr("Cancel"), QMessageBox::ButtonRole::RejectRole);
         warning.setDefaultButton(cancel);
+        warning.layout()->setSizeConstraint(QLayout::SetMinimumSize);
         warning.exec();
         if (warning.clickedButton() != ok) {
             return false;
@@ -300,6 +301,7 @@ bool DatabaseSettingsWidgetEncryption::save()
         auto ok = warning.addButton(tr("Understood, keep number"), QMessageBox::ButtonRole::AcceptRole);
         auto cancel = warning.addButton(tr("Cancel"), QMessageBox::ButtonRole::RejectRole);
         warning.setDefaultButton(cancel);
+        warning.layout()->setSizeConstraint(QLayout::SetMinimumSize);
         warning.exec();
         if (warning.clickedButton() != ok) {
             return false;

diff --git a/src/gui/styles/base/basestyle.qss b/src/gui/styles/base/basestyle.qss
@@ -17,10 +17,6 @@ QSpinBox {
     min-width: 90px;
 }
 
-QDialogButtonBox QPushButton {
-    min-width: 55px;
-}
-
 QCheckBox, QRadioButton {
     spacing: 10px;
 }