Fix account switching and hover issues with UserLine component

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

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index 6a064f5c829529de8a2de92c54d900c5d33a6af3..204a7c86e615b35180245e622e826d0017d7ccae 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -46,7 +46,7 @@ AbstractButton {
                 height: width\r
                 anchors.bottom: accountAvatar.bottom\r
                 anchors.right: accountAvatar.right\r
-                color: accountButton.hovered || accountButton.visualFocus ? "#f6f6f6" : "white"\r
+                color: userLine.hovered || userLine.visualFocus ? "#f6f6f6" : "white"\r
                 radius: width*0.5\r
             }\r
 \r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index bc629d8ee3857c405a37e5759a6ab3922539ce48..867bfc5c49d21e4a66ac716fd0d07c18d98b4616 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -254,6 +254,7 @@ ApplicationWindow {
                                     userStatusDrawer.openUserStatusDrawer(model.index);\r
                                     accountMenu.close();\r
                                 }\r
+                                onClicked: UserModel.currentUserId = model.index;\r
                             }\r
                             onObjectAdded: accountMenu.insertItem(index, object)\r
                             onObjectRemoved: accountMenu.removeItem(object)\r