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 1486f723d91ac86a2350811d8c89395556fca049..591e5aefd15b03dcbbdcb5752b55c33c4b5d3f9c 100644 (file)
--- a/src/gui/tray/MainWindow.qml
+++ b/src/gui/tray/MainWindow.qml
@@ -293,12 +293,6 @@ ApplicationWindow {
                         height: Math.min(implicitHeight, maxMenuHeight)\r
                         closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape\r
 \r
-                        background: Rectangle {\r
-                            border.color: palette.dark\r
-                            color: palette.window\r
-                            radius: Style.halfTrayWindowRadius\r
-                        }\r
-\r
                         onClosed: {\r
                             // HACK: reload account Instantiator immediately by restting it - could be done better I guess\r
                             // see also onVisibleChanged above\r
@@ -355,11 +349,6 @@ ApplicationWindow {
                             Accessible.name: qsTr("Add new account")\r
                             Accessible.onPressAction: addAccountButton.clicked()\r
 \r
-                            background: Rectangle {\r
-                                radius: Style.halfTrayWindowRadius\r
-                                color: palette.highlight\r
-                                visible: addAccountButton.hovered\r
-                            }\r
                         }\r
 \r
                         Rectangle {\r
@@ -378,11 +367,6 @@ ApplicationWindow {
                             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.halfTrayWindowRadius\r
-                                color: palette.highlight\r
-                                visible: syncPauseButton.hovered\r
-                            }\r
                         }\r
 \r
                         MenuItem {\r
@@ -395,11 +379,6 @@ ApplicationWindow {
                             Accessible.name: text\r
                             Accessible.onPressAction: settingsButton.clicked()\r
 \r
-                            background: Rectangle {\r
-                                radius: Style.halfTrayWindowRadius\r
-                                color: palette.highlight\r
-                                visible: settingsButton.hovered\r
-                            }\r
                         }\r
 \r
                         MenuItem {\r
@@ -410,13 +389,7 @@ ApplicationWindow {
                             onClicked: Systray.shutdown()\r
                             Accessible.role: Accessible.MenuItem\r
                             Accessible.name: text\r
-                            Accessible.onPressAction: exitButton.clicked()\r
-\r
-                            background: Rectangle {\r
-                                radius: Style.halfTrayWindowRadius\r
-                                color: palette.highlight\r
-                                visible: exitButton.hovered\r
-                            }\r
+                            Accessible.onPressAction: exitButton.clicked() \r
                         }\r
                     }\r
 \r

diff --git a/src/gui/tray/TrayFolderListItem.qml b/src/gui/tray/TrayFolderListItem.qml
index 13cc5fa0ec05f68d9c5be514749a918dd839d7d0..720a311aa3a8683b3ffce8da6f1861708ac752ce 100644 (file)
--- 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 020f6398acffecffafa858fac76ca7adc50bfb42..a2197c7c84a1327f8c3f1352505e77f2e81be467 100644 (file)
--- 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 e6f5ef800c218b60a181063d50632b75bdc58cc3..5527ddf7f23d63d6e84d92532e5dcafb8121119c 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -34,15 +34,6 @@ AbstractButton {
 \r
     height: Style.trayWindowHeaderHeight\r
 \r
-    background: Rectangle {\r
-        anchors.fill: parent\r
-        anchors.margins: 1\r
-        color: (userLine.hovered || userLine.visualFocus) &&\r
-               !(userMoreButton.hovered || userMoreButton.visualFocus) ?\r
-                   palette.highlight : palette.window\r
-        radius: Style.halfTrayWindowRadius\r
-    }\r
-\r
     contentItem: RowLayout {\r
         id: userLineLayout\r
         spacing: Style.userStatusSpacing\r
@@ -158,12 +149,6 @@ AbstractButton {
                 id: userMoreButtonMenu\r
                 closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape\r
 \r
-                background: Rectangle {\r
-                    border.color: palette.dark\r
-                    radius: Style.halfTrayWindowRadius\r
-                    color: palette.window\r
-                }\r
-\r
                 MenuItem {\r
                     visible: model.isConnected && model.serverHasUserStatus\r
                     height: visible ? implicitHeight : 0\r
@@ -171,12 +156,7 @@ AbstractButton {
                     font.pixelSize: Style.topLinePixelSize\r
                     hoverEnabled: true\r
                     onClicked: showUserStatusSelector(index)\r
-\r
-                    background: Rectangle {\r
-                        radius: Style.halfTrayWindowRadius\r
-                        color: parent.hovered ? palette.highlight : palette.window\r
-                    }\r
-                }\r
+               }\r
 \r
                 MenuItem {\r
                     text: model.isConnected ? qsTr("Log out") : qsTr("Log in")\r
@@ -198,12 +178,7 @@ AbstractButton {
                         }\r
                         accountMenu.close()\r
                     }\r
-\r
-                    background: Rectangle {\r
-                        radius: Style.halfTrayWindowRadius\r
-                        color: parent.hovered ? palette.highlight : palette.window\r
-                    }\r
-                }\r
+               }\r
 \r
                 MenuItem {\r
                     id: removeAccountButton\r
@@ -218,12 +193,7 @@ AbstractButton {
                     Accessible.role: Accessible.Button\r
                     Accessible.name: text\r
                     Accessible.onPressAction: removeAccountButton.clicked()\r
-\r
-                    background: Rectangle {\r
-                        radius: Style.halfTrayWindowRadius\r
-                        color: parent.hovered ? palette.highlight : palette.window\r
-                    }\r
-                }\r
+               }\r
             }\r
         }\r
     }\r