Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Height for Resolve Conflicts Dialog #7815

Merged
merged 1 commit into from
Feb 11, 2025
Merged

Fix Height for Resolve Conflicts Dialog #7815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/gui/ResolveConflictsDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -70,7 +70,7 @@ ApplicationWindow {

RowLayout {
Layout.fillWidth: true
Layout.topMargin: 15
Layout.topMargin: 5

CheckBox {
id: selectExisting
Expand Down
2 changes: 1 addition & 1 deletion theme/Style/Style.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down