Use the same radius value, border colors and hover colors in all header menus.

Signed-off-by: Camila Ayres <hello@camilasan.com>

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index 2fcd958f01a779bbc4c8da76c2d7b7bb537fe90d..053a6a6a5d257465706273fb194d43146ac1acc8 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -40,6 +40,7 @@ AbstractButton {
         color: (userLine.hovered || userLine.visualFocus) &&\r
                !(userMoreButton.hovered || userMoreButton.visualFocus) ?\r
                    palette.highlight : palette.window\r
+        radius: Style.trayWindowRadius\r
     }\r
 \r
     contentItem: RowLayout {\r
@@ -156,6 +157,12 @@ AbstractButton {
                 id: userMoreButtonMenu\r
                 closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape\r
 \r
+                background: Rectangle {\r
+                    border.color: palette.dark\r
+                    radius: Style.trayWindowRadius\r
+                    color: palette.window\r
+                }\r
+\r
                 MenuItem {\r
                     visible: model.isConnected && model.serverHasUserStatus\r
                     height: visible ? implicitHeight : 0\r
@@ -163,6 +170,11 @@ AbstractButton {
                     font.pixelSize: Style.topLinePixelSize\r
                     hoverEnabled: true\r
                     onClicked: showUserStatusSelector(index)\r
+\r
+                    background: Rectangle {\r
+                        radius: Style.trayWindowRadius\r
+                        color: parent.hovered ? palette.highlight : palette.window\r
+                    }\r
                 }\r
 \r
                 MenuItem {\r
@@ -185,6 +197,11 @@ AbstractButton {
                         }\r
                         accountMenu.close()\r
                     }\r
+\r
+                    background: Rectangle {\r
+                        radius: Style.trayWindowRadius\r
+                        color: parent.hovered ? palette.highlight : palette.window\r
+                    }\r
                 }\r
 \r
                 MenuItem {\r
@@ -200,6 +217,11 @@ AbstractButton {
                     Accessible.role: Accessible.Button\r
                     Accessible.name: text\r
                     Accessible.onPressAction: removeAccountButton.clicked()\r
+\r
+                    background: Rectangle {\r
+                        radius: Style.trayWindowRadius\r
+                        color: parent.hovered ? palette.highlight : palette.window\r
+                    }\r
                 }\r
             }\r
         }\r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 1686ce882b710d8236cb57a40be9e49ffdeabf21..e6771179267e32c66d323e1968463ee0bf6e347b 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -289,7 +289,7 @@ ApplicationWindow {
                         background: Rectangle {\r
                             border.color: palette.dark\r
                             color: palette.window\r
-                            radius: Style.currentAccountButtonRadius\r
+                            radius: Style.trayWindowRadius\r
                         }\r
 \r
                         onClosed: {\r
@@ -347,6 +347,12 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem\r
                             Accessible.name: qsTr("Add new account")\r
                             Accessible.onPressAction: addAccountButton.clicked()\r
+\r
+                            background: Rectangle {\r
+                                radius: Style.trayWindowRadius\r
+                                color: palette.highlight\r
+                                visible: addAccountButton.hovered\r
+                            }\r
                         }\r
 \r
                         Rectangle {\r
@@ -364,6 +370,12 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem\r
                             Accessible.name: Systray.syncIsPaused ? qsTr("Resume sync for all") : qsTr("Pause sync for all")\r
                             Accessible.onPressAction: syncPauseButton.clicked()\r
+\r
+                            background: Rectangle {\r
+                                radius: Style.trayWindowRadius\r
+                                color: palette.highlight\r
+                                visible: syncPauseButton.hovered\r
+                            }\r
                         }\r
 \r
                         MenuItem {\r
@@ -375,6 +387,12 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem\r
                             Accessible.name: text\r
                             Accessible.onPressAction: settingsButton.clicked()\r
+\r
+                            background: Rectangle {\r
+                                radius: Style.trayWindowRadius\r
+                                color: palette.highlight\r
+                                visible: settingsButton.hovered\r
+                            }\r
                         }\r
 \r
                         MenuItem {\r
@@ -386,6 +404,12 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem\r
                             Accessible.name: text\r
                             Accessible.onPressAction: exitButton.clicked()\r
+\r
+                            background: Rectangle {\r
+                                radius: Style.trayWindowRadius\r
+                                color: palette.highlight\r
+                                visible: exitButton.hovered\r
+                            }\r
                         }\r
                     }\r
 \r
@@ -587,7 +611,7 @@ ApplicationWindow {
 \r
                         background: Rectangle {\r
                             border.color: palette.dark\r
-                            radius: Style.currentAccountButtonRadius\r
+                            radius: Style.trayWindowRadius\r
                             color: palette.window\r
                         }\r
 \r
@@ -622,7 +646,8 @@ ApplicationWindow {
                                     background: Rectangle {\r
                                         anchors.fill: parent\r
                                         anchors.margins: 1\r
-                                        color: (appEntry.hovered || appEntry.visualFocus) ? palette.highlight : palette.window\r
+                                        color: appEntry.hovered ? palette.highlight : palette.window\r
+                                        radius: Style.trayWindowRadius\r
                                     }\r
                                 }\r
                             }\r