Do not load caret on current user button if the button had a non-null indicator

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

diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml
index 82ea64a93c83b7602509f34d7f7820bb3b7d1383..403accf3c2a0ecd3eabe01fa23fbcb27ef748fc0 100644 (file)
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -478,16 +478,19 @@ ApplicationWindow {
                             }\r
                         }\r
 \r
-                        Image {\r
-                            Layout.alignment: Qt.AlignRight\r
-                            verticalAlignment: Qt.AlignCenter\r
-                            horizontalAlignment: Qt.AlignRight\r
-                            Layout.leftMargin: Style.accountDropDownCaretMargin\r
-                            source:  "image://svgimage-custom-color/caret-down.svg/" + palette.windowText\r
-                            sourceSize.width: Style.accountDropDownCaretSize\r
-                            sourceSize.height: Style.accountDropDownCaretSize\r
-                            Accessible.role: Accessible.PopupMenu\r
-                            Accessible.name: qsTr("Account switcher and settings menu")\r
+                        Loader {\r
+                            active: currentAccountButton.indicator === null\r
+                            sourceComponent: Image {\r
+                                Layout.alignment: Qt.AlignRight\r
+                                verticalAlignment: Qt.AlignCenter\r
+                                horizontalAlignment: Qt.AlignRight\r
+                                Layout.leftMargin: Style.accountDropDownCaretMargin\r
+                                source:  "image://svgimage-custom-color/caret-down.svg/" + palette.windowText\r
+                                sourceSize.width: Style.accountDropDownCaretSize\r
+                                sourceSize.height: Style.accountDropDownCaretSize\r
+                                Accessible.role: Accessible.PopupMenu\r
+                                Accessible.name: qsTr("Account switcher and settings menu")\r
+                            }\r
                         }\r
                     }\r
                 }\r