From: Camila Date: Thu, 10 Dec 2020 16:43:45 +0000 (+0100) Subject: Use the icon color property to color the icons in the tray window header. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~478^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cfbd22b5e75da5d148abeff32bf22b3e2a154a07;p=nextcloud-desktop.git Use the icon color property to color the icons in the tray window header. The icon color is set with APPLICATION_WIZARD_HEADER_TITLE_COLOR in the theme. Signed-off-by: Camila --- diff --git a/src/gui/tray/HeaderButton.qml b/src/gui/tray/HeaderButton.qml index a1a9fc69a..a29953207 100644 --- 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 index ac9de333f..f46bc6100 100644 --- 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 + } } } }