fix height

Signed-off-by: knopalex <[email protected]>
nextcloud · Jan 31, 2025 · 8738325 · 8738325
1 parent c151888
commit 8738325
Showing 1 changed file with 2 additions and 2 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: 200
     title: qsTr('Solve sync conflicts')
 
     onClosing: function(close) {