From 854de28c98a5d6f6ad07648a7190c3c0d15589c7 Mon Sep 17 00:00:00 2001 From: Alex Knop Date: Mon, 10 Feb 2025 13:50:59 -0500 Subject: [PATCH] dialogfix Signed-off-by: Alex Knop --- src/gui/ResolveConflictsDialog.qml | 10 +++++----- theme/Style/Style.qml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml index e0d689b6bdfeb..529181d6c1b32 100644 --- a/src/gui/ResolveConflictsDialog.qml +++ b/src/gui/ResolveConflictsDialog.qml @@ -46,10 +46,10 @@ ApplicationWindow { ColumnLayout { anchors.fill: parent - anchors.leftMargin: 20 - anchors.rightMargin: 20 - anchors.bottomMargin: 20 - anchors.topMargin: 20 + anchors.leftMargin: 10 + anchors.rightMargin: 10 + anchors.bottomMargin: 5 + anchors.topMargin: 10 spacing: 15 z: 2 @@ -70,7 +70,7 @@ ApplicationWindow { RowLayout { Layout.fillWidth: true - Layout.topMargin: 15 + Layout.topMargin: 5 CheckBox { id: selectExisting diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml index 03c7bf932fcd7..11c49a52aa66d 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: 300 readonly property double smallIconScaleFactor: 0.6