From d7802f3c4b594af54817808bf02bb0bacc106868 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Wed, 2 Jul 2025 17:09:49 +1000
Subject: internal: use layer.effect

Also use clipping rect for wallpaper item
---
 modules/drawers/Border.qml  | 25 +++++++++++--------------
 modules/drawers/Drawers.qml | 17 ++++++-----------
 2 files changed, 17 insertions(+), 25 deletions(-)

(limited to 'modules/drawers')

diff --git a/modules/drawers/Border.qml b/modules/drawers/Border.qml
index 3dada1f..bcb6cd6 100644
--- a/modules/drawers/Border.qml
+++ b/modules/drawers/Border.qml
@@ -1,7 +1,8 @@
+pragma ComponentBehavior: Bound
+
 import "root:/widgets"
 import "root:/services"
 import "root:/config"
-import Quickshell
 import QtQuick
 import QtQuick.Effects
 
@@ -13,11 +14,17 @@ Item {
     anchors.fill: parent
 
     StyledRect {
-        id: rect
-
         anchors.fill: parent
         color: Colours.alpha(Colours.palette.m3surface, false)
-        visible: false
+
+        layer.enabled: true
+        layer.effect: MultiEffect {
+            maskSource: mask
+            maskEnabled: true
+            maskInverted: true
+            maskThresholdMin: 0.5
+            maskSpreadAtMin: 1
+        }
     }
 
     Item {
@@ -34,14 +41,4 @@ Item {
             radius: Config.border.rounding
         }
     }
-
-    MultiEffect {
-        anchors.fill: parent
-        maskEnabled: true
-        maskInverted: true
-        maskSource: mask
-        source: rect
-        maskThresholdMin: 0.5
-        maskSpreadAtMin: 1
-    }
 }
diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml
index 5cab75b..10cd86b 100644
--- a/modules/drawers/Drawers.qml
+++ b/modules/drawers/Drawers.qml
@@ -86,10 +86,13 @@ Variants {
             }
 
             Item {
-                id: background
-
                 anchors.fill: parent
-                visible: false
+                layer.enabled: true
+                layer.effect: MultiEffect {
+                    shadowEnabled: true
+                    blurMax: 15
+                    shadowColor: Qt.alpha(Colours.palette.m3shadow, 0.7)
+                }
 
                 Border {
                     bar: bar
@@ -101,14 +104,6 @@ Variants {
                 }
             }
 
-            MultiEffect {
-                anchors.fill: source
-                source: background
-                shadowEnabled: true
-                blurMax: 15
-                shadowColor: Qt.alpha(Colours.palette.m3shadow, 0.7)
-            }
-
             PersistentProperties {
                 id: visibilities
 
-- 
cgit v1.2.3-freya