feat: add wallpaperEnabled option (#1187)

* fix: change background color to none allowing other wallpaper engine and background enabled

* feat: add wallpaperEnabled property and toggle in appearance settings

* fix background: Make it "black" if wallpaper is enabled, otherwise "transparent"

* fix: separate Visualiser from Wallpaper (hope I didn't made more shit buh)

* fix: transparency not working & layer position

* fix

---------

Co-authored-by: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>

5 files changed, 22 insertions, 6 deletions

diff --git a/modules/background/Background.qml b/modules/background/Background.qml
index f8484e1..682da62 100644
--- a/modules/background/Background.qml
+++ b/modules/background/Background.qml
@@ -22,8 +22,9 @@ Loader {
             screen: modelData
             name: "background"
             WlrLayershell.exclusionMode: ExclusionMode.Ignore
-            WlrLayershell.layer: WlrLayer.Background
-            color: "black"
+            WlrLayershell.layer: Config.background.wallpaperEnabled ? WlrLayer.Background : WlrLayer.Bottom
+            color: Config.background.wallpaperEnabled ? "black" : "transparent"
+            surfaceFormat.opaque: false
 
             anchors.top: true
             anchors.bottom: true
@@ -35,8 +36,13 @@ Loader {
 
                 anchors.fill: parent
 
-                Wallpaper {
+                Loader {
                     id: wallpaper
+
+                    anchors.fill: parent
+                    active: Config.background.wallpaperEnabled
+
+                    sourceComponent: Wallpaper {}
                 }
 
                 Visualiser {
diff --git a/modules/background/Visualiser.qml b/modules/background/Visualiser.qml
index c9bb9ef..35a086b 100644
--- a/modules/background/Visualiser.qml
+++ b/modules/background/Visualiser.qml
@@ -13,7 +13,7 @@ Item {
     id: root
 
     required property ShellScreen screen
-    required property Wallpaper wallpaper
+    required property Item wallpaper
 
     readonly property bool shouldBeActive: Config.background.visualiser.enabled && (!Config.background.visualiser.autoHide || (Hypr.monitorFor(screen)?.activeWorkspace?.toplevels?.values.every(t => t.lastIpcObject?.floating) ?? true))
     property real offset: shouldBeActive ? 0 : screen.height * 0.2
diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml
index b5d7d4a..39a48fc 100644
--- a/modules/background/Wallpaper.qml
+++ b/modules/background/Wallpaper.qml
@@ -14,8 +14,6 @@ Item {
     property string source: Wallpapers.current
     property Image current: one
 
-    anchors.fill: parent
-
     onSourceChanged: {
         if (!source)
             current = null;
diff --git a/modules/controlcenter/appearance/AppearancePane.qml b/modules/controlcenter/appearance/AppearancePane.qml
index 4251167..f29f7ab 100644
--- a/modules/controlcenter/appearance/AppearancePane.qml
+++ b/modules/controlcenter/appearance/AppearancePane.qml
@@ -48,6 +48,7 @@ Item {
     property bool desktopClockBackgroundBlur: Config.background.desktopClock.background.blur ?? false
     property bool desktopClockInvertColors: Config.background.desktopClock.invertColors ?? false
     property bool backgroundEnabled: Config.background.enabled ?? true
+    property bool wallpaperEnabled: Config.background.wallpaperEnabled ?? true
     property bool visualiserEnabled: Config.background.visualiser.enabled ?? false
     property bool visualiserAutoHide: Config.background.visualiser.autoHide ?? true
     property real visualiserRounding: Config.background.visualiser.rounding ?? 1
@@ -83,6 +84,8 @@ Item {
         Config.background.desktopClock.background.blur = root.desktopClockBackgroundBlur;
         Config.background.desktopClock.invertColors = root.desktopClockInvertColors;
 
+        Config.background.wallpaperEnabled = root.wallpaperEnabled;
+
         Config.background.visualiser.enabled = root.visualiserEnabled;
         Config.background.visualiser.autoHide = root.visualiserAutoHide;
         Config.background.visualiser.rounding = root.visualiserRounding;
diff --git a/modules/controlcenter/appearance/sections/BackgroundSection.qml b/modules/controlcenter/appearance/sections/BackgroundSection.qml
index 2f75c9e..9d6bc6e 100644
--- a/modules/controlcenter/appearance/sections/BackgroundSection.qml
+++ b/modules/controlcenter/appearance/sections/BackgroundSection.qml
@@ -27,6 +27,15 @@ CollapsibleSection {
         }
     }
 
+    SwitchRow {
+        label: qsTr("Wallpaper enabled")
+        checked: rootPane.wallpaperEnabled
+        onToggled: checked => {
+            rootPane.wallpaperEnabled = checked;
+            rootPane.saveConfig();
+        }
+    }
+
     StyledText {
         Layout.topMargin: Appearance.spacing.normal
         text: qsTr("Desktop Clock")