Merge pull request #500 from grulja/window-size

Use some reasonable minimum sizes for windows
FedoraQt · May 9, 2022 · 8278b21 · 8278b21
2 parents 97cdf0d + 90b63c6
commit 8278b21
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/app/qml/AboutDialog.qml b/src/app/qml/AboutDialog.qml
@@ -25,10 +25,10 @@ import QtQml 6.2
 
 ApplicationWindow {    
     id: aboutDialog
-    minimumWidth: units.gridUnit * 22
-    maximumWidth: units.gridUnit * 22
-    minimumHeight: units.gridUnit * 12
-    maximumHeight: units.gridUnit * 12
+    minimumWidth: Math.max(420, units.gridUnit * 22)
+    maximumWidth: Math.max(420, units.gridUnit * 22)
+    minimumHeight: Math.max(240, units.gridUnit * 12)
+    maximumHeight: Math.max(240, units.gridUnit * 12)
     modality: Qt.ApplicationModal
     x: Screen.width / 2 - width / 2
     y: Screen.height / 2 - height / 2

diff --git a/src/app/qml/CancelDialog.qml b/src/app/qml/CancelDialog.qml
@@ -26,10 +26,10 @@ import QtQml 6.2
 ApplicationWindow {
     id: cancelDialog
 
-    minimumWidth: units.gridUnit * 20
-    maximumWidth: units.gridUnit * 20
-    minimumHeight: units.gridUnit * 10
-    maximumHeight: units.gridUnit * 10
+    minimumWidth: Math.max(360, units.gridUnit * 20)
+    maximumWidth: Math.max(360, units.gridUnit * 20)
+    minimumHeight: Math.max(180, units.gridUnit * 10)
+    maximumHeight: Math.max(180, units.gridUnit * 10)
 
     modality: Qt.ApplicationModal
     x: Screen.width / 2 - width / 2

diff --git a/src/app/qml/main.qml b/src/app/qml/main.qml
@@ -26,10 +26,10 @@ import QtQml 6.2
 ApplicationWindow {
     id: mainWindow
     visible: true
-    minimumWidth: units.gridUnit * 32
-    maximumWidth: units.gridUnit * 32
-    minimumHeight: units.gridUnit * 25
-    maximumHeight: units.gridUnit * 25
+    minimumWidth: Math.max(640, units.gridUnit * 32)
+    maximumWidth: Math.max(640, units.gridUnit * 32)
+    minimumHeight: Math.max(480, units.gridUnit * 25)
+    maximumHeight: Math.max(480, units.gridUnit * 25)
 
     property int selectedPage: Units.Page.MainPage
     property int selectedVersion: Units.Source.Product