From 854a8eb1bb67971b5f1cb25aac64c6b7368ece2e Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sat, 16 Nov 2024 13:00:35 +1000
Subject: [PATCH] Qt: Fix non-cancellable progress dialog height

---
 src/duckstation-qt/qtprogresscallback.cpp | 3 ++-
 src/duckstation-qt/qtprogresscallback.h   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/duckstation-qt/qtprogresscallback.cpp b/src/duckstation-qt/qtprogresscallback.cpp
index fc803ee2a..18a0ce524 100644
--- a/src/duckstation-qt/qtprogresscallback.cpp
+++ b/src/duckstation-qt/qtprogresscallback.cpp
@@ -15,7 +15,7 @@ QtModalProgressCallback::QtModalProgressCallback(QWidget* parent_widget, float s
   : QObject(parent_widget), m_dialog(QString(), QString(), 0, 1, parent_widget), m_show_delay(show_delay)
 {
   m_dialog.setWindowTitle(tr("DuckStation"));
-  m_dialog.setMinimumSize(QSize(500, 100));
+  m_dialog.setMinimumSize(MINIMUM_WIDTH, MINIMUM_HEIGHT_WITHOUT_CANCEL);
   m_dialog.setModal(parent_widget != nullptr);
   m_dialog.setAutoClose(false);
   m_dialog.setAutoReset(false);
@@ -33,6 +33,7 @@ void QtModalProgressCallback::SetCancellable(bool cancellable)
 
   ProgressCallback::SetCancellable(cancellable);
   m_dialog.setWindowFlag(Qt::WindowCloseButtonHint, cancellable);
+  m_dialog.setMinimumHeight(cancellable ? MINIMUM_HEIGHT_WITH_CANCEL : MINIMUM_HEIGHT_WITHOUT_CANCEL);
   m_dialog.setCancelButtonText(cancellable ? tr("Cancel") : QString());
 }
 
diff --git a/src/duckstation-qt/qtprogresscallback.h b/src/duckstation-qt/qtprogresscallback.h
index 997a1e3aa..f7215881a 100644
--- a/src/duckstation-qt/qtprogresscallback.h
+++ b/src/duckstation-qt/qtprogresscallback.h
@@ -35,6 +35,10 @@ private Q_SLOTS:
   void dialogCancelled();
 
 private:
+  static constexpr int MINIMUM_WIDTH = 500;
+  static constexpr int MINIMUM_HEIGHT_WITHOUT_CANCEL = 70;
+  static constexpr int MINIMUM_HEIGHT_WITH_CANCEL = 100;
+
   void checkForDelayedShow();
 
   QProgressDialog m_dialog;