Skip to content

Commit

Permalink
Merge pull request nextcloud#6696 from nextcloud/bugfix/conflictdialo…
Browse files Browse the repository at this point in the history
…g-multiple-darkmode

Bugfix. Conflict dialog for multiple files. Fix checkbox border colors for dark mode on Windows.
  • Loading branch information
mgallien authored and memurats committed Jun 20, 2024
1 parent 048b939 commit 4ea37d1
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 0 deletions.
18 changes: 18 additions & 0 deletions src/gui/ConflictItemFileInfo.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,24 @@ Item {
CheckBox {
id: selectItem

palette {
text: Style.ncTextColor
windowText: Style.ncTextColor
buttonText: Style.ncTextColor
brightText: Style.ncTextBrightColor
highlight: Style.lightHover
highlightedText: Style.ncTextColor
light: Style.lightHover
midlight: Style.ncSecondaryTextColor
mid: Style.darkerHover
dark: Style.menuBorder
button: Style.buttonBackgroundColor
window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
base: Style.backgroundColor
toolTipBase: Style.backgroundColor
toolTipText: Style.ncTextColor
}

anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter

Expand Down
36 changes: 36 additions & 0 deletions src/gui/ResolveConflictsDialog.qml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,24 @@ ApplicationWindow {

Layout.fillWidth: true

palette {
text: Style.ncTextColor
windowText: Style.ncTextColor
buttonText: Style.ncTextColor
brightText: Style.ncTextBrightColor
highlight: Style.lightHover
highlightedText: Style.ncTextColor
light: Style.lightHover
midlight: Style.ncSecondaryTextColor
mid: Style.darkerHover
dark: Style.menuBorder
button: Style.buttonBackgroundColor
window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
base: Style.backgroundColor
toolTipBase: Style.backgroundColor
toolTipText: Style.ncTextColor
}

text: qsTr('All local versions')

leftPadding: 0
Expand All @@ -112,6 +130,24 @@ ApplicationWindow {

Layout.fillWidth: true

palette {
text: Style.ncTextColor
windowText: Style.ncTextColor
buttonText: Style.ncTextColor
brightText: Style.ncTextBrightColor
highlight: Style.lightHover
highlightedText: Style.ncTextColor
light: Style.lightHover
midlight: Style.ncSecondaryTextColor
mid: Style.darkerHover
dark: Style.menuBorder
button: Style.buttonBackgroundColor
window: palette.dark // NOTE: Fusion theme uses darker window colour for the border of the checkbox
base: Style.backgroundColor
toolTipBase: Style.backgroundColor
toolTipText: Style.ncTextColor
}

text: qsTr('All server versions')

leftPadding: 0
Expand Down

0 comments on commit 4ea37d1

Please sign in to comment.