Merge pull request #7618 from nextcloud/backport/7566/stable-3.15

[stable-3.15] gui/tray: Fix tray window corners
nextcloud · Dec 9, 2024 · dbd035f · dbd035f
2 parents d9c2a92 + bd203fe
commit dbd035f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml
@@ -36,6 +36,7 @@ ApplicationWindow {
     width:      Systray.useNormalWindow ? Style.trayWindowHeight : Style.trayWindowWidth
     height:     Style.trayWindowHeight
     flags:      Systray.useNormalWindow ? Qt.Window : Qt.Dialog | Qt.FramelessWindowHint
+    color: "transparent"
 
     readonly property int maxMenuHeight: Style.trayWindowHeight - Style.trayWindowHeaderHeight - 2 * Style.trayWindowBorderWidth
 
@@ -63,7 +64,7 @@ ApplicationWindow {
         radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
         border.width: Style.trayWindowBorderWidth
         border.color: palette.dark
-        color: palette.base
+        color: palette.window
     }
 
     Connections {
@@ -221,7 +222,7 @@ ApplicationWindow {
         }
     }
 
-    Item {
+    Rectangle {
         id: trayWindowMainItem
 
         property bool isUnifiedSearchActive: unifiedSearchResultsListViewSkeletonLoader.active
@@ -234,6 +235,9 @@ ApplicationWindow {
         anchors.margins: Style.trayWindowBorderWidth
         clip: true
 
+        radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
+        color: palette.base
+
         Accessible.role: Accessible.Grouping
         Accessible.name: qsTr("Nextcloud desktop main dialog")