From 3a082e03698b8ae7a2d49413ec423a81973392bd Mon Sep 17 00:00:00 2001 From: knopalex Date: Mon, 3 Feb 2025 09:21:42 -0500 Subject: [PATCH] fix height Signed-off-by: knopalex --- src/gui/ResolveConflictsDialog.qml | 4 ++-- theme/Style/Style.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml index e0d689b6bdfeb..058073faf2dd5 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: minimumHeightResolveConflictsDialog title: qsTr('Solve sync conflicts') onClosing: function(close) { diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml index 03c7bf932fcd7..65f5c11d83fa6 100644 --- 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