From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Thu, 21 Nov 2024 06:11:41 +0000 (+0800)
Subject: Do not load caret on current user button if the button had a non-null indicator
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~5^2~28^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=362d3d9f72f157ed90bee2b51629968752475752;p=nextcloud-desktop.git

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 82ea64a93..403accf3c 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")
+                            }
                         }
                     }
                 }