From 362d3d9f72f157ed90bee2b51629968752475752 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 21 Nov 2024 14:11:41 +0800 Subject: [PATCH] Do not load caret on current user button if the button had a non-null indicator Signed-off-by: Claudio Cambra --- src/gui/tray/MainWindow.qml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml index 82ea64a93c83b..403accf3c2a0e 100644 --- a/src/gui/tray/MainWindow.qml +++ b/src/gui/tray/MainWindow.qml @@ -478,16 +478,19 @@ ApplicationWindow { } } - Image { - Layout.alignment: Qt.AlignRight - verticalAlignment: Qt.AlignCenter - horizontalAlignment: Qt.AlignRight - Layout.leftMargin: Style.accountDropDownCaretMargin - source: "image://svgimage-custom-color/caret-down.svg/" + palette.windowText - sourceSize.width: Style.accountDropDownCaretSize - sourceSize.height: Style.accountDropDownCaretSize - Accessible.role: Accessible.PopupMenu - Accessible.name: qsTr("Account switcher and settings menu") + Loader { + active: currentAccountButton.indicator === null + sourceComponent: Image { + Layout.alignment: Qt.AlignRight + verticalAlignment: Qt.AlignCenter + horizontalAlignment: Qt.AlignRight + Layout.leftMargin: Style.accountDropDownCaretMargin + source: "image://svgimage-custom-color/caret-down.svg/" + palette.windowText + sourceSize.width: Style.accountDropDownCaretSize + sourceSize.height: Style.accountDropDownCaretSize + Accessible.role: Accessible.PopupMenu + Accessible.name: qsTr("Account switcher and settings menu") + } } } }