From: Camila Ayres <hello@camilasan.com>
Date: Thu, 12 Sep 2024 16:20:36 +0000 (+0200)
Subject: Use the same radius value, border colors and hover colors in all header menus.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~6^2~18^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f97d28cf48b7507e16829f51ce86c236c9035499;p=nextcloud-desktop.git

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 2fcd958f0..053a6a6a5 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -40,6 +40,7 @@ AbstractButton {
         color: (userLine.hovered || userLine.visualFocus) &&
                !(userMoreButton.hovered || userMoreButton.visualFocus) ?
                    palette.highlight : palette.window
+        radius: Style.trayWindowRadius
     }
 
     contentItem: RowLayout {
@@ -156,6 +157,12 @@ AbstractButton {
                 id: userMoreButtonMenu
                 closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape
 
+                background: Rectangle {
+                    border.color: palette.dark
+                    radius: Style.trayWindowRadius
+                    color: palette.window
+                }
+
                 MenuItem {
                     visible: model.isConnected && model.serverHasUserStatus
                     height: visible ? implicitHeight : 0
@@ -163,6 +170,11 @@ AbstractButton {
                     font.pixelSize: Style.topLinePixelSize
                     hoverEnabled: true
                     onClicked: showUserStatusSelector(index)
+
+                    background: Rectangle {
+                        radius: Style.trayWindowRadius
+                        color: parent.hovered ? palette.highlight : palette.window
+                    }
                 }
 
                 MenuItem {
@@ -185,6 +197,11 @@ AbstractButton {
                         }
                         accountMenu.close()
                     }
+
+                    background: Rectangle {
+                        radius: Style.trayWindowRadius
+                        color: parent.hovered ? palette.highlight : palette.window
+                    }
                 }
 
                 MenuItem {
@@ -200,6 +217,11 @@ AbstractButton {
                     Accessible.role: Accessible.Button
                     Accessible.name: text
                     Accessible.onPressAction: removeAccountButton.clicked()
+
+                    background: Rectangle {
+                        radius: Style.trayWindowRadius
+                        color: parent.hovered ? palette.highlight : palette.window
+                    }
                 }
             }
         }
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 1686ce882..e67711792 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -289,7 +289,7 @@ ApplicationWindow {
                         background: Rectangle {
                             border.color: palette.dark
                             color: palette.window
-                            radius: Style.currentAccountButtonRadius
+                            radius: Style.trayWindowRadius
                         }
 
                         onClosed: {
@@ -347,6 +347,12 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem
                             Accessible.name: qsTr("Add new account")
                             Accessible.onPressAction: addAccountButton.clicked()
+
+                            background: Rectangle {
+                                radius: Style.trayWindowRadius
+                                color: palette.highlight
+                                visible: addAccountButton.hovered
+                            }
                         }
 
                         Rectangle {
@@ -364,6 +370,12 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem
                             Accessible.name: Systray.syncIsPaused ? qsTr("Resume sync for all") : qsTr("Pause sync for all")
                             Accessible.onPressAction: syncPauseButton.clicked()
+
+                            background: Rectangle {
+                                radius: Style.trayWindowRadius
+                                color: palette.highlight
+                                visible: syncPauseButton.hovered
+                            }
                         }
 
                         MenuItem {
@@ -375,6 +387,12 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem
                             Accessible.name: text
                             Accessible.onPressAction: settingsButton.clicked()
+
+                            background: Rectangle {
+                                radius: Style.trayWindowRadius
+                                color: palette.highlight
+                                visible: settingsButton.hovered
+                            }
                         }
 
                         MenuItem {
@@ -386,6 +404,12 @@ ApplicationWindow {
                             Accessible.role: Accessible.MenuItem
                             Accessible.name: text
                             Accessible.onPressAction: exitButton.clicked()
+
+                            background: Rectangle {
+                                radius: Style.trayWindowRadius
+                                color: palette.highlight
+                                visible: exitButton.hovered
+                            }
                         }
                     }
 
@@ -587,7 +611,7 @@ ApplicationWindow {
 
                         background: Rectangle {
                             border.color: palette.dark
-                            radius: Style.currentAccountButtonRadius
+                            radius: Style.trayWindowRadius
                             color: palette.window
                         }
 
@@ -622,7 +646,8 @@ ApplicationWindow {
                                     background: Rectangle {
                                         anchors.fill: parent
                                         anchors.margins: 1
-                                        color: (appEntry.hovered || appEntry.visualFocus) ? palette.highlight : palette.window
+                                        color: appEntry.hovered ? palette.highlight : palette.window
+                                        radius: Style.trayWindowRadius
                                     }
                                 }
                             }