Remove more color customizations from Window and TrayFoldersMenuButton.

Signed-off-by: Camila Ayres <hello@camilasan.com>

diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index ba982fbe8357f827133da8d614e9c21f03e68cd9..85a930f34cdc1b2d79cba8db2d0ea465b3c13d05 100644 (file)
--- 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 2d85816e142df84daba6e8c66f4db223d966196b..c501091205d3a68270831ce9b3843966e8b23dbd 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -507,7 +507,6 @@ ApplicationWindow {
 \r
                         ColorOverlay {\r
                             cached: true\r
-                            color: Style.currentUserHeaderTextColor\r
                             width: source.width\r
                             height: source.height\r
                             source: Image {\r
@@ -535,7 +534,6 @@ ApplicationWindow {
                     visible: currentUser.hasLocalFolder\r
                     currentUser: UserModel.currentUser\r
 \r
-\r
                     onClicked: openLocalFolderButton.userHasGroupFolders ? openLocalFolderButton.toggleMenuOpen() : UserModel.openCurrentAccountLocalFolder()\r
 \r
                     onFolderEntryTriggered: isGroupFolder ? UserModel.openCurrentAccountFolderFromTrayInfo(fullFolderPath) : UserModel.openCurrentAccountLocalFolder()\r
@@ -552,7 +550,7 @@ ApplicationWindow {
                 HeaderButton {\r
                     id: trayWindowFeaturedAppButton\r
                     visible: UserModel.currentUser.isFeaturedAppEnabled\r
-                    icon.source: UserModel.currentUser.featuredAppIcon + "/" + Style.currentUserHeaderTextColor\r
+                    icon.source: UserModel.currentUser.featuredAppIcon + "/"\r
                     onClicked: UserModel.openCurrentAccountFeaturedApp()\r
 \r
                     Accessible.role: Accessible.Button\r
@@ -566,7 +564,7 @@ ApplicationWindow {
 \r
                 HeaderButton {\r
                     id: trayWindowAppsButton\r
-                    icon.source: "image://svgimage-custom-color/more-apps.svg" + "/" + Style.currentUserHeaderTextColor\r
+                    icon.source: "image://svgimage-custom-color/more-apps.svg/"\r
 \r
                     onClicked: {\r
                         if(appsMenuListView.count <= 0) {\r
@@ -614,24 +612,11 @@ ApplicationWindow {
                                     id: appEntry\r
                                     anchors.left: parent.left\r
                                     anchors.right: parent.right\r
-\r
                                     text: model.appName\r
                                     font.pixelSize: Style.topLinePixelSize\r
                                     icon.source: model.appIconUrl\r
-                                    icon.color: palette.buttonText\r
                                     onTriggered: UserAppsModel.openAppUrl(appUrl)\r
                                     hoverEnabled: true\r
-\r
-                                    // background: Item {\r
-                                    //     height: parent.height\r
-                                    //     width: parent.width\r
-                                    //     Rectangle {\r
-                                    //         anchors.fill: parent\r
-                                    //         anchors.margins: 1\r
-                                    //         color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window\r
-                                    //     }\r
-                                    // }\r
-\r
                                     Accessible.role: Accessible.MenuItem\r
                                     Accessible.name: qsTr("Open %1 in browser").arg(model.appName)\r
                                     Accessible.onPressAction: appEntry.triggered()\r