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

fix: ignore windows for highligted menuitem styling

Browse Source 
Signed-off-by: Tamás Bari <adaorcpp@gmail.com>
This commit is contained in:
Tamás Bari 2025-10-15 16:44:41 +02:00 committed by Jyrki Gadinger
parent be3a001edc
commit aa7ee74781
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/tray/CurrentAccountHeaderButton.qml
View File

@ -107,7 +107,7 @@ Button {
readonly property real addAccountHorizontalOffset: ( (Style.accountAvatarSize - addAccountIconSize) / 2 ) + Style.accountIconsMenuMargin
property var iconColor: !addAccountButton.enabled
? addAccountButton.palette.mid
: (addAccountButton.highlighted || addAccountButton.down
: ((addAccountButton.highlighted || addAccountButton.down) && Qt.platform.os !== "windows"
? addAccountButton.palette.highlightedText
: addAccountButton.palette.text)
@ -146,8 +146,8 @@ Button {
elide: Text.ElideRight
color: !parent.enabled
? parent.palette.mid
: (parent.highlighted || parent.down
? Style.contrastingColor( parent.palette.highlight )
: ((parent.highlighted || parent.down) && Qt.platform.os !== "windows"
? parent.palette.highlightedText
: parent.palette.text)
}
}
@ -170,8 +170,8 @@ Button {
elide: Text.ElideRight
color: !parent.enabled
? parent.palette.mid
: (parent.highlighted || parent.down
? Style.contrastingColor( parent.palette.highlight )
: ((parent.highlighted || parent.down) && Qt.platform.os !== "windows"
? parent.palette.highlightedText
: parent.palette.text)
}
}
@ -194,8 +194,8 @@ Button {
elide: Text.ElideRight
color: !parent.enabled
? parent.palette.mid
: (parent.highlighted || parent.down
? Style.contrastingColor( parent.palette.highlight )
: ((parent.highlighted || parent.down) && Qt.platform.os !== "windows"
? parent.palette.highlightedText
: parent.palette.text)
}
}

8
src/gui/tray/UserLine.qml
View File

@ -102,7 +102,7 @@ AbstractButton {
color: !userLine.parent.enabled
? userLine.parent.palette.mid
: (userLine.parent.highlighted || userLine.parent.down
: ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
? Style.contrastingColor( parent.palette.highlight )
: userLine.parent.palette.text)
}
@ -117,7 +117,7 @@ AbstractButton {
color: !userLine.parent.enabled
? userLine.parent.palette.mid
: (userLine.parent.highlighted || userLine.parent.down
: ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
? userLine.parent.palette.highlightedText
: userLine.parent.palette.text)
}
@ -134,7 +134,7 @@ AbstractButton {
color: !userLine.parent.enabled
? userLine.parent.palette.mid
: (userLine.parent.highlighted || userLine.parent.down
: ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows"
? Style.contrastingColor( parent.palette.highlight )
: userLine.parent.palette.text)
}
@ -158,7 +158,7 @@ AbstractButton {
property var iconColor: !userLine.parent.enabled
? userLine.parent.palette.mid
: (!hovered && (userLine.parent.highlighted || userLine.parent.down)
: (!hovered && ((userLine.parent.highlighted || userLine.parent.down) && Qt.platform.os !== "windows")
? Style.contrastingColor( parent.palette.highlight )
: userLine.parent.palette.text)
icon.source: "image://svgimage-custom-color/more.svg/" + iconColor

6
theme/Style/Style.qml
View File

@ -211,10 +211,4 @@ QtObject {
function colorWithoutTransparency(color) {
return Qt.rgba(color.r, color.g, color.b, 1)
}
function contrastingColor(color) {
// sRGB relative luminance formula
const luminance = 0.299 * color.r + 0.587 * color.g + 0.114 * color.b
return luminance > 0.5 ? Qt.darker( color, 2.0 ) : Qt.lighter( color, 2.0 )
}
}