From 873832514e420ab99c0c4cf455382b805ba6fe37 Mon Sep 17 00:00:00 2001
From: knopalex <knopalex@msu.edu>
Date: Fri, 31 Jan 2025 12:23:14 -0500
Subject: [PATCH] fix height

Signed-off-by: knopalex <knopalex@msu.edu>
---
 src/gui/ResolveConflictsDialog.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index e0d689b6bdfeb..9647acf3cd74e 100644
--- 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) {