avoid transparent background in user menu from main dialog

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/gui/tray/CallNotificationDialog.qml b/src/gui/tray/CallNotificationDialog.qml
index 46b2d225f310d832ba90d7dc9cc7a6c3a7d12f61..0bd53c8ba1430d73e3733f6452823492807d2b9a 100644 (file)
--- a/src/gui/tray/CallNotificationDialog.qml
+++ b/src/gui/tray/CallNotificationDialog.qml
@@ -24,7 +24,7 @@ import Qt5Compat.GraphicalEffects
 
 ApplicationWindow {
     id: root
-    color: palette.base
+    color: palette.window
     flags: Qt.Dialog | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint
 
     readonly property int windowSpacing: 10

diff --git a/src/gui/tray/EditFileLocallyLoadingDialog.qml b/src/gui/tray/EditFileLocallyLoadingDialog.qml
index c6d9af6a1754dd3efd91d823f528a389f0c4fb4b..42c41322394f935de7781232f43cf90c967ba17c 100644 (file)
--- a/src/gui/tray/EditFileLocallyLoadingDialog.qml
+++ b/src/gui/tray/EditFileLocallyLoadingDialog.qml
@@ -9,7 +9,7 @@ ApplicationWindow {
     id: root
     flags: Qt.Dialog | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint
 
-    color: palette.base
+    color: palette.window
 
     width: 320
     height: contentLayout.implicitHeight

diff --git a/src/gui/tray/TrayFolderListItem.qml b/src/gui/tray/TrayFolderListItem.qml
index 8031d7fcba46ffc17034829e25312e5c4d90ffcf..b329645bcb6d4ddfa0065b278377a245a27594cc 100644 (file)
--- a/src/gui/tray/TrayFolderListItem.qml
+++ b/src/gui/tray/TrayFolderListItem.qml
@@ -36,7 +36,7 @@ MenuItem {
         Rectangle {
             anchors.fill: parent
             anchors.margins: Style.normalBorderWidth
-            color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base
+            color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
         }
     }
 

diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMenuButton.qml
index b4d466bda5919f33cc85664219f8565e760759ec..82e51a6b000c526409ecd5133ae9968c20746c08 100644 (file)
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml
@@ -100,7 +100,7 @@ HeaderButton {
                     width: Style.folderStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset
                     height: width
                     anchors.centerIn: parent
-                    color: root.hovered ? Style.currentUserHeaderTextColor : palette.base
+                    color: root.hovered ? Style.currentUserHeaderTextColor : palette.window
                     opacity: Style.trayFolderStatusIndicatorMouseHoverOpacityFactor
                     radius: width * Style.trayFolderStatusIndicatorRadiusFactor
                     z: -1

diff --git a/src/gui/tray/UnifiedSearchResultListItem.qml b/src/gui/tray/UnifiedSearchResultListItem.qml
index acfee2da5c3b667c55604dfa967acfcc91dc583d..27e95962109b7368683de9287c2c123dca20e3d6 100644 (file)
--- a/src/gui/tray/UnifiedSearchResultListItem.qml
+++ b/src/gui/tray/UnifiedSearchResultListItem.qml
@@ -46,7 +46,7 @@ MouseArea {
     Rectangle {
         id: unifiedSearchResultHoverBackground
         anchors.fill: parent
-        color: parent.containsMouse ? palette.highlight : palette.base
+        color: parent.containsMouse ? palette.highlight : palette.window
     }
 
     Loader {

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index 28ec40c99801a240dd75b7aabb99f57cc526ecab..2f9b8069fd586685770bef59b609c9d4b4da15fb 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -39,7 +39,7 @@ AbstractButton {
         anchors.margins: 1\r
         color: (userLine.hovered || userLine.visualFocus) &&\r
                !(userMoreButton.hovered || userMoreButton.visualFocus) ?\r
-                   palette.highlight : palette.base\r
+                   palette.highlight : palette.window\r
     }\r
 \r
     contentItem: RowLayout {\r
@@ -149,7 +149,7 @@ AbstractButton {
             background: Rectangle {\r
                 anchors.fill: parent\r
                 anchors.margins: 1\r
-                color: userMoreButton.hovered || userMoreButton.visualFocus ? palette.highlight : palette.base\r
+                color: userMoreButton.hovered || userMoreButton.visualFocus ? palette.highlight : palette.window\r
             }\r
 \r
             contentItem: Image {\r
@@ -188,7 +188,7 @@ AbstractButton {
                         Rectangle {\r
                             anchors.fill: parent\r
                             anchors.margins: 1\r
-                            color: parent.parent.hovered ? palette.highlight : palette.base\r
+                            color: parent.parent.hovered ? palette.highlight : palette.window\r
                         }\r
                     }\r
 \r
@@ -222,7 +222,7 @@ AbstractButton {
                         Rectangle {\r
                             anchors.fill: parent\r
                             anchors.margins: 1\r
-                            color: parent.parent.hovered ? palette.highlight : palette.base\r
+                            color: parent.parent.hovered ? palette.highlight : palette.window\r
                         }\r
                     }\r
 \r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 5e5b1270262dd5de410dfc7097b54461f1ffb5cf..f7d071e9a6328e77f6e5956a3516d8abbda3cd84 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -308,7 +308,7 @@ ApplicationWindow {
 \r
                         background: Rectangle {\r
                             border.color: palette.dark\r
-                            color: palette.base\r
+                            color: palette.window\r
                             radius: Style.currentAccountButtonRadius\r
                         }\r
 \r
@@ -345,7 +345,7 @@ ApplicationWindow {
                                 Rectangle {\r
                                     anchors.fill: parent\r
                                     anchors.margins: 1\r
-                                    color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base\r
+                                    color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window\r
                                 }\r
                             }\r
 \r
@@ -397,7 +397,7 @@ ApplicationWindow {
                                 Rectangle {\r
                                     anchors.fill: parent\r
                                     anchors.margins: 1\r
-                                    color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base\r
+                                    color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window\r
                                 }\r
                             }\r
 \r
@@ -419,7 +419,7 @@ ApplicationWindow {
                                 Rectangle {\r
                                     anchors.fill: parent\r
                                     anchors.margins: 1\r
-                                    color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base\r
+                                    color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window\r
                                 }\r
                             }\r
 \r
@@ -441,7 +441,7 @@ ApplicationWindow {
                                 Rectangle {\r
                                     anchors.fill: parent\r
                                     anchors.margins: 1\r
-                                    color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base\r
+                                    color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window\r
                                 }\r
                             }\r
 \r
@@ -452,7 +452,7 @@ ApplicationWindow {
                     }\r
 \r
                     background: Rectangle {\r
-                        color: parent.hovered || parent.visualFocus ? Style.currentUserHeaderTextColor : palette.base\r
+                        color: parent.hovered || parent.visualFocus ? Style.currentUserHeaderTextColor : palette.window\r
                         opacity: 0.2\r
                     }\r
 \r
@@ -496,7 +496,7 @@ ApplicationWindow {
                                 height: width\r
                                 anchors.bottom: currentAccountAvatar.bottom\r
                                 anchors.right: currentAccountAvatar.right\r
-                                color: currentAccountButton.hovered ? Style.currentUserHeaderTextColor : palette.base\r
+                                color: currentAccountButton.hovered ? Style.currentUserHeaderTextColor : palette.window\r
                                 opacity: Style.trayFolderStatusIndicatorMouseHoverOpacityFactor\r
                                 radius: width * Style.trayFolderStatusIndicatorRadiusFactor\r
                             }\r
@@ -663,7 +663,7 @@ ApplicationWindow {
 \r
                         background: Rectangle {\r
                             border.color: palette.dark\r
-                            color: palette.base\r
+                            color: palette.window\r
                             radius: 2\r
                         }\r
 \r
@@ -699,7 +699,7 @@ ApplicationWindow {
                                         Rectangle {\r
                                             anchors.fill: parent\r
                                             anchors.margins: 1\r
-                                            color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base\r
+                                            color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window\r
                                         }\r
                                     }\r
 \r