Fix colour of indicator outlines in tray header elements

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
f bgc

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml
index f14fa49287d3cdde345bd890efcde7e9f06c6c7f..82ea64a93c83b7602509f34d7f7820bb3b7d1383 100644 (file)
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -400,6 +400,7 @@ ApplicationWindow {
                                          && UserModel.currentUser.serverHasUserStatus\r
                                 width: Style.accountAvatarStateIndicatorSize +  + Style.trayFolderStatusIndicatorSizeOffset\r
                                 height: width\r
+                                color: trayWindowHeaderBackground.color\r
                                 anchors.bottom: currentAccountAvatar.bottom\r
                                 anchors.right: currentAccountAvatar.right\r
                                 radius: width * Style.trayFolderStatusIndicatorRadiusFactor\r
@@ -501,6 +502,7 @@ ApplicationWindow {
 \r
                     visible: currentUser.hasLocalFolder\r
                     currentUser: UserModel.currentUser\r
+                    parentBackgroundColor: trayWindowHeaderBackground.color\r
 \r
                     onClicked: openLocalFolderButton.userHasGroupFolders ? openLocalFolderButton.toggleMenuOpen() : UserModel.openCurrentAccountLocalFolder()\r
 \r

diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index a2197c7c84a1327f8c3f1352505e77f2e81be467..9ba7cf693a4ff738889680edd28cabfb2cb3f070 100644 (file)
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml
@@ -26,6 +26,7 @@ HeaderButton {
 
     required property var currentUser
     property bool userHasGroupFolders: currentUser.groupFolders.length > 0
+    property color parentBackgroundColor: "transparent"
 
     function openMenu() {
         foldersMenuLoader.openMenu()
@@ -90,6 +91,7 @@ HeaderButton {
                     id: folderStateIndicatorBackground
                     width: Style.folderStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset
                     height: width
+                    color: root.parentBackgroundColor
                     anchors.centerIn: parent
                     radius: width * Style.trayFolderStatusIndicatorRadiusFactor
                     z: -2