From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Tue, 16 May 2023 07:37:45 +0000 (+0200)
Subject: define minimum sizes of conflict dialogs in Style component
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~44^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b285b89605a016223004b0a14aaf3440e1334534;p=nextcloud-desktop.git

define minimum sizes of conflict dialogs in Style component

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index 7b6efb180..77b01eecf 100644
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -30,10 +30,10 @@ QtWindow.Window {
     flags: Qt.Window | Qt.Dialog
     visible: true
 
-    width: 600
-    height: 800
-    minimumWidth: 600
-    minimumHeight: 800
+    width: Style.minimumWidthResolveConflictsDialog
+    height: Style.minimumHeightResolveConflictsDialog
+    minimumWidth: Style.minimumWidthResolveConflictsDialog
+    minimumHeight: Style.minimumHeightResolveConflictsDialog
     title: qsTr('Solve sync conflicts')
 
     onClosing: function(close) {
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 34f2470ab..e9fbdbf2e 100644
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -133,6 +133,8 @@ QtObject {
 
     readonly property int bigFontPixelSizeResolveConflictsDialog: 20
     readonly property int fontPixelSizeResolveConflictsDialog: 15
+    readonly property int minimumWidthResolveConflictsDialog: 600
+    readonly property int minimumHeightResolveConflictsDialog: 800
 
     readonly property int activityContentSpace: 4