From 5248b59a145d537d13eb7ae562e7fa8aa8fdc623 Mon Sep 17 00:00:00 2001 From: Rello Date: Fri, 5 Sep 2025 09:17:19 +0700 Subject: [PATCH 1/3] Fix layout and color for CurrentAccountHeaderButton Signed-off-by: Rello --- src/gui/tray/CurrentAccountHeaderButton.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/tray/CurrentAccountHeaderButton.qml b/src/gui/tray/CurrentAccountHeaderButton.qml index b320098f73..8803992679 100644 --- a/src/gui/tray/CurrentAccountHeaderButton.qml +++ b/src/gui/tray/CurrentAccountHeaderButton.qml @@ -162,9 +162,9 @@ Button { && UserModel.currentUser.serverHasUserStatus && UserModel.currentUser.status !== UserStatus.Invisible && UserModel.currentUser.status !== UserStatus.Offline - width: Style.accountAvatarStateIndicatorSize + + Style.trayFolderStatusIndicatorSizeOffset + width: Style.accountAvatarStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset height: width - color: root.parentBackgroundColor + color: "white" anchors.bottom: currentAccountAvatar.bottom anchors.right: currentAccountAvatar.right radius: width * Style.trayFolderStatusIndicatorRadiusFactor @@ -178,8 +178,8 @@ Button { && UserModel.currentUser.status !== UserStatus.Offline source: UserModel.currentUser ? UserModel.currentUser.statusIcon : "" cache: false - x: currentAccountStatusIndicatorBackground.x + 1 - y: currentAccountStatusIndicatorBackground.y + 1 + x: currentAccountStatusIndicatorBackground.x + Style.trayFolderStatusIndicatorSizeOffset / 2 + y: currentAccountStatusIndicatorBackground.y + Style.trayFolderStatusIndicatorSizeOffset / 2 sourceSize.width: Style.accountAvatarStateIndicatorSize sourceSize.height: Style.accountAvatarStateIndicatorSize From d4168c0d62aa8b149a95f1bf5f8c34feec4df4aa Mon Sep 17 00:00:00 2001 From: Rello Date: Fri, 5 Sep 2025 09:19:04 +0700 Subject: [PATCH 2/3] Refactor UserLine.qml for layout and accessibility Signed-off-by: Rello --- src/gui/tray/UserLine.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml index 554569f01c..3349c8a26b 100644 --- a/src/gui/tray/UserLine.qml +++ b/src/gui/tray/UserLine.qml @@ -39,7 +39,7 @@ AbstractButton { Rectangle { id: accountStatusIndicatorBackground visible: model.isConnected && model.serverHasUserStatus - width: accountStatusIndicator.sourceSize.width + 2 + width: accountStatusIndicator.sourceSize.width + Style.trayFolderStatusIndicatorSizeOffset height: width color: "white" anchors.bottom: accountAvatar.bottom @@ -52,8 +52,8 @@ AbstractButton { visible: model.isConnected && model.serverHasUserStatus source: model.statusIcon cache: false - x: accountStatusIndicatorBackground.x + 1 - y: accountStatusIndicatorBackground.y + 1 + x: accountStatusIndicatorBackground.x + Style.trayFolderStatusIndicatorSizeOffset / 2 + y: accountStatusIndicatorBackground.y + Style.trayFolderStatusIndicatorSizeOffset / 2 sourceSize.width: Style.accountAvatarStateIndicatorSize sourceSize.height: Style.accountAvatarStateIndicatorSize @@ -181,3 +181,4 @@ AbstractButton { } } } // MenuItem userLine + From 9dbeeac83fe933f70d0cd1a7de614de125b86995 Mon Sep 17 00:00:00 2001 From: Rello Date: Fri, 5 Sep 2025 09:20:24 +0700 Subject: [PATCH 3/3] Change folder state indicator background color to white Signed-off-by: Rello --- src/gui/tray/TrayFoldersMenuButton.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml index be44601c7b..588035256b 100644 --- a/src/gui/tray/TrayFoldersMenuButton.qml +++ b/src/gui/tray/TrayFoldersMenuButton.qml @@ -90,7 +90,7 @@ HeaderButton { id: folderStateIndicatorBackground width: Style.folderStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset height: width - color: root.parentBackgroundColor + color: "white" anchors.centerIn: parent radius: width * Style.trayFolderStatusIndicatorRadiusFactor z: -1