user-friendly wallpaper; some fixes

.config/ags/widgets/bar/music.js

@@ -6,7 +6,7 @@ import { AnimatedCircProg } from "../../lib/animatedcircularprogress.js";
 import { showMusicControls } from '../../variables.js';
 
 function trimTrackTitle(title) {
-    cleanRegexes = [
+    const cleanRegexes = [
         /【[^】]*】/,         // Touhou n weeb stuff
         /\[FREE DOWNLOAD\]/, // F-777
     ];

.config/ags/widgets/desktopbackground/main.js

@@ -1,23 +1,24 @@
 import Widget from 'resource:///com/github/Aylur/ags/widget.js';
 
+import WallpaperImage from './wallpaper.js';
 import TimeAndLaunchesWidget from './timeandlaunches.js'
 import SystemWidget from './system.js'
 
-export default () => Widget.Window({
+export default (monitor) => Widget.Window({
     name: 'desktopbackground',
-    anchor: ['top', 'bottom', 'left', 'right'],
-    layer: 'bottom',
-    exclusivity: 'normal',
+    // anchor: ['top', 'bottom', 'left', 'right'],
+    layer: 'background',
+    exclusivity: 'ignore',
     visible: true,
+    // child: Wallpaper(monitor),
     child: Widget.Overlay({
-        child: Widget.Box({
-            hexpand: true,
-            vexpand: true,
-        }),
+        child: WallpaperImage(monitor),
         overlays: [
             TimeAndLaunchesWidget(),
             SystemWidget(),
         ],
-        setup: (self) => self.set_overlay_pass_through(self.get_children()[1], true),
+        setup: (self) => {
+            self.set_overlay_pass_through(self.get_children()[1], true);
+        },
     }),
 });

.config/ags/widgets/desktopbackground/wallpaper.js

@@ -0,0 +1,87 @@
+const { Gdk, GdkPixbuf, Gio, GLib, Gtk } = imports.gi;
+import Widget from 'resource:///com/github/Aylur/ags/widget.js';
+import * as Utils from 'resource:///com/github/Aylur/ags/utils.js';
+import { SCREEN_HEIGHT, SCREEN_WIDTH } from '../../imports.js';
+const { exec, execAsync } = Utils;
+const { Box, Button, Label, Stack } = Widget;
+
+import Wallpaper from '../../services/wallpaper.js';
+import { setupCursorHover } from '../../lib/cursorhover.js';
+
+const SWITCHWALL_SCRIPT_PATH = `${App.configDir}/scripts/color_generation/switchwall.sh`;
+const WALLPAPER_ZOOM_SCALE = 1.1; // For scrolling when we switch workspace
+
+export default (monitor = 0) => {
+    let pixbuf = undefined;
+    const wallpaperImage = Widget.DrawingArea({
+        css: `transition: 1000ms cubic-bezier(0.1, 1, 0, 1);`,
+        setup: (self) => {
+            self.set_size_request(SCREEN_WIDTH, SCREEN_HEIGHT);
+            self.on('draw', (widget, cr) => {
+                if (!pixbuf) return;
+                Gdk.cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
+                cr.paint();
+            });
+            self.hook(Wallpaper, (self) => {
+                const wallPath = Wallpaper.get(monitor);
+                if (!wallPath || wallPath === "") return;
+                pixbuf = GdkPixbuf.Pixbuf.new_from_file(wallPath);
+                
+                const scale_x = SCREEN_WIDTH * WALLPAPER_ZOOM_SCALE / pixbuf.get_width();
+                const scale_y = SCREEN_HEIGHT * WALLPAPER_ZOOM_SCALE / pixbuf.get_height();
+                const scale_factor = Math.max(scale_x, scale_y);
+
+                pixbuf = pixbuf.scale_simple(
+                    Math.round(pixbuf.get_width() * scale_factor),
+                    Math.round(pixbuf.get_height() * scale_factor),
+                    GdkPixbuf.InterpType.BILINEAR
+                );
+
+                // pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(wallPath, SCREEN_WIDTH, SCREEN_HEIGHT);
+                // console.log(pixbuf.get_width(), pixbuf.get_height())
+
+                // pixbuf = GdkPixbuf.Pixbuf.new_from_file(wallPath);
+                // console.log(pixbuf.get_width(), pixbuf.get_height())
+                
+                self.queue_draw();
+            }, 'updated');
+        }
+        ,
+    });
+    const wallpaperPrompt = Box({
+        hpack: 'center',
+        vpack: 'center',
+        vertical: true,
+        className: 'spacing-v-10',
+        children: [
+            Label({
+                hpack: 'center',
+                className: 'txt-large',
+                label: `No wallpaper loaded`,
+            }),
+            Button({
+                hpack: 'center',
+                className: 'btn-primary',
+                label: `Select one`,
+                setup: setupCursorHover,
+                onClicked: (self) => Utils.execAsync([SWITCHWALL_SCRIPT_PATH]),
+            }),
+        ]
+    });
+    const stack = Stack({
+        transition: 'crossfade',
+        transitionDuration: 180,
+        items: [
+            ['image', wallpaperImage],
+            ['prompt', wallpaperPrompt],
+        ],
+        setup: (self) => self
+            .hook(Wallpaper, (self) => {
+                const wallPath = Wallpaper.get(monitor);
+                self.shown = ((wallPath && wallPath != "") ? 'image' : 'prompt');
+            }, 'updated')
+        ,
+    })
+    return stack;
+    // return wallpaperImage;
+}

.config/ags/widgets/indicators/main.js

@@ -1,7 +1,7 @@
 import Widget from 'resource:///com/github/Aylur/ags/widget.js';
 import Indicator from '../../services/indicator.js';
 import IndicatorValues from './indicatorvalues.js';
-import MusicControls from './musiccontrols.js';
+// import MusicControls from './musiccontrols.js';
 import ColorScheme from './colorscheme.js';
 import NotificationPopups from './notificationpopups.js';
 
@@ -23,7 +23,7 @@ export default (monitor = 0) => Widget.Window({
             css: 'min-height: 2px;',
             children: [
                 IndicatorValues(),
-                MusicControls(),
+                // MusicControls(),
                 NotificationPopups(),
                 ColorScheme(),
             ]

.config/ags/widgets/indicators/musiccontrols.js

@@ -69,7 +69,7 @@ function getTrackfont(player) {
     return DEFAULT_MUSIC_FONT;
 }
 function trimTrackTitle(title) {
-    cleanRegexes = [
+    const cleanRegexes = [
         /【[^】]*】/,         // Touhou n weeb stuff
         /\[FREE DOWNLOAD\]/, // F-777
     ];

.config/ags/widgets/sideleft/toolbox.js

@@ -10,7 +10,7 @@ export default Scrollable({
     child: Box({
         vertical: true,
         children: [
-            QuickScripts(),
+            // QuickScripts(),
         ]
     })
 });