More fixes to the menu implementation

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index c418e3c1f1ac238305d2590aec0f8f81dd9ee40d..ecdc6792a3c038d9815af3c451f1e8f8d9be9f63 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -16,6 +16,7 @@ MenuItem {
 \r
     property variant dialog;\r
     property variant comp;\r
+    activeFocusOnTab: false\r
 \r
     signal showUserStatusSelectorDialog(int id)\r
 \r
@@ -35,29 +36,19 @@ MenuItem {
             Accessible.role: Accessible.Button\r
             Accessible.name: qsTr("Switch to account") + " " + name\r
 \r
-            MouseArea {\r
-                anchors.fill: parent\r
-                hoverEnabled: true\r
-                onContainsMouseChanged: {\r
-                    accountStatusIndicatorBackground.color = (containsMouse ? "#f6f6f6" : "white")\r
-                }\r
-                onClicked: {\r
-                    if (!isCurrentUser) {\r
-                        UserModel.switchCurrentUser(id)\r
-                    } else {\r
-                        accountMenu.close()\r
-                    }\r
-                }\r
+            onClicked: if (!isCurrentUser) {\r
+                UserModel.switchCurrentUser(id)\r
+            } else {\r
+                accountMenu.close()\r
             }\r
 \r
-\r
             background: Item {\r
                 height: parent.height\r
                 width: userLine.menu ? userLine.menu.width : 0\r
                 Rectangle {\r
                     anchors.fill: parent\r
                     anchors.margins: 1\r
-                    color: parent.parent.hovered ? Style.lightHover : "transparent"\r
+                    color: parent.parent.hovered || parent.parent.visualFocus ? Style.lightHover : "transparent"\r
                 }\r
             }\r
 \r
@@ -81,7 +72,7 @@ MenuItem {
                         height: width\r
                         anchors.bottom: accountAvatar.bottom\r
                         anchors.right: accountAvatar.right\r
-                        color: "white"\r
+                        color: accountButton.hovered || accountButton.visualFocus ? "#f6f6f6" : "white"\r
                         radius: width*0.5\r
                     }\r
                     Image {\r
@@ -163,21 +154,16 @@ MenuItem {
             Accessible.name: qsTr("Account actions")\r
             Accessible.onPressAction: userMoreButtonMouseArea.clicked()\r
 \r
-            MouseArea {\r
-                id: userMoreButtonMouseArea\r
-                anchors.fill: parent\r
-                hoverEnabled: true\r
-                onClicked: {\r
-                    if (userMoreButtonMenu.visible) {\r
-                        userMoreButtonMenu.close()\r
-                    } else {\r
-                        userMoreButtonMenu.popup()\r
-                    }\r
+            onClicked: {\r
+                if (userMoreButtonMenu.visible) {\r
+                    userMoreButtonMenu.close()\r
+                } else {\r
+                    userMoreButtonMenu.popup()\r
                 }\r
             }\r
             background:\r
                 Rectangle {\r
-                color: userMoreButtonMouseArea.containsMouse ? "grey" : "transparent"\r
+                color: userMoreButton.hovered || userMoreButton.visualFocus ? "grey" : "transparent"\r
                 opacity: 0.2\r
                 height: userMoreButton.height - 2\r
                 y: userMoreButton.y + 1\r
@@ -196,7 +182,6 @@ MenuItem {
                 MenuItem {\r
                     visible: model.isConnected && model.serverHasUserStatus\r
                     height: visible ? implicitHeight : 0\r
-                    \r
                     text: qsTr("Set status")\r
                     font.pixelSize: Style.topLinePixelSize\r
                     hoverEnabled: true\r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 7728ef8f4331a12a2efd95d6d20464a91952e3e9..96528a61f0d4ba8510c69e87152374c362b9642e 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -716,6 +716,7 @@ Window {
             anchors.right: trayWindowBackground.right\r
             anchors.bottom: trayWindowBackground.bottom\r
 \r
+            activeFocusOnTab: true\r
             model: activityModel\r
             onShowFileActivity: {\r
                 openFileActivityDialog(displayPath, absolutePath)\r