From 0f689fd25580905e19eedb7e1d6a3ce992d9db85 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 19 Nov 2024 11:51:20 +0800 Subject: [PATCH] Fix colour of indicator outlines in tray header elements Signed-off-by: Claudio Cambra f bgc Signed-off-by: Claudio Cambra --- src/gui/tray/MainWindow.qml | 2 ++ src/gui/tray/TrayFoldersMenuButton.qml | 2 ++ 2 files changed, 4 insertions(+) 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 -- 2.30.2