From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Thu, 14 Nov 2024 09:18:46 +0000 (+0800)
Subject: Remove custom background from menus and menu buttons
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~5^2~28^2~42
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9c7865533b3d7047f9b0060f05c335827221b6a2;p=nextcloud-desktop.git

Remove custom background from menus and menu buttons

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

diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml
index 1486f723d..591e5aefd 100644
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -293,12 +293,6 @@ ApplicationWindow {
                         height: Math.min(implicitHeight, maxMenuHeight)
                         closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape
 
-                        background: Rectangle {
-                            border.color: palette.dark
-                            color: palette.window
-                            radius: Style.halfTrayWindowRadius
-                        }
-
                         onClosed: {
                             // HACK: reload account Instantiator immediately by restting it - could be done better I guess
                             // see also onVisibleChanged above
@@ -355,11 +349,6 @@ ApplicationWindow {
                             Accessible.name: qsTr("Add new account")
                             Accessible.onPressAction: addAccountButton.clicked()
 
-                            background: Rectangle {
-                                radius: Style.halfTrayWindowRadius
-                                color: palette.highlight
-                                visible: addAccountButton.hovered
-                            }
                         }
 
                         Rectangle {
@@ -378,11 +367,6 @@ ApplicationWindow {
                             Accessible.name: Systray.syncIsPaused ? qsTr("Resume sync for all") : qsTr("Pause sync for all")
                             Accessible.onPressAction: syncPauseButton.clicked()
 
-                            background: Rectangle {
-                                radius: Style.halfTrayWindowRadius
-                                color: palette.highlight
-                                visible: syncPauseButton.hovered
-                            }
                         }
 
                         MenuItem {
@@ -395,11 +379,6 @@ ApplicationWindow {
                             Accessible.name: text
                             Accessible.onPressAction: settingsButton.clicked()
 
-                            background: Rectangle {
-                                radius: Style.halfTrayWindowRadius
-                                color: palette.highlight
-                                visible: settingsButton.hovered
-                            }
                         }
 
                         MenuItem {
@@ -410,13 +389,7 @@ ApplicationWindow {
                             onClicked: Systray.shutdown()
                             Accessible.role: Accessible.MenuItem
                             Accessible.name: text
-                            Accessible.onPressAction: exitButton.clicked()
-
-                            background: Rectangle {
-                                radius: Style.halfTrayWindowRadius
-                                color: palette.highlight
-                                visible: exitButton.hovered
-                            }
+                            Accessible.onPressAction: exitButton.clicked() 
                         }
                     }
 
diff --git a/src/gui/tray/TrayFolderListItem.qml b/src/gui/tray/TrayFolderListItem.qml
index 13cc5fa0e..720a311aa 100644
--- a/src/gui/tray/TrayFolderListItem.qml
+++ b/src/gui/tray/TrayFolderListItem.qml
@@ -30,17 +30,6 @@ MenuItem {
         text: root.toolTipText
     }
 
-    background: Item {
-        height: parent.height
-        width: parent.width
-        Rectangle {
-            anchors.fill: parent
-            anchors.margins: Style.normalBorderWidth
-            color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
-            radius: Style.halfTrayWindowRadius
-        }
-    }
-
     contentItem: RowLayout {
         anchors.fill: parent
         anchors.leftMargin: Style.trayWindowMenuEntriesMargin
diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index 020f6398a..a2197c7c8 100644
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml
@@ -178,12 +178,6 @@ HeaderButton {
             height: implicitHeight + y > Style.trayWindowHeight ? Style.trayWindowHeight - y : implicitHeight
             closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape
 
-            background: Rectangle {
-                border.color: palette.dark
-                color: palette.window
-                radius: Style.trayWindowRadius
-            }
-
             contentItem: ScrollView {
                 id: foldersMenuScrollView
 
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index e6f5ef800..5527ddf7f 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -34,15 +34,6 @@ AbstractButton {
 
     height: Style.trayWindowHeaderHeight
 
-    background: Rectangle {
-        anchors.fill: parent
-        anchors.margins: 1
-        color: (userLine.hovered || userLine.visualFocus) &&
-               !(userMoreButton.hovered || userMoreButton.visualFocus) ?
-                   palette.highlight : palette.window
-        radius: Style.halfTrayWindowRadius
-    }
-
     contentItem: RowLayout {
         id: userLineLayout
         spacing: Style.userStatusSpacing
@@ -158,12 +149,6 @@ AbstractButton {
                 id: userMoreButtonMenu
                 closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape
 
-                background: Rectangle {
-                    border.color: palette.dark
-                    radius: Style.halfTrayWindowRadius
-                    color: palette.window
-                }
-
                 MenuItem {
                     visible: model.isConnected && model.serverHasUserStatus
                     height: visible ? implicitHeight : 0
@@ -171,12 +156,7 @@ AbstractButton {
                     font.pixelSize: Style.topLinePixelSize
                     hoverEnabled: true
                     onClicked: showUserStatusSelector(index)
-
-                    background: Rectangle {
-                        radius: Style.halfTrayWindowRadius
-                        color: parent.hovered ? palette.highlight : palette.window
-                    }
-                }
+               }
 
                 MenuItem {
                     text: model.isConnected ? qsTr("Log out") : qsTr("Log in")
@@ -198,12 +178,7 @@ AbstractButton {
                         }
                         accountMenu.close()
                     }
-
-                    background: Rectangle {
-                        radius: Style.halfTrayWindowRadius
-                        color: parent.hovered ? palette.highlight : palette.window
-                    }
-                }
+               }
 
                 MenuItem {
                     id: removeAccountButton
@@ -218,12 +193,7 @@ AbstractButton {
                     Accessible.role: Accessible.Button
                     Accessible.name: text
                     Accessible.onPressAction: removeAccountButton.clicked()
-
-                    background: Rectangle {
-                        radius: Style.halfTrayWindowRadius
-                        color: parent.hovered ? palette.highlight : palette.window
-                    }
-                }
+               }
             }
         }
     }