From 3d8e26e1f10f8e93534bc8b9645a088d91768009 Mon Sep 17 00:00:00 2001
From: Camila Ayres <hello@camilasan.com>
Date: Tue, 3 Sep 2024 21:18:19 +0200
Subject: [PATCH] Remove more color customizations from Window and
 TrayFoldersMenuButton.

Signed-off-by: Camila Ayres <hello@camilasan.com>
---
 src/gui/tray/TrayFoldersMenuButton.qml | 10 ++++------
 src/gui/tray/Window.qml                | 19 ++-----------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index ba982fbe8357f..85a930f34cdc1 100644
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml
@@ -91,7 +91,6 @@ HeaderButton {
                     width: Style.folderStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset
                     height: width
                     anchors.centerIn: parent
-                    color: Style.currentUserHeaderColor
                     radius: width * Style.trayFolderStatusIndicatorRadiusFactor
                     z: -2
                 }
@@ -101,7 +100,6 @@ HeaderButton {
                     width: Style.folderStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset
                     height: width
                     anchors.centerIn: parent
-                    color: root.hovered ? Style.currentUserHeaderTextColor : palette.window
                     opacity: Style.trayFolderStatusIndicatorMouseHoverOpacityFactor
                     radius: width * Style.trayFolderStatusIndicatorRadiusFactor
                     z: -1
@@ -116,7 +114,7 @@ HeaderButton {
 
                 cache: true
 
-                source: "image://svgimage-custom-color/folder.svg/" + Style.currentUserHeaderTextColor
+                source: "image://svgimage-custom-color/folder.svg/"
                 sourceSize {
                     width: imageWidth
                     height: imageHeight
@@ -146,7 +144,7 @@ HeaderButton {
 
                     cache: true
 
-                    source: "image://svgimage-custom-color/caret-down.svg/" + Style.currentUserHeaderTextColor
+                    source: "image://svgimage-custom-color/caret-down.svg/"
                     sourceSize {
                         width: openLocalFolderButtonCaretIconLoader.imageWidth
                         height: openLocalFolderButtonCaretIconLoader.imageHeight
@@ -210,9 +208,9 @@ HeaderButton {
                         subline: model.modelData.parentPath
                         width: foldersMenuListView.width
                         height: Style.standardPrimaryButtonHeight
-                        backgroundIconSource: "image://svgimage-custom-color/folder.svg/" + palette.buttonText
+                        backgroundIconSource: "image://svgimage-custom-color/folder.svg/"
                         iconSource: isGroupFolder
-                                    ? "image://svgimage-custom-color/account-group.svg/" + palette.brightText
+                                    ? "image://svgimage-custom-color/account-group.svg/"
                                     : ""
 
                         onTriggered: {
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 2d85816e142df..c501091205d3a 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -507,7 +507,6 @@ ApplicationWindow {
 
                         ColorOverlay {
                             cached: true
-                            color: Style.currentUserHeaderTextColor
                             width: source.width
                             height: source.height
                             source: Image {
@@ -535,7 +534,6 @@ ApplicationWindow {
                     visible: currentUser.hasLocalFolder
                     currentUser: UserModel.currentUser
 
-
                     onClicked: openLocalFolderButton.userHasGroupFolders ? openLocalFolderButton.toggleMenuOpen() : UserModel.openCurrentAccountLocalFolder()
 
                     onFolderEntryTriggered: isGroupFolder ? UserModel.openCurrentAccountFolderFromTrayInfo(fullFolderPath) : UserModel.openCurrentAccountLocalFolder()
@@ -552,7 +550,7 @@ ApplicationWindow {
                 HeaderButton {
                     id: trayWindowFeaturedAppButton
                     visible: UserModel.currentUser.isFeaturedAppEnabled
-                    icon.source: UserModel.currentUser.featuredAppIcon + "/" + Style.currentUserHeaderTextColor
+                    icon.source: UserModel.currentUser.featuredAppIcon + "/"
                     onClicked: UserModel.openCurrentAccountFeaturedApp()
 
                     Accessible.role: Accessible.Button
@@ -566,7 +564,7 @@ ApplicationWindow {
 
                 HeaderButton {
                     id: trayWindowAppsButton
-                    icon.source: "image://svgimage-custom-color/more-apps.svg" + "/" + Style.currentUserHeaderTextColor
+                    icon.source: "image://svgimage-custom-color/more-apps.svg/"
 
                     onClicked: {
                         if(appsMenuListView.count <= 0) {
@@ -614,24 +612,11 @@ ApplicationWindow {
                                     id: appEntry
                                     anchors.left: parent.left
                                     anchors.right: parent.right
-
                                     text: model.appName
                                     font.pixelSize: Style.topLinePixelSize
                                     icon.source: model.appIconUrl
-                                    icon.color: palette.buttonText
                                     onTriggered: UserAppsModel.openAppUrl(appUrl)
                                     hoverEnabled: true
-
-                                    // background: Item {
-                                    //     height: parent.height
-                                    //     width: parent.width
-                                    //     Rectangle {
-                                    //         anchors.fill: parent
-                                    //         anchors.margins: 1
-                                    //         color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
-                                    //     }
-                                    // }
-
                                     Accessible.role: Accessible.MenuItem
                                     Accessible.name: qsTr("Open %1 in browser").arg(model.appName)
                                     Accessible.onPressAction: appEntry.triggered()