Merge pull request #2716 from nextcloud/backport/2698/stable-3.1

[stable-3.1] Use the icon color property to color the icons in the tray window header.
nextcloud · Dec 15, 2020 · c85d124 · c85d124
2 parents 583c496 + 3fa796e
commit c85d124
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/gui/tray/HeaderButton.qml b/src/gui/tray/HeaderButton.qml
@@ -18,7 +18,7 @@ Button {
 
     icon.width: Style.headerButtonIconSize
     icon.height: Style.headerButtonIconSize
-    icon.color: "transparent"
+    icon.color: Style.ncTextColor
 
     Layout.alignment: Qt.AlignRight
     Layout.preferredWidth:  Style.trayWindowHeaderHeight

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
@@ -388,13 +388,19 @@ Window {
                             }
                         }
 
-                        Image {
-                            Layout.alignment: Qt.AlignRight
-                            verticalAlignment: Qt.AlignCenter
-                            Layout.margins: Style.accountDropDownCaretMargin
-                            source: "qrc:///client/theme/white/caret-down.svg"
-                            sourceSize.width: Style.accountDropDownCaretSize
-                            sourceSize.height: Style.accountDropDownCaretSize
+                        ColorOverlay {
+                            cached: true
+                            color: Style.ncTextColor
+                            width: source.width
+                            height: source.height
+                            source: Image {
+                                Layout.alignment: Qt.AlignRight
+                                verticalAlignment: Qt.AlignCenter
+                                Layout.margins: Style.accountDropDownCaretMargin
+                                source: "qrc:///client/theme/white/caret-down.svg"
+                                sourceSize.width: Style.accountDropDownCaretSize
+                                sourceSize.height: Style.accountDropDownCaretSize
+                            }
                         }
                     }
                 }