try to force the highlight to not be too bright

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/gui/tray/CurrentAccountHeaderButton.qml b/src/gui/tray/CurrentAccountHeaderButton.qml
index 061a5d2fbbf9f76e01f268ccf7577be38923514c..4b646ed95b04e04fa09752c1fcb2b5b63f35c3e5 100644 (file)
--- a/src/gui/tray/CurrentAccountHeaderButton.qml
+++ b/src/gui/tray/CurrentAccountHeaderButton.qml
@@ -36,6 +36,13 @@ Button {
     Accessible.name: qsTr("Current account")
     Accessible.onPressAction: root.clicked()
 
+    palette {
+        text: Style.currentUserHeaderTextColor
+        windowText: Style.currentUserHeaderTextColor
+        buttonText: Style.currentUserHeaderTextColor
+        button: Style.adjustedCurrentUserHeaderColor
+    }
+
     // We call open() instead of popup() because we want to position it
     // exactly below the dropdown button, not the mouse
     onClicked: {

diff --git a/src/gui/tray/HeaderButton.qml b/src/gui/tray/HeaderButton.qml
index b133a75329436b22803adb266d708e434f27b1f6..ff8866e481cf4beb5ed695e594a4b42964b32622 100644 (file)
--- a/src/gui/tray/HeaderButton.qml
+++ b/src/gui/tray/HeaderButton.qml
@@ -34,6 +34,13 @@ Button {
     icon.height: Style.headerButtonIconSize
     icon.color: "transparent"
 
+    palette {
+        text: Style.currentUserHeaderTextColor
+        windowText: Style.currentUserHeaderTextColor
+        buttonText: Style.currentUserHeaderTextColor
+        button: Style.adjustedCurrentUserHeaderColor
+    }
+
     Layout.alignment: Qt.AlignRight
     Layout.preferredWidth:  Style.trayWindowHeaderHeight
     Layout.preferredHeight: Style.trayWindowHeaderHeight

diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index f98cad514b9204b4e454ab42c620cd662df86b6f..060a167bd5e433b8133234756060df2fcd17ffca 100644 (file)
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml
@@ -53,6 +53,13 @@ HeaderButton {
     Accessible.name: tooltip.text
     Accessible.onPressAction: root.clicked()
 
+    palette {
+        text: Style.currentUserHeaderTextColor
+        windowText: Style.currentUserHeaderTextColor
+        buttonText: Style.currentUserHeaderTextColor
+        button: Style.adjustedCurrentUserHeaderColor
+    }
+
     ToolTip {
         id: tooltip
         visible: root.hovered && !foldersMenuLoader.isMenuVisible

diff --git a/src/gui/tray/TrayWindowHeader.qml b/src/gui/tray/TrayWindowHeader.qml
index 3fbd8fc53876475843eb7f5307a455747612f5a7..6d783dd8ba1365b65de35dc8786158045f155046 100644 (file)
--- a/src/gui/tray/TrayWindowHeader.qml
+++ b/src/gui/tray/TrayWindowHeader.qml
@@ -35,6 +35,7 @@ Rectangle {
         text: Style.currentUserHeaderTextColor
         windowText: Style.currentUserHeaderTextColor
         buttonText: Style.currentUserHeaderTextColor
+        button: Style.adjustedCurrentUserHeaderColor
     }
 
     RowLayout {