internal: use layer.effect

Also use clipping rect for wallpaper item

1 files changed, 18 insertions, 25 deletions

diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml
index 83fb89f..0ad4c3a 100644
--- a/modules/lock/LockSurface.qml
+++ b/modules/lock/LockSurface.qml
@@ -40,30 +40,25 @@ WlSessionLockSurface {
     }
 
     ScreencopyView {
-        id: screencopy
-
-        anchors.fill: parent
-        captureSource: root.screen
-        visible: false
-    }
-
-    MultiEffect {
         id: background
 
         anchors.fill: parent
+        captureSource: root.screen
 
-        source: screencopy
-        autoPaddingEnabled: false
-        blurEnabled: true
-        blur: root.locked ? 1 : 0
-        blurMax: 64
-        blurMultiplier: 1
+        layer.enabled: true
+        layer.effect: MultiEffect {
+            autoPaddingEnabled: false
+            blurEnabled: true
+            blur: root.locked ? 1 : 0
+            blurMax: 64
+            blurMultiplier: 1
 
-        Behavior on opacity {
-            Anim {}
+            Behavior on blur {
+                Anim {}
+            }
         }
 
-        Behavior on blur {
+        Behavior on opacity {
             Anim {}
         }
     }
@@ -79,15 +74,13 @@ WlSessionLockSurface {
         statusHeight: status.item?.nonAnimHeight ?? 0
         isNormal: root.screen.width > Config.lock.sizes.smallScreenWidth
         isLarge: root.screen.width > Config.lock.sizes.largeScreenWidth
-        visible: false
-    }
 
-    MultiEffect {
-        anchors.fill: source
-        source: backgrounds
-        shadowEnabled: true
-        blurMax: 15
-        shadowColor: Qt.alpha(Colours.palette.m3shadow, 0.7)
+        layer.enabled: true
+        layer.effect: MultiEffect {
+            shadowEnabled: true
+            blurMax: 15
+            shadowColor: Qt.alpha(Colours.palette.m3shadow, 0.7)
+        }
     }
 
     Clock {