Wip!

Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml

@@ -23,10 +23,9 @@ ColumnLayout {
     Layout.fillWidth: true
     Layout.preferredHeight: 140 * scaling
     radius: Style.radiusM * scaling
-    color: Color.mPrimary
+    color: Color.mSecondary
 
     NImageRounded {
-      id: currentWallpaperImage
       anchors.fill: parent
       anchors.margins: Style.marginXS * scaling
       imagePath: WallpaperService.getWallpaper(screen.name)
@@ -113,7 +112,7 @@ ColumnLayout {
         id: wallpaperItem
 
         property string wallpaperPath: modelData
-        property bool isSelected: wallpaperPath === WallpaperService.currentWallpaper
+        property bool isSelected: wallpaperPath === WallpaperService.getWallpaper(screen.name)
 
         width: wallpaperGridView.itemSize
         height: Math.floor(wallpaperGridView.itemSize * 0.67)

Modules/SettingsPanel/Tabs/WallpaperTab.qml

@@ -146,16 +146,7 @@ ColumnLayout {
         spacing: Style.marginS * scaling
 
         // Factorized presets data
-        property var intervalPresets: [
-          5 * 60,
-          10 * 60,
-          15 * 60,
-          30 * 60,
-          45 * 60,
-          60 * 60,
-          90 * 60,
-          120 * 60,
-        ]
+        property var intervalPresets: [5 * 60, 10 * 60, 15 * 60, 30 * 60, 45 * 60, 60 * 60, 90 * 60, 120 * 60]
 
         // Whether current interval equals one of the presets
         property bool isCurrentPreset: {
@@ -237,7 +228,7 @@ ColumnLayout {
     property int seconds: 0
     property string label: ""
     property bool selected: false
-    signal clicked()
+    signal clicked
 
     radius: height * 0.5
     color: selected ? Color.mPrimary : Color.mSurfaceVariant
@@ -266,4 +257,4 @@ ColumnLayout {
     Layout.topMargin: Style.marginXL * scaling
     Layout.bottomMargin: Style.marginXL * scaling
   }
-}
+}