mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 14:05:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

define minimum sizes of conflict dialogs in Style component

Browse source 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2023-05-16 09:37:45 +02:00 committed by Matthieu Gallien
parent 635b1ec729
commit b285b89605
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/ResolveConflictsDialog.qml
View file

@ -30,10 +30,10 @@ QtWindow.Window {
flags: Qt.Window | Qt.Dialog flags: Qt.Window | Qt.Dialog
visible: true visible: true
width: 600 width: Style.minimumWidthResolveConflictsDialog
height: 800 height: Style.minimumHeightResolveConflictsDialog
minimumWidth: 600 minimumWidth: Style.minimumWidthResolveConflictsDialog
minimumHeight: 800 minimumHeight: Style.minimumHeightResolveConflictsDialog
title: qsTr('Solve sync conflicts') title: qsTr('Solve sync conflicts')
onClosing: function(close) { onClosing: function(close) {

2
theme/Style/Style.qml
View file

@ -133,6 +133,8 @@ QtObject {
readonly property int bigFontPixelSizeResolveConflictsDialog: 20 readonly property int bigFontPixelSizeResolveConflictsDialog: 20
readonly property int fontPixelSizeResolveConflictsDialog: 15 readonly property int fontPixelSizeResolveConflictsDialog: 15
readonly property int minimumWidthResolveConflictsDialog: 600
readonly property int minimumHeightResolveConflictsDialog: 800
readonly property int activityContentSpace: 4 readonly property int activityContentSpace: 4