remove more things, make lock screen use wallpaper not screenshot

4 files changed, 8 insertions, 24 deletions

diff --git a/modules/background/Background.qml b/modules/background/Background.qml
index 44d3491..1796a15 100644
--- a/modules/background/Background.qml
+++ b/modules/background/Background.qml
@@ -4,6 +4,7 @@ import qs.components
 import qs.components.containers
 import qs.services
 import qs.config
+import qs.utils
 import Quickshell
 import Quickshell.Wayland
 import QtQuick
@@ -31,10 +32,11 @@ Loader {
             anchors.left: true
             anchors.right: true
 
-            Item {
-                id: behindClock
+            Image {
+                id: wallpaper
 
                 anchors.fill: parent
+                asynchronous: true
 
                 Loader {
                     id: wallpaper
diff --git a/modules/controlcenter/state/LauncherState.qml b/modules/controlcenter/state/LauncherState.qml
deleted file mode 100644
index 58f5fc8..0000000
--- a/modules/controlcenter/state/LauncherState.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick
-
-QtObject {
-    id: root
-
-    property var active: null
-}
diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml
index 279c551..c706067 100644
--- a/modules/lock/LockSurface.qml
+++ b/modules/lock/LockSurface.qml
@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import qs.components
 import qs.services
 import qs.config
+import qs.utils
 import Quickshell.Wayland
 import QtQuick
 import QtQuick.Effects
@@ -159,12 +160,12 @@ WlSessionLockSurface {
         }
     }
 
-    ScreencopyView {
+    Image {
         id: background
 
         anchors.fill: parent
-        captureSource: root.screen
-        opacity: 0
+        source: Paths.wallpaper ?? ""
+        opacity: 1
 
         layer.enabled: true
         layer.effect: MultiEffect {
diff --git a/utils/Images.qml b/utils/Images.qml
deleted file mode 100644
index ac76f51..0000000
--- a/utils/Images.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-pragma Singleton
-
-import Quickshell
-
-Singleton {
-    readonly property list<string> validImageTypes: ["jpeg", "png", "webp", "tiff", "svg"]
-    readonly property list<string> validImageExtensions: ["jpg", "jpeg", "png", "webp", "tif", "tiff", "svg"]
-
-    function isValidImageByName(name: string): bool {
-        return validImageExtensions.some(t => name.endsWith(`.${t}`));
-    }
-}