fix height

Signed-off-by: knopalex <[email protected]>
nextcloud · Feb 3, 2025 · 3a082e0 · 3a082e0
1 parent c151888
commit 3a082e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
@@ -34,9 +34,9 @@ ApplicationWindow {
     LayoutMirroring.childrenInherit: true
 
     width: Style.minimumWidthResolveConflictsDialog
-    height: Style.minimumHeightResolveConflictsDialog
+    height: Math.min(contentItem.height + 20, Screen.height * 0.8)
     minimumWidth: Style.minimumWidthResolveConflictsDialog
-    minimumHeight: Style.minimumHeightResolveConflictsDialog
+    minimumHeight: minimumHeightResolveConflictsDialog
     title: qsTr('Solve sync conflicts')
 
     onClosing: function(close) {

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
@@ -154,7 +154,7 @@ QtObject {
     readonly property int bigFontPixelSizeResolveConflictsDialog: 20
     readonly property int fontPixelSizeResolveConflictsDialog: 15
     readonly property int minimumWidthResolveConflictsDialog: 600
-    readonly property int minimumHeightResolveConflictsDialog: 800
+    readonly property int minimumHeightResolveConflictsDialog: 200
 
     readonly property double smallIconScaleFactor: 0.6