From 4066427168e4cde2800eec599539a603721185cb Mon Sep 17 00:00:00 2001
From: James Graham <james.h.graham@protonmail.com>
Date: Thu, 2 Feb 2023 21:19:04 +0000
Subject: [PATCH] Fix Account Switcher Missing Clicks

Use a state machine to open and close the account switcher so clicks aren't missed.

BUG: 462549
---
 src/qml/Component/UserInfo.qml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/qml/Component/UserInfo.qml b/src/qml/Component/UserInfo.qml
index b78720f2d..f95f0f80e 100644
--- a/src/qml/Component/UserInfo.qml
+++ b/src/qml/Component/UserInfo.qml
@@ -15,7 +15,6 @@ QQC2.ToolBar {
 
     height: content.height
 
-    property alias accountsListVisible: accounts.visible
     property var addAccount
 
     ColumnLayout {
@@ -59,7 +58,9 @@ QQC2.ToolBar {
                 subtitle: i18n("Log in to an existing account")
                 onClicked: {
                     pageStack.pushDialogLayer("qrc:/WelcomePage.qml", {}, {title: i18nc("@title:window", "Login")})
-                    userInfo.accountsListVisible = false
+                    if (switchUserButton.checked) {
+                        switchUserButton.checked = false
+                    }
                     accounts.currentIndex = Controller.activeConnectionIndex
                 }
                 Keys.onUpPressed: {
@@ -72,7 +73,7 @@ QQC2.ToolBar {
                 }
             }
 
-            visible: false
+            visible: switchUserButton.checked
             onVisibleChanged: if (visible) focus = true
             clip: true
             model: AccountRegistry
@@ -96,7 +97,9 @@ QQC2.ToolBar {
             }
 
             Keys.onReleased: if (event.key == Qt.Key_Escape) {
-                userInfo.accountsListVisible = false
+                if (switchUserButton.checked) {
+                    switchUserButton.checked = false
+                }
             }
 
             width: parent.width
@@ -116,7 +119,9 @@ QQC2.ToolBar {
 
                 onClicked: {
                     Controller.activeConnection = model.connection
-                    userInfo.accountsListVisible = false
+                    if (switchUserButton.checked) {
+                        switchUserButton.checked = false
+                    }
                 }
             }
         }
@@ -167,10 +172,9 @@ QQC2.ToolBar {
                 }
             }
             QQC2.ToolButton {
+                id: switchUserButton
                 icon.name: "system-switch-user"
-                onClicked: {
-                    userInfo.accountsListVisible = !userInfo.accountsListVisible
-                }
+                checkable: true
                 text: i18n("Switch User")
                 display: QQC2.AbstractButton.IconOnly
                 Accessible.name: text