From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 19 Nov 2024 03:51:20 +0000 (+0800)
Subject: Fix colour of indicator outlines in tray header elements
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~5^2~28^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0f689fd25580905e19eedb7e1d6a3ce992d9db85;p=nextcloud-desktop.git

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 f14fa4928..82ea64a93 100644
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -400,6 +400,7 @@ ApplicationWindow {
                                          && UserModel.currentUser.serverHasUserStatus
                                 width: Style.accountAvatarStateIndicatorSize +  + Style.trayFolderStatusIndicatorSizeOffset
                                 height: width
+                                color: trayWindowHeaderBackground.color
                                 anchors.bottom: currentAccountAvatar.bottom
                                 anchors.right: currentAccountAvatar.right
                                 radius: width * Style.trayFolderStatusIndicatorRadiusFactor
@@ -501,6 +502,7 @@ ApplicationWindow {
 
                     visible: currentUser.hasLocalFolder
                     currentUser: UserModel.currentUser
+                    parentBackgroundColor: trayWindowHeaderBackground.color
 
                     onClicked: openLocalFolderButton.userHasGroupFolders ? openLocalFolderButton.toggleMenuOpen() : UserModel.openCurrentAccountLocalFolder()
 
diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index a2197c7c8..9ba7cf693 100644
--- 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