From c5de64bfe4ee44909bdba93b8d2a288d0f19d8b8 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 26 Nov 2024 11:38:28 +0800 Subject: [PATCH 1/3] Re-add transparent tray window colour Signed-off-by: Claudio Cambra --- src/gui/tray/MainWindow.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml index c127d6db03..5c8cfe2d0e 100644 --- a/src/gui/tray/MainWindow.qml +++ b/src/gui/tray/MainWindow.qml @@ -39,6 +39,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 From b3bdfd49f123b7f8b38818435fa99dd1506afeb2 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 26 Nov 2024 11:38:56 +0800 Subject: [PATCH 2/3] Make tray window item a rectangle with base palette colour Signed-off-by: Claudio Cambra --- src/gui/tray/MainWindow.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml index 5c8cfe2d0e..7eed848c89 100644 --- a/src/gui/tray/MainWindow.qml +++ b/src/gui/tray/MainWindow.qml @@ -225,7 +225,7 @@ ApplicationWindow { } } - Item { + Rectangle { id: trayWindowMainItem property bool isUnifiedSearchActive: unifiedSearchResultsListViewSkeletonLoader.active @@ -238,6 +238,8 @@ 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") From 79b8c85a4322b5b115ed0b2527df740a4ffbcb6f Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Tue, 26 Nov 2024 11:39:09 +0800 Subject: [PATCH 3/3] Change window background colour to palette window color Signed-off-by: Claudio Cambra --- src/gui/tray/MainWindow.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/tray/MainWindow.qml b/src/gui/tray/MainWindow.qml index 7eed848c89..482f65ea88 100644 --- a/src/gui/tray/MainWindow.qml +++ b/src/gui/tray/MainWindow.qml @@ -67,7 +67,7 @@ ApplicationWindow { radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius border.width: Style.trayWindowBorderWidth border.color: palette.dark - color: palette.base + color: palette.window } Connections { @@ -240,6 +240,7 @@ ApplicationWindow { radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius color: palette.base + Accessible.role: Accessible.Grouping Accessible.name: qsTr("Nextcloud desktop main dialog")