mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7815 from alexknop/conflictdialogfix

Browse Source 
Fix Height for Resolve Conflicts Dialog
This commit is contained in:
Matthieu Gallien 2025-02-11 11:14:43 +01:00 committed by GitHub
commit 2cb35b951a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/ResolveConflictsDialog.qml
View File

@ -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

2
theme/Style/Style.qml
View File

@ -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