Merge pull request 'either fail ? then check fail else pass' (#112) from format-check-rust-fix into main

Reviewed-on: #112
Reviewed-by: zach <zach@brohn.se>

.gitea/workflows/lint-rust.yml

@@ -38,15 +38,18 @@ jobs:
                     rustfmt \
                     rust-clippy
 
-            - name: Format check
+            - id: format-check
+              name: Format check
               continue-on-error: true
               run: |
                   if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
+                    status=0
                     for manifest in $(find . -name "Cargo.toml"); do
                       cargo fmt --manifest-path "$manifest" --check && \
                         echo "$manifest: formatting OK" || \
-                        echo "$manifest: needs formatting"
+                        { echo "$manifest: needs formatting"; status=1; }
                     done
+                    exit $status
                   elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
                     echo "Rust files found but no Cargo.toml"
                     exit 1
@@ -54,7 +57,8 @@ jobs:
                     echo "No Rust project found"
                   fi
 
-            - name: Clippy
+            - id: clippy
+              name: Clippy
               run: |
                   if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
                     status=0
@@ -70,3 +74,12 @@ jobs:
                   else
                     echo "No Rust project found"
                   fi
+
+            - name: Check results
+              if: always()
+              run: |
+                  if [ "${{ steps.format-check.outcome }}" = "failure" ] || [ "${{ steps.clippy.outcome }}" = "failure" ]; then
+                    echo "One or more checks failed"
+                    exit 1
+                  fi
+                  echo "All checks passed"

.gitignore

@@ -13,3 +13,5 @@ uv.lock
 .qtcreator/
 dist/
 **/target/
+**/test-plugins/
+**/Charts/

Config/BarConfig.qml

@@ -59,6 +59,8 @@ JsonObject {
 	}
 	property int rounding: 8
 	property int smoothing: 32
+	property Tray tray: Tray {
+	}
 
 	component Popouts: JsonObject {
 		property bool activeWindow: true
@@ -69,4 +71,7 @@ JsonObject {
 		property bool tray: true
 		property bool upower: true
 	}
+	component Tray: JsonObject {
+		property int trayIconSize: 24
+	}
 }

Config/Config.qml

@@ -100,6 +100,9 @@ Singleton {
 			border: barConfig.border,
 			smoothing: barConfig.smoothing,
 			height: barConfig.height,
+			tray: {
+				trayIconSize: barConfig.tray.trayIconSize
+			},
 			popouts: {
 				tray: barConfig.popouts.tray,
 				audio: barConfig.popouts.audio,
@@ -214,6 +217,10 @@ Singleton {
 			},
 			idle: {
 				timeouts: general.idle.timeouts
+			},
+			battery: {
+				popupThresholds: general.battery.popupThresholds,
+				critPerc: general.battery.critPerc
 			}
 		};
 	}

Config/General.qml

@@ -4,6 +4,8 @@ import Quickshell
 JsonObject {
 	property Apps apps: Apps {
 	}
+	property Battery battery: Battery {
+	}
 	property Color color: Color {
 	}
 	property string dateFormat: "ddd d MMM - hh:mm:ss"
@@ -19,6 +21,17 @@ JsonObject {
 		property list<string> playback: ["mpv"]
 		property list<string> terminal: ["kitty"]
 	}
+	component Battery: JsonObject {
+		property int critPerc: 5
+		property list<var> popupThresholds: [
+			{
+				perc: 20,
+				name: qsTr("Low battery"),
+				message: qsTr("Battery is low"),
+				icon: "battery_android_frame_2"
+			},
+		]
+	}
 	component Color: JsonObject {
 		property int hyprsunsetTemp: 5000
 		property string mode: "dark"

Daemons/Battery.qml

@@ -0,0 +1,71 @@
+import Quickshell
+import Quickshell.Services.UPower
+import QtQuick
+import ZShell
+import qs.Config
+import qs.Components.Toast
+
+Scope {
+	id: root
+
+	readonly property real currentPerc: UPower.displayDevice.percentage
+	readonly property list<var> popupThresholds: [...Config.general.battery.popupThresholds].sort((a, b) => b.perc - a.perc)
+
+	function nearestThresholdAbove(p: real): var {
+		const thresholds = [...root.popupThresholds];
+		for (const perc of thresholds) {
+			console.log(perc.message);
+			if (p < perc.perc)
+				return perc;
+		}
+
+		return null;
+	}
+
+	Connections {
+		function onOnBatteryChanged(): void {
+			if (!UPower.displayDevice.ready)
+				return;
+
+			if (UPower.onBattery) {
+				if (Config.utilities.toasts.chargingChanged)
+					Toaster.toast(qsTr("Charger unplugged"), qsTr("Battery is discharging"), "power_off");
+				const p = root.currentPerc * 100;
+				const perc = root.nearestThresholdAbove(p);
+				if (perc)
+					Toaster.toast(perc.title ?? qsTr("Battery warning"), perc.message ?? qsTr("Battery is low"), perc.icon ?? "battery_android_alert", perc.critical ? Toast.Error : Toast.Warning);
+			} else {
+				if (Config.utilities.toasts.chargingChanged)
+					Toaster.toast(qsTr("Charger plugged in"), qsTr("Battery is charging"), "power");
+			}
+		}
+
+		target: UPower
+	}
+
+	Connections {
+		function onPercentageChanged(): void {
+			if (!UPower.onBattery)
+				return;
+
+			const p = root.currentPerc * 100;
+			for (const perc of root.popupThresholds) {
+				if (p == perc.perc) {
+					Toaster.toast(perc.title ?? qsTr("Battery warning"), perc.message ?? qsTr("Battery perc is low"), perc.icon ?? "battery_android_alert", perc.critical ? Toast.Error : Toast.Warning);
+				}
+			}
+		}
+
+		function onReadyChanged(): void {
+			if (!UPower.displayDevice.ready)
+				return;
+
+			const p = root.currentPerc * 100;
+			const perc = root.nearestThresholdAbove(p);
+			if (perc)
+				Toaster.toast(perc.title ?? qsTr("Battery warning"), perc.message ?? qsTr("Battery is low"), perc.icon ?? "battery_android_alert", perc.critical ? Toast.Error : Toast.Warning);
+		}
+
+		target: UPower.displayDevice
+	}
+}

Daemons/NotifServer.qml

@@ -179,6 +179,8 @@ Singleton {
 		property string appIcon
 		property string appName
 		property string body
+		property string cachedImageSource: ""
+		property bool cachingImage: false
 		property bool closed
 		readonly property Connections conn: Connections {
 			function onActionsChanged(): void {
@@ -214,9 +216,9 @@ Singleton {
 			}
 
 			function onImageChanged(): void {
-				notif.image = notif.notification.image;
-				if (notif.notification?.image)
-					notif.dummyImageLoader.active = true;
+				notif.imageSource = notif.notification.image || "";
+				notif.image = notif.imageSource;
+				notif.cacheImageIfNeeded();
 			}
 
 			function onResidentChanged(): void {
@@ -233,60 +235,12 @@ Singleton {
 
 			target: notif.notification
 		}
-		readonly property LazyLoader dummyImageLoader: LazyLoader {
-			active: false
-
-			PanelWindow {
-				color: "transparent"
-				implicitHeight: Config.notifs.sizes.image
-				implicitWidth: Config.notifs.sizes.image
-
-				mask: Region {
-				}
-
-				Image {
-					function tryCache(): void {
-						if (status !== Image.Ready || width != Config.notifs.sizes.image || height != Config.notifs.sizes.image)
-							return;
-
-						const cacheKey = notif.appName + notif.summary + notif.id;
-						let h1 = 0xdeadbeef, h2 = 0x41c6ce57, ch;
-						for (let i = 0; i < cacheKey.length; i++) {
-							ch = cacheKey.charCodeAt(i);
-							h1 = Math.imul(h1 ^ ch, 2654435761);
-							h2 = Math.imul(h2 ^ ch, 1597334677);
-						}
-						h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507);
-						h1 ^= Math.imul(h2 ^ (h2 >>> 13), 3266489909);
-						h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507);
-						h2 ^= Math.imul(h1 ^ (h1 >>> 13), 3266489909);
-						const hash = (h2 >>> 0).toString(16).padStart(8, 0) + (h1 >>> 0).toString(16).padStart(8, 0);
-
-						const cache = `${Paths.notifimagecache}/${hash}.png`;
-						ZShellIo.saveItem(this, Qt.resolvedUrl(cache), () => {
-							notif.image = cache;
-							notif.dummyImageLoader.active = false;
-						});
-					}
-
-					anchors.fill: parent
-					asynchronous: true
-					cache: false
-					fillMode: Image.PreserveAspectCrop
-					opacity: 0
-					source: Qt.resolvedUrl(notif.image)
-
-					onHeightChanged: tryCache()
-					onStatusChanged: tryCache()
-					onWidthChanged: tryCache()
-				}
-			}
-		}
 		property real expireTimeout: 5
 		property bool hasActionIcons
-		property string id
 		property string image
+		property string imageSource
 		property var locks: new Set()
+		property string notifId
 		property Notification notification
 		property bool popup
 		property bool resident
@@ -329,6 +283,26 @@ Singleton {
 		}
 		property int urgency: NotificationUrgency.Normal
 
+		function cacheImageIfNeeded(): void {
+			const source = imageSource;
+
+			if (!source || cachingImage)
+				return;
+
+			if (cachedImageSource === source)
+				return;
+
+			cachingImage = true;
+
+			ZShellIo.cacheImage(Qt.resolvedUrl(source), Paths.notifimagecache, (path, url) => {
+				cachedImageSource = source;
+				image = path;
+				cachingImage = false;
+			}, () => {
+				cachingImage = false;
+			});
+		}
+
 		function close(): void {
 			closed = true;
 			if (locks.size === 0 && root.list.includes(this)) {
@@ -352,14 +326,13 @@ Singleton {
 			if (!notification)
 				return;
 
-			id = notification.id;
+			notifId = notification.id;
 			summary = notification.summary;
 			body = notification.body;
 			appIcon = notification.appIcon;
 			appName = notification.appName;
-			image = notification.image;
-			if (notification?.image)
-				dummyImageLoader.active = true;
+			imageSource = notification.image || "";
+			image = imageSource;
 			expireTimeout = notification.expireTimeout;
 			urgency = notification.urgency;
 			resident = notification.resident;
@@ -369,6 +342,8 @@ Singleton {
 						text: a.text,
 						invoke: () => a.invoke()
 					}));
+
+			cacheImageIfNeeded();
 		}
 	}
 }

Drawers/Backgrounds.qml

@@ -1,107 +0,0 @@
-import Quickshell
-import QtQuick
-import QtQuick.Shapes
-import qs.Components
-import qs.Config
-import qs.Modules as Modules
-import qs.Modules.Notifications as Notifications
-import qs.Modules.Notifications.Sidebar as Sidebar
-import qs.Modules.Notifications.Sidebar.Utils as Utils
-import qs.Modules.Dashboard as Dashboard
-import qs.Modules.Osd as Osd
-import qs.Modules.Launcher as Launcher
-import qs.Modules.Resources as Resources
-import qs.Modules.Drawing as Drawing
-import qs.Modules.Settings as Settings
-import qs.Modules.Dock as Dock
-
-Shape {
-	id: root
-
-	required property Item bar
-	required property Panels panels
-	required property PersistentProperties visibilities
-
-	anchors.fill: parent
-	anchors.margins: Config.barConfig.border
-	anchors.topMargin: bar.implicitHeight
-	asynchronous: true
-	preferredRendererType: Shape.CurveRenderer
-
-	Drawing.Background {
-		startX: 0
-		startY: wrapper.y - rounding
-		wrapper: root.panels.drawing
-	}
-
-	Resources.Background {
-		startX: 0 - rounding
-		startY: 0
-		wrapper: root.panels.resources
-	}
-
-	Osd.Background {
-		startX: root.width - root.panels.sidebar.width
-		startY: (root.height - wrapper.height) / 2 - rounding
-		wrapper: root.panels.osd
-	}
-
-	Modules.Background {
-		invertBottomRounding: wrapper.x <= 0
-		rounding: root.panels.popouts.currentName.startsWith("updates") || root.panels.popouts.currentName.startsWith("audio") ? Appearance.rounding.normal : Appearance.rounding.smallest
-		startX: wrapper.x - rounding
-		startY: wrapper.y
-		wrapper: root.panels.popouts
-	}
-
-	Notifications.Background {
-		sidebar: sidebar
-		startX: root.width
-		startY: 0
-		wrapper: root.panels.notifications
-	}
-
-	Launcher.Background {
-		startX: (root.width - wrapper.width) / 2 - rounding
-		startY: root.height
-		wrapper: root.panels.launcher
-	}
-
-	Dashboard.Background {
-		startX: root.width - root.panels.dashboard.width - rounding
-		startY: 0
-		wrapper: root.panels.dashboard
-	}
-
-	Utils.Background {
-		sidebar: sidebar
-		startX: root.width
-		startY: root.height
-		wrapper: root.panels.utilities
-	}
-
-	Sidebar.Background {
-		id: sidebar
-
-		panels: root.panels
-		startX: root.width
-		startY: root.panels.notifications.height
-		wrapper: root.panels.sidebar
-	}
-
-	Settings.Background {
-		id: settings
-
-		startX: (root.width - wrapper.width) / 2 - rounding
-		startY: 0
-		wrapper: root.panels.settings
-	}
-
-	Dock.Background {
-		id: dock
-
-		startX: (root.width - wrapper.width) / 2 - rounding
-		startY: root.height
-		wrapper: root.panels.dock
-	}
-}

Drawers/Drawing.qml

@@ -23,6 +23,7 @@ Canvas {
 		ctx.save();
 		ctx.lineWidth = root.penWidth;
 		ctx.strokeStyle = root.penColor;
+		ctx.lineJoin = "round";
 		ctx.lineCap = "round";
 		ctx.beginPath();
 		ctx.moveTo(points[0].x, points[0].y);

Drawers/DrawingInput.qml

@@ -22,20 +22,20 @@ CustomMouseArea {
 	}
 
 	acceptedButtons: Qt.LeftButton | Qt.RightButton
-	anchors.fill: root.visibilities.isDrawing ? parent : undefined
+	enabled: z > 0
 	hoverEnabled: true
 	visible: root.visibilities.isDrawing
 
 	onPositionChanged: event => {
 		const x = event.x;
 		const y = event.y;
-
 		if (root.visibilities.isDrawing && (event.buttons & Qt.LeftButton)) {
 			root.drawing.points.push(Qt.point(x, y));
 			root.drawing.requestPaint();
+			return;
 		}
 
-		if (root.inLeftPanel(root.popout, x, y)) {
+		if (!(event.buttons & Qt.LeftButton) && root.inLeftPanel(root.popout, x, y)) {
 			root.z = -2;
 			root.panels.drawing.expanded = true;
 		}

Drawers/Interactions.qml

@@ -78,7 +78,7 @@ CustomMouseArea {
 		const dragY = y - dragStart.y;
 
 		if (root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, x, y)) {
-			// root.input.z = 2;
+			root.input.z = 2;
 			root.panels.drawing.expanded = false;
 		}
 
@@ -132,6 +132,8 @@ CustomMouseArea {
 				if (!inDashboardArea) {
 					root.dashboardShortcutActive = true;
 				}
+				if (root.panels.launcher.x + root.panels.launcher.width > root.panels.dashboardWrapper.x)
+					root.visibilities.launcher = false;
 
 				root.visibilities.settings = false;
 				root.visibilities.sidebar = false;
@@ -161,6 +163,11 @@ CustomMouseArea {
 			}
 
 			if (root.visibilities.launcher) {
+				if (root.panels.dashboardWrapper.x < root.panels.launcher.x + root.panels.launcher.width) {
+					console.log("true");
+					root.visibilities.dashboard = false;
+				}
+
 				root.visibilities.dock = false;
 				root.visibilities.settings = false;
 			}

Drawers/Windows.qml

@@ -35,7 +35,7 @@ Variants {
 			property var root: Quickshell.shellDir
 
 			WlrLayershell.exclusionMode: ExclusionMode.Ignore
-			WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+			// WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 			color: "transparent"
 			contentItem.focus: true
 			mask: visibilities.isDrawing ? null : region
@@ -229,6 +229,7 @@ Variants {
 					id: notifsBg
 
 					panel: panels.notifications
+					radius: Appearance.rounding.normal
 				}
 
 				PanelBg {
@@ -304,22 +305,34 @@ Variants {
 				}
 			}
 
-			Drawing {
-				id: drawing
+			Loader {
+				id: drawingLoader
 
+				active: visibilities.isDrawing
 				anchors.fill: parent
 				z: 2
+
+				sourceComponent: Drawing {
+					id: drawing
+				}
 			}
 
-			DrawingInput {
+			Loader {
+				id: inputLoader
+
+				active: visibilities.isDrawing
+				anchors.fill: parent
+				z: 2
+
+				sourceComponent: DrawingInput {
 					id: input
 
 					bar: bar
-				drawing: drawing
+					drawing: drawingLoader.item
 					panels: panels
 					popout: panels.drawing
 					visibilities: visibilities
-				z: 2
+				}
 			}
 
 			Interactions {
@@ -327,8 +340,8 @@ Variants {
 
 				anchors.fill: parent
 				bar: bar
-				drawing: drawing
-				input: input
+				drawing: drawingLoader.item
+				input: inputLoader.item
 				panels: panels
 				popouts: panels.popouts
 				screen: scope.modelData
@@ -339,7 +352,7 @@ Variants {
 					id: panels
 
 					bar: bar
-					drawingItem: drawing
+					drawingItem: drawingLoader.item
 					screen: scope.modelData
 					visibilities: visibilities
 

Helpers/Searcher.qml

@@ -6,7 +6,6 @@ import Quickshell
 Singleton {
 	property var extraOpts: ({})
 	readonly property list<var> fuzzyPrepped: useFuzzy ? list.map(e => {
-		console.log(useFuzzy);
 		const obj = {
 			_item: e
 		};

Helpers/SystemUsage.qml

@@ -17,6 +17,7 @@ Singleton {
 	property var disks: []
 	property real gpuMemTotal: 0
 	property real gpuMemUsed
+	property string gpuName
 	property real gpuPerc
 	property real gpuTemp
 	readonly property string gpuType: Config.services.gpuType.toUpperCase() || autoGpuType

Helpers/Wallpapers.qml

@@ -53,14 +53,12 @@ Searcher {
 		};
 
 		root.crops = updated;
-		monitorCrops.writeAdapter();
-		monitorCrops.reload();
 	}
 
 	function setWallpaper(path: string): void {
 		actualCurrent = path;
 		WallpaperPath.currentWallpaperPath = path;
-		Quickshell.screens.forEach(n => setCrop(n.name, Qt.rect(0, 0, 0, 0), Qt.rect(0, 0, 0, 0), 1.0));
+		Quickshell.screens.forEach(n => setCrop(n.name, Qt.rect(0, 0, 1, 1), Qt.rect(0, 0, 0, 0), 1.0));
 		Quickshell.execDetached(["zshell-cli", "wallpaper", "lockscreen", "--input-image", `${root.actualCurrent}`, "--output-path", `${Paths.state}/lockscreen_bg.png`, "--blur-amount", `${Config.lock.blurAmount}`]);
 		if (Config.general.color.schemeGeneration)
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.general.color.mode}`]);

Modules/Background.qml

@@ -1,68 +0,0 @@
-import QtQuick
-import QtQuick.Shapes
-import qs.Components
-import qs.Config
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.height < rounding * 2
-	property real ibr: invertBottomRounding ? -1 : 1
-	required property bool invertBottomRounding
-	property real rounding: Appearance.rounding.smallest
-	readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height - root.roundingY - root.roundingY * root.ibr
-	}
-
-	PathArc {
-		direction: root.invertBottomRounding ? PathArc.Clockwise : PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY * root.ibr
-	}
-
-	PathLine {
-		relativeX: root.wrapper.width - root.rounding * 2
-		relativeY: 0
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: -(root.wrapper.height - root.roundingY * 2)
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-}

Modules/Dashboard/Background.qml

@@ -1,65 +0,0 @@
-import qs.Components
-import qs.Config
-import QtQuick
-import QtQuick.Shapes
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.height < rounding * 2
-	readonly property real rounding: Appearance.rounding.normal
-	readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height - root.roundingY * 2
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: root.wrapper.width - root.rounding * 2
-		relativeY: 0
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: -(root.wrapper.height)
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-}

Modules/Dashboard/Wrapper.qml

@@ -20,7 +20,7 @@ Item {
 	required property PersistentProperties visibilities
 
 	implicitHeight: content.implicitHeight
-	implicitWidth: content.implicitWidth || 854 // Hard coded fallback for first open
+	implicitWidth: content.implicitWidth || 854
 	opacity: 1 - offsetScale
 	visible: offsetScale < 1
 

Modules/Dock/Background.qml

@@ -1,66 +0,0 @@
-import QtQuick
-import QtQuick.Shapes
-import qs.Components
-import qs.Config
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.height < rounding * 2
-	readonly property real rounding: Appearance.rounding.normal
-	readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: -(root.wrapper.height - root.roundingY * 2)
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-
-	PathLine {
-		relativeX: root.wrapper.width - root.rounding * 2
-		relativeY: 0
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height - root.roundingY * 2
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-}

Modules/Dock/Wrapper.qml

@@ -9,18 +9,17 @@ Item {
 	id: root
 
 	property int contentHeight
+	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	required property ShellScreen screen
+	readonly property bool shouldBeActive: visibilities.dock && Config.dock.enable
 	required property PersistentProperties visibilities
 
-	readonly property bool shouldBeActive: visibilities.dock
-	property real offsetScale: shouldBeActive ? 0 : 1
-
-	visible: offsetScale < 1
 	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
 	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth || 400
 	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
 	Behavior on offsetScale {
 		Anim {
@@ -32,10 +31,10 @@ Item {
 	Loader {
 		id: content
 
+		active: root.shouldBeActive || root.visible
 		anchors.left: parent.left
 		anchors.top: parent.top
-
-		active: root.shouldBeActive || root.visible
+		asynchronous: true
 
 		sourceComponent: Content {
 			panels: root.panels

Modules/Drawing/Background.qml

@@ -1,66 +0,0 @@
-import QtQuick
-import QtQuick.Shapes
-import qs.Components
-import qs.Config
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.width < rounding * 2
-	readonly property real rounding: Appearance.rounding.normal
-	readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: Math.min(root.rounding, root.wrapper.width)
-		radiusY: root.rounding
-		relativeX: root.roundingX
-		relativeY: root.rounding
-	}
-
-	PathLine {
-		relativeX: root.wrapper.width - root.roundingX * 2
-		relativeY: 0
-	}
-
-	PathArc {
-		radiusX: Math.min(root.rounding, root.wrapper.width)
-		radiusY: root.rounding
-		relativeX: root.roundingX
-		relativeY: root.rounding
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height - root.rounding * 2
-	}
-
-	PathArc {
-		radiusX: Math.min(root.rounding, root.wrapper.width)
-		radiusY: root.rounding
-		relativeX: -root.roundingX
-		relativeY: root.rounding
-	}
-
-	PathLine {
-		relativeX: -(root.wrapper.width - root.roundingX * 2)
-		relativeY: 0
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: Math.min(root.rounding, root.wrapper.width)
-		radiusY: root.rounding
-		relativeX: -root.roundingX
-		relativeY: root.rounding
-	}
-}

Modules/Drawing/Wrapper.qml

@@ -44,10 +44,10 @@ Item {
 	Loader {
 		id: icon
 
-		active: Qt.binding(() => root.shouldBeActive || root.visible)
+		active: root.shouldBeActive || root.visible
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
-		height: content.contentItem.height
+		asynchronous: true
 		opacity: root.expanded ? 0 : 1
 
 		Behavior on opacity {
@@ -63,8 +63,10 @@ Item {
 	Loader {
 		id: content
 
+		active: root.shouldBeActive || root.visible
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
+		asynchronous: true
 		opacity: root.expanded ? 1 : 0
 
 		Behavior on opacity {
@@ -75,7 +77,5 @@ Item {
 			drawing: root.drawing
 			visibilities: root.visibilities
 		}
-
-		Component.onCompleted: active = Qt.binding(() => root.shouldBeActive || root.visible)
 	}
 }

Modules/Launcher/Background.qml

@@ -1,66 +0,0 @@
-import QtQuick
-import QtQuick.Shapes
-import qs.Components
-import qs.Config
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.height < rounding * 2
-	readonly property real rounding: Appearance.rounding.smallest + 5
-	readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: -(root.wrapper.height - root.roundingY * 2)
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-
-	PathLine {
-		relativeX: root.wrapper.width - root.rounding * 2
-		relativeY: 0
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height - root.roundingY * 2
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-}

Modules/Launcher/Wrapper.qml

@@ -4,6 +4,7 @@ import Quickshell
 import QtQuick
 import qs.Components
 import qs.Config
+import qs.Modules.Launcher.Services
 
 Item {
 	id: root
@@ -11,34 +12,24 @@ Item {
 	property int contentHeight
 	readonly property real maxHeight: {
 		let max = screen.height - Appearance.spacing.large * 2;
-		if (visibilities.resources)
+		if (visibilities.resources && panels.resourcesWrapper.x + panels.resourcesWrapper.width > root.x)
 			max -= panels.resources.nonAnimHeight;
-		if (visibilities.dashboard && panels.dashboard.x < root.x + root.implicitWidth)
-			max -= panels.dashboard.nonAnimHeight;
-		if (panels.popouts.currentName.startsWith("updates"))
+		if (panels.popouts.hasCurrent)
+			if (panels.popouts.current.x + panels.popouts.current.width > root.x && panels.popouts.current.x < root.x + root.width)
 				max -= panels.popouts.nonAnimHeight;
 		return max;
 	}
+	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	required property ShellScreen screen
-	required property PersistentProperties visibilities
 	readonly property bool shouldBeActive: visibilities.launcher
-	property real offsetScale: shouldBeActive ? 0 : 1
+	required property PersistentProperties visibilities
 
-	onShouldBeActiveChanged: {
-		if (shouldBeActive) {
-			implicitHeight = Qt.binding(() => content.implicitHeight);
-			timer.stop();
-		} else {
-			implicitHeight = implicitHeight;
-		}
-	}
-
-	visible: offsetScale < 1
 	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
 	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth || 400
 	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
 	Behavior on offsetScale {
 		Anim {
@@ -47,61 +38,26 @@ Item {
 		}
 	}
 
-	onMaxHeightChanged: timer.start()
-
-	Connections {
-		function onEnabledChanged(): void {
-			timer.start();
-		}
-
-		function onMaxShownChanged(): void {
-			timer.start();
-		}
-
-		target: Config.launcher
-	}
-
-	Connections {
-		function onValuesChanged(): void {
-			if (DesktopEntries.applications.values.length < Config.launcher.maxAppsShown)
-				timer.start();
-		}
-
-		target: DesktopEntries.applications
-	}
-
-	Timer {
-		id: timer
-
-		interval: Appearance.anim.durations.small
-
-		onRunningChanged: {
-			if (running && !root.shouldBeActive) {
-				content.visible = false;
-				content.active = true;
-			} else {
-				root.contentHeight = Math.min(root.maxHeight, content.implicitHeight);
-				content.active = Qt.binding(() => root.shouldBeActive || root.visible);
-				content.visible = true;
-			}
-		}
+	Component.onCompleted: Qt.callLater(() => Apps)
+	onShouldBeActiveChanged: {
+		if (shouldBeActive)
+			implicitHeight = Qt.binding(() => content.implicitHeight);
+		else
+			implicitHeight = implicitHeight;
 	}
 
 	Loader {
 		id: content
 
-		active: false
+		active: root.shouldBeActive || root.visible
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: parent.top
+		asynchronous: true
 
 		sourceComponent: Content {
 			maxHeight: root.maxHeight
 			panels: root.panels
 			visibilities: root.visibilities
-
-			Component.onCompleted: root.contentHeight = implicitHeight
 		}
-
-		Component.onCompleted: timer.start()
 	}
 }

Modules/Notifications/Background.qml

@@ -1,59 +0,0 @@
-import qs.Components
-import qs.Config
-import QtQuick
-import QtQuick.Shapes
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.height < rounding * 2
-	readonly property real rounding: 8
-	readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
-	required property var sidebar
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathLine {
-		relativeX: -(root.wrapper.width + root.rounding)
-		relativeY: 0
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height - root.roundingY * 2
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.sidebar.notifsRoundingX
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.sidebar.notifsRoundingX
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: root.wrapper.height > 0 ? root.wrapper.width - root.rounding - root.sidebar.notifsRoundingX : root.wrapper.width
-		relativeY: 0
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: root.rounding
-		relativeX: root.rounding
-		relativeY: root.rounding
-	}
-}

Modules/Notifications/Content.qml

@@ -8,7 +8,7 @@ import QtQuick
 Item {
 	id: root
 
-	readonly property int padding: 6
+	readonly property int padding: Appearance.padding.smaller
 	required property Item panels
 	required property PersistentProperties visibilities
 
@@ -54,7 +54,7 @@ Item {
 		anchors.fill: parent
 		anchors.margins: root.padding
 		color: "transparent"
-		radius: Appearance.rounding.smallest / 2
+		radius: Appearance.rounding.normal - root.padding
 
 		CustomListView {
 			id: list
@@ -72,7 +72,7 @@ Item {
 				required property NotifServer.Notif modelData
 				readonly property alias nonAnimHeight: notif.nonAnimHeight
 
-				implicitHeight: notif.implicitHeight + (idx === 0 ? 0 : 8)
+				implicitHeight: notif.implicitHeight + (idx === 0 ? 0 : Appearance.spacing.small)
 				implicitWidth: notif.implicitWidth
 
 				ListView.onRemove: removeAnim.start()
@@ -151,48 +151,6 @@ Item {
 					property: "y"
 				}
 			}
-
-			ExtraIndicator {
-				anchors.top: parent.top
-				extra: {
-					const count = list.count;
-					if (count === 0)
-						return 0;
-
-					const scrollY = list.contentY;
-
-					let height = 0;
-					for (let i = 0; i < count; i++) {
-						height += (list.itemAtIndex(i)?.nonAnimHeight ?? 0) + 8;
-
-						if (height - 8 >= scrollY)
-							return i;
-					}
-
-					return count;
-				}
-			}
-
-			ExtraIndicator {
-				anchors.bottom: parent.bottom
-				extra: {
-					const count = list.count;
-					if (count === 0)
-						return 0;
-
-					const scrollY = list.contentHeight - (list.contentY + list.height);
-
-					let height = 0;
-					for (let i = count - 1; i >= 0; i--) {
-						height += (list.itemAtIndex(i)?.nonAnimHeight ?? 0) + 8;
-
-						if (height - 8 >= scrollY)
-							return count - i - 1;
-					}
-
-					return 0;
-				}
-			}
 		}
 	}
 

Modules/Notifications/Sidebar/Background.qml

@@ -1,54 +0,0 @@
-import QtQuick
-import QtQuick.Shapes
-import qs.Components
-import qs.Config
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.width < rounding * 2
-	readonly property real notifsRoundingX: panels.notifications.height > 0 && notifsWidthDiff < rounding * 2 ? notifsWidthDiff / 2 : rounding
-	readonly property real notifsWidthDiff: panels.notifications.width - wrapper.width
-	required property var panels
-	readonly property real rounding: Config.barConfig.rounding
-	readonly property real utilsRoundingX: utilsWidthDiff < rounding * 2 ? utilsWidthDiff / 2 : rounding
-	readonly property real utilsWidthDiff: panels.utilities.width - wrapper.width
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathLine {
-		relativeX: -root.wrapper.width - root.notifsRoundingX
-		relativeY: 0
-	}
-
-	PathArc {
-		radiusX: root.notifsRoundingX
-		radiusY: root.rounding
-		relativeX: root.notifsRoundingX
-		relativeY: root.rounding
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height - root.rounding * 2
-	}
-
-	PathArc {
-		radiusX: root.utilsRoundingX
-		radiusY: root.rounding
-		relativeX: -root.utilsRoundingX
-		relativeY: root.rounding
-	}
-
-	PathLine {
-		relativeX: root.wrapper.width + root.utilsRoundingX
-		relativeY: 0
-	}
-}

Modules/Osd/Background.qml

@@ -1,66 +0,0 @@
-import QtQuick
-import QtQuick.Shapes
-import qs.Components
-import qs.Config
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.width < rounding * 2
-	readonly property real rounding: 10
-	readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathArc {
-		radiusX: Math.min(root.rounding, root.wrapper.width)
-		radiusY: root.rounding
-		relativeX: -root.roundingX
-		relativeY: root.rounding
-	}
-
-	PathLine {
-		relativeX: -(root.wrapper.width - root.roundingX * 3)
-		relativeY: 0
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: Math.min(root.rounding * 2, root.wrapper.width)
-		radiusY: root.rounding * 2
-		relativeX: -root.roundingX * 2
-		relativeY: root.rounding * 2
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height - root.rounding * 4
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: Math.min(root.rounding * 2, root.wrapper.width)
-		radiusY: root.rounding * 2
-		relativeX: root.roundingX * 2
-		relativeY: root.rounding * 2
-	}
-
-	PathLine {
-		relativeX: root.wrapper.width - root.roundingX * 3
-		relativeY: 0
-	}
-
-	PathArc {
-		radiusX: Math.min(root.rounding, root.wrapper.width)
-		radiusY: root.rounding
-		relativeX: root.roundingX
-		relativeY: root.rounding
-	}
-}

Modules/Resources/Background.qml

@@ -1,65 +0,0 @@
-import qs.Components
-import qs.Config
-import QtQuick
-import QtQuick.Shapes
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.height < rounding * 2
-	readonly property real rounding: Appearance.rounding.normal
-	readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-
-	PathLine {
-		relativeX: root.wrapper.width - root.rounding * 2
-		relativeY: 0
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: -(root.wrapper.height - root.roundingY * 2)
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-}

Modules/Resources/Wrapper.qml

@@ -8,7 +8,7 @@ import qs.Config
 Item {
 	id: root
 
-	readonly property real nonAnimHeight: state === "visible" ? (content.item?.nonAnimHeight ?? 0) : 0
+	readonly property real nonAnimHeight: content.item?.nonAnimHeight ?? 0
 	property real offsetScale: shouldBeActive ? 0 : 1
 	readonly property bool shouldBeActive: root.visibilities.resources
 	required property PersistentProperties visibilities
@@ -31,8 +31,7 @@ Item {
 		id: content
 
 		active: root.shouldBeActive || root.visible
-		anchors.bottom: parent.bottom
-		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.centerIn: parent
 
 		sourceComponent: Content {
 			padding: Appearance.padding.normal

Modules/Settings/Background.qml

@@ -1,66 +0,0 @@
-import QtQuick
-import QtQuick.Shapes
-import qs.Components
-import qs.Config
-
-ShapePath {
-	id: root
-
-	readonly property bool flatten: wrapper.height < rounding * 2
-	readonly property real rounding: Appearance.rounding.large
-	readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
-	required property Wrapper wrapper
-
-	fillColor: DynamicColors.palette.m3surface
-	strokeWidth: -1
-
-	Behavior on fillColor {
-		CAnim {
-		}
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.roundingY, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: root.wrapper.height - root.roundingY * 2
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: root.roundingY
-	}
-
-	PathLine {
-		relativeX: root.wrapper.width - root.rounding * 2
-		relativeY: 0
-	}
-
-	PathArc {
-		direction: PathArc.Counterclockwise
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-
-	PathLine {
-		relativeX: 0
-		relativeY: -(root.wrapper.height - root.roundingY * 2)
-	}
-
-	PathArc {
-		radiusX: root.rounding
-		radiusY: Math.min(root.rounding, root.wrapper.height)
-		relativeX: root.rounding
-		relativeY: -root.roundingY
-	}
-}

Modules/Settings/Categories/Bar.qml

@@ -56,6 +56,21 @@ SettingsPage {
 		}
 	}
 
+	SettingsSection {
+		sectionId: "Tray"
+
+		SettingsHeader {
+			name: "System tray"
+		}
+
+		SettingSpinBox {
+			min: 16
+			name: "Tray icon size"
+			object: Config.barConfig.tray
+			setting: "trayIconSize"
+		}
+	}
+
 	SettingsSection {
 		sectionId: "Popouts"
 

Modules/Settings/Content.qml

@@ -134,7 +134,7 @@ Item {
 			anchors.right: parent.right
 			anchors.top: searchBar.bottom
 			anchors.topMargin: Appearance.spacing.smaller
-			color: DynamicColors.tPalette.m3surfaceContainerLowest
+			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: Appearance.rounding.normal
 
 			StackView {

Modules/Settings/Controls/WallpaperCropper.qml

@@ -80,12 +80,26 @@ Item {
 				required property ShellScreen modelData
 
 				function applyCrop(): void {
-					const croprect = cropRect.mapToItem(scaledImg, 0, 0, cropRect.width, cropRect.height);
-					const upscaledRect = Qt.rect((croprect.x - cropRect.imageX) / scaledImg.paintedWidth, (croprect.y - cropRect.imageY) / scaledImg.paintedHeight, croprect.width / scaledImg.paintedWidth, croprect.height / scaledImg.paintedHeight);
-					Wallpapers.setCrop(delegate.modelData.name, upscaledRect, croprect, cropRect.zoom);
+					if (!cropRectLoader.item) return;
+					const cropRect = cropRectLoader.item;
+					
+					// We need to calculate the exact percentage coordinates that map perfectly 
+					// to our C++ backend, regardless of current display scaling
+					const cropXPercent = (cropRect.x - cropRect.imageX) / scaledImg.paintedWidth;
+					const cropYPercent = (cropRect.y - cropRect.imageY) / scaledImg.paintedHeight;
+					const cropWidthPercent = cropRect.width / scaledImg.paintedWidth;
+					const cropHeightPercent = cropRect.height / scaledImg.paintedHeight;
+					
+					const finalRect = Qt.rect(cropXPercent, cropYPercent, cropWidthPercent, cropHeightPercent);
+					
+					// We just pass the percentages directly to the backend
+					Wallpapers.setCrop(delegate.modelData.name, finalRect, finalRect, cropRect.zoom);
 				}
 
 				function zoomClipRect(zoom: real): void {
+					if (!cropRectLoader.item) return;
+					const cropRect = cropRectLoader.item;
+					
 					let oldCenterX = cropRect.x + cropRect.width * 0.5;
 					let oldCenterY = cropRect.y + cropRect.height * 0.5;
 
@@ -128,7 +142,7 @@ Item {
 						Layout.preferredHeight: 10
 						from: 1.0
 						to: 5.0
-						value: cropRect.zoom
+						value: cropRectLoader.item ? cropRectLoader.item.zoom : 1.0
 
 						onMoved: {
 							delegate.zoomClipRect(value);
@@ -156,15 +170,20 @@ Item {
 					sourceSize.width: parent.width
 
 					onPaintedWidthChanged: {
-						if (paintedWidth > 0) {
-							scaledImg.displayData = Wallpapers.getCrop(delegate.modelData.name);
-							cropRect.zoom = Wallpapers.getCrop(delegate.modelData.name).zoom;
-							cropRect.restoreFromData();
+						if (paintedWidth > 0 && cropRectLoader.item) {
+							cropRectLoader.item.restoreFromData();
+						}
+					}
+					onSourceChanged: {
+						if (cropRectLoader.item) {
+							cropRectLoader.item.restoreFromData();
+						}
+					}
+					onStatusChanged: {
+						if (scaledImg.status == Image.Ready && cropRectLoader.item) {
+							cropRectLoader.item.restoreFromData();
 						}
 					}
-					onSourceChanged: cropRect.clampToBounds()
-					onStatusChanged: if (scaledImg.status == Image.Ready)
-						cropRect.clampToBounds()
 
 					CustomText {
 						id: monitorId
@@ -177,6 +196,11 @@ Item {
 						text: delegate.modelData.name
 					}
 
+					Loader {
+						id: cropRectLoader
+						active: scaledImg.paintedWidth > 0 && scaledImg.status == Image.Ready
+						
+						sourceComponent: Component {
 							CustomRect {
 								id: cropRect
 
@@ -196,7 +220,7 @@ Item {
 								readonly property real imageX: (scaledImg.width - scaledImg.paintedWidth) / 2
 								readonly property real imageY: (scaledImg.height - scaledImg.paintedHeight) / 2
 								property real imgAspectRatio: scaledImg.paintedWidth / scaledImg.paintedHeight
-						property real zoom: scaledImg.displayData.zoom
+								property real zoom: 1.0
 
 								function centerInImage() {
 									x = imageX + (scaledImg.paintedWidth - width) / 2;
@@ -210,11 +234,12 @@ Item {
 								}
 
 								function restoreFromData() {
-							let data = scaledImg.displayData;
+									let data = Wallpapers.getCrop(delegate.modelData.name);
 
-							if (data && data.scaledX !== 0 || data.scaledY !== 0 || data.scaledWidth !== 0 || data.scaledHeight !== 0) {
-								x = data.scaledX;
-								y = data.scaledY;
+									if (data && (Math.abs(data.x) > 0.001 || Math.abs(data.y) > 0.001 || Math.abs(data.width - 1.0) > 0.001 || Math.abs(data.height - 1.0) > 0.001)) {
+										zoom = data.zoom > 0 ? data.zoom : 1.0;
+										x = imageX + (data.x * scaledImg.paintedWidth);
+										y = imageY + (data.y * scaledImg.paintedHeight);
 										
 										clampToBounds();
 									} else {
@@ -234,15 +259,22 @@ Item {
 									}
 								}
 
-						Component.onCompleted: clampToBounds()
+								Component.onCompleted: {
+									restoreFromData();
+								}
 								onHeightChanged: clampToBounds()
 								onWidthChanged: clampToBounds()
 							}
+						}
+					}
 
 					MouseArea {
 						id: mouse
 
 						function updateCrop(mouseX, mouseY) {
+							if (!cropRectLoader.item) return;
+							const cropRect = cropRectLoader.item;
+							
 							let nx = mouseX - cropRect.width * 0.5;
 							let ny = mouseY - cropRect.height * 0.5;
 

Modules/Settings/Wrapper.qml

@@ -32,10 +32,9 @@ Item {
 		Loader {
 			id: content
 
-			active: true
+			active: root.shouldBeActive || root.visible
 			anchors.bottom: parent.bottom
 			anchors.horizontalCenter: parent.horizontalCenter
-			visible: true
 
 			sourceComponent: Content {
 				screen: root.screen

Modules/SysTray/TrayItem.qml

@@ -3,6 +3,7 @@ import QtQuick
 import QtQuick.VectorImage
 import Quickshell
 import Quickshell.Services.SystemTray
+import qs.Helpers
 import qs.Modules
 import qs.Components
 import qs.Config
@@ -11,12 +12,36 @@ Item {
 	id: root
 
 	property bool current: popouts.currentName.startsWith(`traymenu${ind}`) && popouts.hasCurrent
-	property bool hasLoaded: false
+	readonly property real dpr: Hypr.monitorFor(loader.screen).scale
 	required property int ind
 	required property SystemTrayItem item
 	required property RowLayout loader
 	required property Wrapper popouts
 
+	function resolveIcon(app: string, icon: string): string {
+		if (app === "chrome_status_icon_1") {
+			return Quickshell.iconPath("discord-tray");
+		} else if (app === "AyuGramDesktop") {
+			if (icon === Quickshell.iconPath("com.ayugram.desktop-attention-symbolic"))
+				return Quickshell.iconPath("telegram-attention-panel");
+			else if (icon === Quickshell.iconPath("com.ayugram.desktop-mute-symbolic"))
+				return Quickshell.iconPath("telegram-mute-panel");
+			else if (icon === Quickshell.iconPath("com.ayugram.desktop-symbolic"))
+				return Quickshell.iconPath("telegram-panel");
+		} else if (app === "TelegramDesktop") {
+			if (icon === Quickshell.iconPath("org.telegram.desktop-symbolic"))
+				return Quickshell.iconPath("telegram-panel");
+			else if (icon === Quickshell.iconPath("org.telegram.desktop-attention-symbolic"))
+				return Quickshell.iconPath("telegram-attention-panel");
+			else if (icon === Quickshell.iconPath("org.telegram.desktop-mute-symbolic"))
+				return Quickshell.iconPath("telegram-mute-panel");
+		} else if (app === "steam") {
+			return Quickshell.iconPath("steam_tray_mono");
+		}
+
+		return root.item.icon;
+	}
+
 	CustomRect {
 		anchors.fill: parent
 		anchors.margins: 3
@@ -30,7 +55,8 @@ Item {
 			onClicked: {
 				if (mouse.button === Qt.LeftButton) {
 					root.item.activate();
-				} else if (mouse.button === Qt.RightButton) {
+					console.log(icon.source + "\n" + root.item.id);
+				} else if (mouse.button === Qt.RightButton && Config.barConfig.popouts.tray) {
 					root.popouts.currentName = `traymenu${root.ind}`;
 					root.popouts.currentCenter = Qt.binding(() => root.mapToItem(root.loader, root.implicitWidth / 2, 0).x);
 					root.popouts.hasCurrent = true;
@@ -48,9 +74,11 @@ Item {
 		id: icon
 
 		anchors.centerIn: parent
+		antialiasing: true
 		color: root.current ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
-		implicitSize: 22
+		implicitSize: Config.barConfig.tray.trayIconSize * root.dpr
 		layer.enabled: Config.general.color.smart || Config.general.color.scheduleDark
-		source: root.item.icon
+		scale: 1 / root.dpr
+		source: root.resolveIcon(root.item.id, root.item.icon)
 	}
 }

Modules/SysTray/TrayWidget.qml

@@ -23,12 +23,12 @@ RowLayout {
 			let modRowPos = sysTrayMod.mapToItem(sysModRow, modPos.x, modPos.y);
 			let child = sysModRow.childAt(modRowPos.x, modRowPos.y);
 			if (child) {
-				if (child.objectName === "audioWidget")
+				if (child.objectName === "audioWidget" && Config.barConfig.popouts.audio)
 					return {
 						id: "audio",
 						item: child
 					};
-				if (child.objectName === "upowerWidget")
+				if (child.objectName === "upowerWidget" && Config.barConfig.popouts.upower)
 					return {
 						id: "upower",
 						item: child

Modules/Updates/UpdatesPopout.qml

@@ -11,21 +11,26 @@ import qs.Helpers
 CustomClippingRect {
 	id: root
 
+	readonly property bool hasUpdates: Object.keys(Updates.updates)?.length > 0
 	readonly property int itemHeight: 50 + Appearance.padding.smaller * 2
 	required property var wrapper
 
 	color: DynamicColors.tPalette.m3surfaceContainer
-	implicitHeight: updatesList.visible ? updatesList.implicitHeight + Appearance.padding.small * 2 : noUpdates.height
-	implicitWidth: updatesList.visible ? updatesList.contentWidth + Appearance.padding.small * 2 : noUpdates.width
+	implicitHeight: hasUpdates ? updatesListLoader.item?.implicitHeight + Appearance.padding.small * 2 : noUpdatesLoader.item.height
+	implicitWidth: hasUpdates ? updatesListLoader.item?.contentWidth + Appearance.padding.small * 2 : noUpdatesLoader.item.width
 	radius: Appearance.rounding.small
 
-	Item {
+	Loader {
+		id: noUpdatesLoader
+
+		active: !root.hasUpdates
+		anchors.centerIn: parent
+
+		sourceComponent: Item {
 			id: noUpdates
 
-		anchors.centerIn: parent
 			height: 200
-		visible: script.values.length === 0
-		width: 600
+			width: 300
 
 			MaterialIcon {
 				id: noUpdatesIcon
@@ -47,11 +52,17 @@ CustomClippingRect {
 				verticalAlignment: Text.AlignVCenter
 			}
 		}
+	}
 
-	CustomListView {
+	Loader {
+		id: updatesListLoader
+
+		active: root.hasUpdates
+		anchors.centerIn: parent
+
+		sourceComponent: CustomListView {
 			id: updatesList
 
-		anchors.centerIn: parent
 			contentHeight: childrenRect.height
 			contentWidth: 600
 			displayMarginBeginning: root.itemHeight
@@ -59,7 +70,6 @@ CustomClippingRect {
 			implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
 			implicitWidth: contentWidth
 			spacing: Appearance.spacing.normal
-		visible: script.values.length > 0
 
 			delegate: CustomRect {
 				id: update
@@ -157,4 +167,5 @@ CustomClippingRect {
 						}))
 			}
 		}
+	}
 }

Modules/Wallpaper/WallBackground-old.qml

@@ -1,80 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import qs.Components
-import qs.Helpers
-import qs.Config
-
-Item {
-	id: root
-
-	property Image current: one
-	property string source: Wallpapers.current
-
-	anchors.fill: parent
-
-	Component.onCompleted: {
-		if (source)
-			Qt.callLater(() => one.update());
-	}
-	onSourceChanged: {
-		if (!source) {
-			current = null;
-		} else if (current === one) {
-			two.update();
-		} else {
-			one.update();
-		}
-	}
-
-	Img {
-		id: one
-	}
-
-	Img {
-		id: two
-	}
-
-	component Img: Image {
-		id: img
-
-		function update(): void {
-			if (source === root.source) {
-				root.current = this;
-			} else {
-				source = root.source;
-			}
-		}
-
-		anchors.fill: parent
-		asynchronous: true
-		fillMode: Image.PreserveAspectCrop
-		opacity: 0
-		retainWhileLoading: true
-		scale: Wallpapers.showPreview ? 1 : 0.8
-		sourceClipRect: Qt.rect(Config.background.sourceClipX, Config.background.sourceClipY, Config.background.sourceClipW, Config.background.sourceClipH)
-
-		states: State {
-			name: "visible"
-			when: root.current === img
-
-			PropertyChanges {
-				img.opacity: 1
-				img.scale: 1
-			}
-		}
-		transitions: Transition {
-			Anim {
-				duration: Config.background.wallFadeDuration
-				properties: "opacity,scale"
-				target: img
-			}
-		}
-
-		onStatusChanged: {
-			if (status === Image.Ready) {
-				root.current = this;
-			}
-		}
-	}
-}

Modules/Wallpaper/WallBackground.qml

@@ -6,6 +6,7 @@ import QtQuick
 import qs.Components
 import qs.Helpers
 import qs.Config
+import ZShell.Internal
 
 Item {
 	id: root
@@ -15,58 +16,64 @@ Item {
 
 	function refreshData(): void {
 		Hyprland.refreshMonitors();
-		const scale = Hyprland.monitorFor(root.screen).scale;
-		if (scale > 0 && img.resScale !== scale) {
-			img.resScale = scale;
-			img.sourceSize.width = root.screen.width * scale;
+		let scale = Hyprland.monitorFor(root.screen).scale;
+		if (scale <= 0)
+			scale = 1.0; // Fallback to avoid zeroes on initialization
+
+		if (root.screen.width > 0 && root.screen.height > 0) {
+			img.screenResolution = Qt.size(root.screen.width * scale, root.screen.height * scale);
 		}
+
 		const displayData = Wallpapers.getCrop(root.screen.name);
-		const displayRect = Qt.rect(img.sourceSize.width * displayData.x, img.implicitHeight * displayData.y, img.sourceSize.width * displayData.width, img.implicitHeight * displayData.height);
-		img.anchors.fill = null;
-		img.zoom = displayData.zoom;
-		img.x = -(displayRect.x * displayData.zoom / img.resScale);
-		img.y = -(displayRect.y * displayData.zoom / img.resScale);
+
+		if (displayData) {
+			img.cropX = displayData.x !== undefined ? displayData.x : 0.0;
+			img.cropY = displayData.y !== undefined ? displayData.y : 0.0;
+			img.cropWidth = (displayData.width !== undefined && displayData.width > 0) ? displayData.width : 1.0;
+			img.cropHeight = (displayData.height !== undefined && displayData.height > 0) ? displayData.height : 1.0;
+		}
 	}
 
 	anchors.fill: parent
 
-	Image {
+	Component.onCompleted: root.refreshData()
+
+	Connections {
+		function onHeightChanged() {
+			root.refreshData();
+		}
+
+		function onWidthChanged() {
+			root.refreshData();
+		}
+
+		target: root.screen
+	}
+
+	WallpaperImage {
 		id: img
 
-		property int displayH
-		property int displayW
-		property real resScale
-		property real zoom: 1.0
-
-		asynchronous: true
-		fillMode: Image.PreserveAspectCrop
-		height: implicitHeight * zoom / resScale
-		opacity: 1
-		retainWhileLoading: true
+		anchors.fill: parent
 		source: root.source
-		sourceSize.width: root.screen.width * resScale
-		width: implicitWidth * zoom / resScale
 
-		Behavior on height {
+		Behavior on cropHeight {
 			Anim {
 			}
 		}
-		Behavior on width {
+		Behavior on cropWidth {
 			Anim {
 			}
 		}
-		Behavior on x {
+		Behavior on cropX {
 			Anim {
 			}
 		}
-		Behavior on y {
+		Behavior on cropY {
 			Anim {
 			}
 		}
-
-		onStatusChanged: {
-			if (img.status == Image.Ready) {
-				root.refreshData();
+		Behavior on zoom {
+			Anim {
 			}
 		}
 

Modules/Wallpaper/Wallpaper.qml

@@ -6,7 +6,7 @@ import qs.Modules.DesktopIcons
 
 Loader {
 	active: Config.background.enabled
-	asynchronous: true
+	asynchronous: false
 
 	sourceComponent: Variants {
 		model: Quickshell.screens

Modules/Wrapper.qml

@@ -15,9 +15,8 @@ Item {
 	property real currentCenter
 	property alias currentName: popoutState.currentName
 	property string detachedMode
-	readonly property bool isDetached: detachedMode.length > 0
 	property alias hasCurrent: popoutState.hasCurrent
-	readonly property real nonAnimHeight: children.find(c => c.shouldBeActive)?.implicitHeight ?? content.implicitHeight
+	readonly property real nonAnimHeight: content.implicitHeight || 150
 	readonly property real nonAnimWidth: children.find(c => c.shouldBeActive)?.implicitWidth ?? content.implicitWidth
 	required property real offsetScale
 	property string queuedMode
@@ -28,29 +27,13 @@ Item {
 		detachedMode = "";
 	}
 
-	function detach(mode: string): void {
-		setAnims(true);
-		if (mode === "winfo") {
-			detachedMode = mode;
-		} else {
-			queuedMode = mode;
-			detachedMode = "any";
-		}
-		setAnims(false);
-		focus = true;
-	}
-
-	function setAnims(detach: bool): void {
-		const type = `expressive${detach ? "Slow" : "Default"}Spatial`;
-		animLength = Appearance.anim.durations[type];
-		animCurve = Appearance.anim.curves[type];
-	}
-
 	focus: hasCurrent
 	implicitHeight: nonAnimHeight
 	implicitWidth: nonAnimWidth
 
 	Behavior on implicitHeight {
+		enabled: root.offsetScale < 1
+
 		Anim {
 			duration: root.animLength
 			easing.bezierCurve: root.animCurve
@@ -72,42 +55,14 @@ Item {
 	Comp {
 		id: content
 
-		// anchors.horizontalCenter: parent.horizontalCenter
-		// anchors.top: parent.top
 		anchors.centerIn: parent
-		shouldBeActive: root.hasCurrent && !root.detachedMode
+		shouldBeActive: root.hasCurrent
 
 		sourceComponent: Content {
 			popouts: popoutState
 		}
 	}
 
-	// Comp {
-	// 	id: winfo
-	//
-	// 	anchors.centerIn: parent
-	// 	shouldBeActive: root.detachedMode === "winfo"
-	//
-	// 	sourceComponent: WindowInfo {
-	// 		client: Hypr.activeToplevel
-	// 		screen: root.screen
-	// 	}
-	// }
-	//
-	// Comp {
-	// 	id: controlCenter
-	//
-	// 	anchors.centerIn: parent
-	// 	shouldBeActive: root.detachedMode === "any"
-	//
-	// 	sourceComponent: ControlCenter {
-	// 		active: root.queuedMode
-	// 		screen: root.screen
-	//
-	// 		onClose: root.close()
-	// 	}
-	// }
-
 	component Comp: Loader {
 		id: comp
 

Plugins/ZShell/Internal/CMakeLists.txt

@@ -8,6 +8,7 @@ qml_module(ZShell-internal
 		circularbuffer.hpp circularbuffer.cpp
 		sparklineitem.hpp sparklineitem.cpp
 		arcgauge.hpp arcgauge.cpp
+		wallpaperimage.hpp wallpaperimage.cpp
     LIBRARIES
         Qt::Gui
         Qt::Quick

Plugins/ZShell/Internal/arcgauge.cpp

@@ -4,7 +4,7 @@
 #include <qpainter.h>
 #include <qpen.h>
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 ArcGauge::ArcGauge(QQuickItem* parent)
 	: QQuickPaintedItem(parent) {
@@ -116,4 +116,4 @@ void ArcGauge::setLineWidth(qreal width) {
 	update();
 }
 
-} // namespace caelestia::internal
+} // namespace ZShell::internal

Plugins/ZShell/Internal/arcgauge.hpp

@@ -5,7 +5,7 @@
 #include <qqmlintegration.h>
 #include <qquickpainteditem.h>
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 class ArcGauge : public QQuickPaintedItem {
 Q_OBJECT
@@ -58,4 +58,4 @@ qreal m_sweepAngle = 1.5 * M_PI;
 qreal m_lineWidth = 10.0;
 };
 
-} // namespace caelestia::internal
+} // namespace ZShell::internal

Plugins/ZShell/Internal/wallpaperimage.cpp

@@ -0,0 +1,199 @@
+#include "wallpaperimage.hpp"
+
+#include <QStandardPaths>
+#include <QCryptographicHash>
+#include <QDir>
+#include <QFileInfo>
+#include <QtConcurrent>
+#include <QSGImageNode>
+#include <QQuickWindow>
+
+namespace ZShell::internal {
+
+WallpaperImage::WallpaperImage(QQuickItem *parent)
+	: QQuickItem(parent)
+{
+	setFlag(ItemHasContents, true);
+	connect(&m_imageWatcher, &QFutureWatcher<QImage>::finished, this, &WallpaperImage::handleImageLoaded);
+}
+
+WallpaperImage::~WallpaperImage() {
+	if (m_texture) delete m_texture;
+}
+
+void WallpaperImage::setSource(const QUrl &source) {
+	if (m_source == source) return;
+	m_source = source;
+	emit sourceChanged();
+	loadImage();
+}
+
+void WallpaperImage::setScreenResolution(const QSize &screenResolution) {
+	if (m_screenResolution == screenResolution) return;
+	m_screenResolution = screenResolution;
+	emit screenResolutionChanged();
+	loadImage();
+}
+
+void WallpaperImage::setZoom(qreal zoom) {
+	if (qFuzzyCompare(m_zoom, zoom)) return;
+	m_zoom = zoom;
+	emit zoomChanged();
+	update();
+}
+
+void WallpaperImage::setCropX(qreal x) {
+	if (qFuzzyCompare(m_cropX, x)) return;
+	m_cropX = x;
+	emit cropXChanged();
+	update();
+}
+
+void WallpaperImage::setCropY(qreal y) {
+	if (qFuzzyCompare(m_cropY, y)) return;
+	m_cropY = y;
+	emit cropYChanged();
+	update();
+}
+
+void WallpaperImage::setCropWidth(qreal w) {
+    if (w <= 0.0) w = 1.0;
+    if (qFuzzyCompare(m_cropWidth, w)) return;
+    m_cropWidth = w;
+    emit cropWidthChanged();
+    update();
+}
+
+void WallpaperImage::setCropHeight(qreal h) {
+    if (h <= 0.0) h = 1.0;
+    if (qFuzzyCompare(m_cropHeight, h)) return;
+    m_cropHeight = h;
+    emit cropHeightChanged();
+    update();
+}
+
+QString WallpaperImage::getCacheFilePath() const {
+	if (m_source.isEmpty() || m_screenResolution.isEmpty()) return QString();
+
+    QString cachePath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/zshell/imagecache";
+	QDir().mkpath(cachePath);
+
+	// Hash the source URL + resolution
+	QString id = m_source.toString() + "_" + QString::number(m_screenResolution.width()) + "x" + QString::number(m_screenResolution.height());
+	QByteArray hash = QCryptographicHash::hash(id.toUtf8(), QCryptographicHash::Md5).toHex();
+
+	return cachePath + "/" + hash + ".png";
+}
+
+void WallpaperImage::loadImage() {
+    if (m_source.isEmpty()) return;
+
+    QString cacheFile = getCacheFilePath();
+    QString sourceFile = m_source.isLocalFile() ? m_source.toLocalFile() : m_source.toString();
+    
+    // Qt resource path correction if passed as a standard URL string
+    if (sourceFile.startsWith("qrc:/")) {
+        sourceFile = sourceFile.mid(3); // Converts "qrc:/" to ":/"
+    }
+    
+    QSize targetRes = m_screenResolution;
+
+    // Run off the main thread to avoid blocking the UI
+    QFuture<QImage> future = QtConcurrent::run([sourceFile, cacheFile, targetRes]() -> QImage {
+        if (!targetRes.isEmpty() && !cacheFile.isEmpty() && QFileInfo::exists(cacheFile)) {
+            QImage cached(cacheFile);
+            if (!cached.isNull()) return cached;
+        }
+
+        QImage original(sourceFile);
+        if (original.isNull()) return QImage();
+
+        if (targetRes.isEmpty()) {
+            // Screen resolution not set yet by QML, return the unscaled original for now to prevent a black screen
+            return original;
+        }
+
+        // Check if original is strictly larger than screen resolution
+        if (original.width() > targetRes.width() || original.height() > targetRes.height()) {
+            QImage scaled = original.scaled(targetRes, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+            if (!cacheFile.isEmpty()) scaled.save(cacheFile, "PNG");
+            return scaled;
+        }
+
+        // Otherwise just cache and return the original
+        if (!cacheFile.isEmpty()) original.save(cacheFile, "PNG");
+        return original;
+    });
+
+    m_imageWatcher.setFuture(future);
+}
+
+void WallpaperImage::handleImageLoaded() {
+	m_image = m_imageWatcher.result();
+	m_textureDirty = true;
+	update(); // Request redraw
+}
+
+QSGNode *WallpaperImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) {
+	auto *node = static_cast<QSGImageNode *>(oldNode);
+
+	if (m_image.isNull()) {
+		delete node;
+		return nullptr;
+	}
+
+	if (!node) {
+		node = window()->createImageNode();
+	}
+
+	if (m_textureDirty) {
+		if (m_texture) delete m_texture;
+        m_texture = window()->createTextureFromImage(m_image, QQuickWindow::TextureHasAlphaChannel);
+		m_textureDirty = false;
+	}
+
+	if (m_texture) {
+		node->setTexture(m_texture);
+		node->setRect(boundingRect());
+		node->setFiltering(QSGTexture::Linear);
+
+        qreal cW = m_cropWidth / m_zoom;
+        qreal cH = m_cropHeight / m_zoom;
+
+        QRectF reqRect(
+            m_cropX * m_texture->textureSize().width(),
+            m_cropY * m_texture->textureSize().height(),
+            cW * m_texture->textureSize().width(),
+            cH * m_texture->textureSize().height()
+        );
+
+        QRectF bounds = boundingRect();
+        if (bounds.isEmpty() || reqRect.isEmpty()) return node;
+
+        qreal targetRatio = bounds.width() / bounds.height();
+        qreal reqRatio = reqRect.width() / reqRect.height();
+
+        QRectF sourceRect = reqRect;
+
+        // Force 'PreserveAspectCrop' behavior on the requested region
+        if (reqRatio > targetRatio) {
+            // Requested region is too wide, center-crop the sides
+            qreal newWidth = reqRect.height() * targetRatio;
+            qreal xOffset = (reqRect.width() - newWidth) / 2.0;
+            sourceRect.setX(reqRect.x() + xOffset);
+            sourceRect.setWidth(newWidth);
+        } else if (reqRatio < targetRatio) {
+            // Requested region is too tall, center-crop the top/bottom
+            qreal newHeight = reqRect.width() / targetRatio;
+            qreal yOffset = (reqRect.height() - newHeight) / 2.0;
+            sourceRect.setY(reqRect.y() + yOffset);
+            sourceRect.setHeight(newHeight);
+        }
+
+        node->setSourceRect(sourceRect);
+	}
+
+	return node;
+}
+
+} // namespace ZShell::internal

Plugins/ZShell/Internal/wallpaperimage.hpp

@@ -0,0 +1,95 @@
+#pragma once
+
+#include <QQuickItem>
+#include <QImage>
+#include <QUrl>
+#include <QSGTexture>
+#include <QFutureWatcher>
+#include <QtQml/qqml.h>
+
+namespace ZShell::internal {
+
+class WallpaperImage : public QQuickItem {
+Q_OBJECT
+QML_NAMED_ELEMENT(WallpaperImage)
+Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+Q_PROPERTY(QSize screenResolution READ screenResolution WRITE setScreenResolution NOTIFY screenResolutionChanged)
+Q_PROPERTY(qreal zoom READ zoom WRITE setZoom NOTIFY zoomChanged)
+
+Q_PROPERTY(qreal cropX READ cropX WRITE setCropX NOTIFY cropXChanged)
+Q_PROPERTY(qreal cropY READ cropY WRITE setCropY NOTIFY cropYChanged)
+Q_PROPERTY(qreal cropWidth READ cropWidth WRITE setCropWidth NOTIFY cropWidthChanged)
+Q_PROPERTY(qreal cropHeight READ cropHeight WRITE setCropHeight NOTIFY cropHeightChanged)
+
+public:
+explicit WallpaperImage(QQuickItem *parent = nullptr);
+~WallpaperImage() override;
+
+QUrl source() const {
+	return m_source;
+}
+void setSource(const QUrl &source);
+
+QSize screenResolution() const {
+	return m_screenResolution;
+}
+void setScreenResolution(const QSize &screenResolution);
+
+qreal zoom() const {
+	return m_zoom;
+}
+void setZoom(qreal zoom);
+
+qreal cropX() const {
+	return m_cropX;
+}
+void setCropX(qreal x);
+
+qreal cropY() const {
+	return m_cropY;
+}
+void setCropY(qreal y);
+
+qreal cropWidth() const {
+	return m_cropWidth;
+}
+void setCropWidth(qreal w);
+
+qreal cropHeight() const {
+	return m_cropHeight;
+}
+void setCropHeight(qreal h);
+
+protected:
+QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) override;
+
+signals:
+void sourceChanged();
+void screenResolutionChanged();
+void zoomChanged();
+void cropXChanged();
+void cropYChanged();
+void cropWidthChanged();
+void cropHeightChanged();
+
+private:
+void loadImage();
+void handleImageLoaded();
+QString getCacheFilePath() const;
+
+QUrl m_source;
+QSize m_screenResolution;
+qreal m_zoom = 1.0;
+
+qreal m_cropX = 0.0;
+qreal m_cropY = 0.0;
+qreal m_cropWidth = 1.0;
+qreal m_cropHeight = 1.0;
+
+QImage m_image;
+QSGTexture *m_texture = nullptr;
+bool m_textureDirty = false;
+QFutureWatcher<QImage> m_imageWatcher;
+};
+
+} // namespace ZShell::internal

Plugins/ZShell/writefile.cpp

@@ -1,15 +1,29 @@
 #include "writefile.hpp"
 
 #include <QtConcurrent/qtconcurrentrun.h>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QSaveFile>
+#include <QtGui/QImageReader>
+#include <QtQuick/qquickimageprovider.h>
 #include <QtQuick/qquickitemgrabresult.h>
 #include <QtQuick/qquickwindow.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qfuturewatcher.h>
-#include <qqmlengine.h>
+
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFutureWatcher>
+#include <QImage>
+#include <QJSValue>
+#include <QQmlEngine>
+#include <QSize>
+#include <QVariant>
 
 namespace ZShell {
 
+// ============================================================
+// saveItem
+// ============================================================
+
 void ZShellIo::saveItem(QQuickItem* target, const QUrl& path) {
 	this->saveItem(target, path, QRect(), QJSValue(), QJSValue());
 }
@@ -30,7 +44,13 @@ void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect,
 	this->saveItem(target, path, rect, onSaved, QJSValue());
 }
 
-void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed) {
+void ZShellIo::saveItem(
+	QQuickItem* target,
+	const QUrl& path,
+	const QRect& rect,
+	QJSValue onSaved,
+	QJSValue onFailed
+	) {
 	if (!target) {
 		qWarning() << "ZShellIo::saveItem: a target is required";
 		return;
@@ -42,22 +62,34 @@ void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect,
 	}
 
 	if (!target->window()) {
-        qWarning() << "ZShellIo::saveItem: unable to save target" << target << "without a window";
+		qWarning() << "ZShellIo::saveItem: unable to save target"
+		           << target
+		           << "without a window";
 		return;
 	}
 
 	auto scaledRect = rect;
+
 	const qreal scale = target->window()->devicePixelRatio();
+
 	if (rect.isValid() && !qFuzzyCompare(scale + 1.0, 2.0)) {
-        scaledRect =
-            QRectF(rect.left() * scale, rect.top() * scale, rect.width() * scale, rect.height() * scale).toRect();
+		scaledRect = QRectF(
+			rect.left() * scale,
+			rect.top() * scale,
+			rect.width() * scale,
+			rect.height() * scale
+			).toRect();
 	}
 
-    const QSharedPointer<const QQuickItemGrabResult> grabResult = target->grabToImage();
+	const QSharedPointer<const QQuickItemGrabResult> grabResult =
+		target->grabToImage();
 
-    QObject::connect(grabResult.data(), &QQuickItemGrabResult::ready, this,
+	QObject::connect(
+		grabResult.data(),
+		&QQuickItemGrabResult::ready,
+		this,
 		[grabResult, scaledRect, path, onSaved, onFailed, this]() {
-            const auto future = QtConcurrent::run([=]() {
+			const auto future = QtConcurrent::run([grabResult, scaledRect, path]() {
 				QImage image = grabResult->image();
 
 				if (scaledRect.isValid()) {
@@ -66,7 +98,19 @@ void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect,
 
 				const QString file = path.toLocalFile();
 				const QString parent = QFileInfo(file).absolutePath();
-                return QDir().mkpath(parent) && image.save(file);
+
+				QDir().mkpath(parent);
+
+				QSaveFile out(file);
+				if (!out.open(QIODevice::WriteOnly)) {
+					return false;
+				}
+
+				if (!image.save(&out, "PNG")) {
+					return false;
+				}
+
+				return out.commit();
 			});
 
 			auto* watcher = new QFutureWatcher<bool>(this);
@@ -74,22 +118,205 @@ void ZShellIo::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect,
 
 			QObject::connect(watcher, &QFutureWatcher<bool>::finished, this, [=]() {
 				if (watcher->result()) {
-                    if (onSaved.isCallable()) {
-                        onSaved.call(
-                            { QJSValue(path.toLocalFile()), engine->toScriptValue(QVariant::fromValue(path)) });
+					if (onSaved.isCallable() && engine) {
+						onSaved.call({
+							engine->toScriptValue(path.toLocalFile()),
+							engine->toScriptValue(path)
+						});
 					}
 				} else {
 					qWarning() << "ZShellIo::saveItem: failed to save" << path;
-                    if (onFailed.isCallable()) {
-                        onFailed.call({ engine->toScriptValue(QVariant::fromValue(path)) });
+					if (onFailed.isCallable() && engine) {
+						onFailed.call({
+							engine->toScriptValue(path)
+						});
 					}
 				}
 				watcher->deleteLater();
 			});
+
 			watcher->setFuture(future);
-        });
+		}
+		);
 }
 
+// ============================================================
+// cacheImage
+// ============================================================
+
+void ZShellIo::cacheImage(const QUrl& source, const QString& cacheDir) {
+	this->cacheImage(source, cacheDir, QJSValue(), QJSValue());
+}
+
+void ZShellIo::cacheImage(const QUrl& source, const QString& cacheDir, QJSValue onSaved) {
+	this->cacheImage(source, cacheDir, onSaved, QJSValue());
+}
+
+void ZShellIo::cacheImage(
+	const QUrl& source,
+	const QString& cacheDir,
+	QJSValue onSaved,
+	QJSValue onFailed
+	) {
+	if (cacheDir.isEmpty()) {
+		qWarning() << "ZShellIo::cacheImage: cacheDir is empty";
+		return;
+	}
+
+	QImage image;
+	if (!loadSourceImage(source, image)) {
+		qWarning() << "ZShellIo::cacheImage: failed to load source image" << source;
+		auto* engine = qmlEngine(this);
+		if (onFailed.isCallable() && engine) {
+			onFailed.call({
+					engine->toScriptValue(source),
+					engine->toScriptValue(cacheDir)
+				});
+		}
+		return;
+	}
+
+	const auto future = QtConcurrent::run([image, cacheDir]() -> QString {
+			if (image.isNull()) {
+				return QString();
+			}
+
+			const QImage normalized = image.convertToFormat(QImage::Format_RGBA8888);
+
+			const QByteArray bytes(
+				reinterpret_cast<const char*>(normalized.constBits()),
+				qsizetype(normalized.sizeInBytes())
+				);
+
+			const QByteArray digest =
+				QCryptographicHash::hash(bytes, QCryptographicHash::Sha256).toHex();
+
+			QDir dir(cacheDir);
+			if (!dir.exists() && !QDir().mkpath(cacheDir)) {
+				return QString();
+			}
+
+			const QString finalPath = dir.filePath(QString::fromLatin1(digest) + ".png");
+
+			if (QFile::exists(finalPath)) {
+				return finalPath;
+			}
+
+			QSaveFile out(finalPath);
+			if (!out.open(QIODevice::WriteOnly)) {
+				return QString();
+			}
+
+			if (!normalized.save(&out, "PNG")) {
+				return QString();
+			}
+
+			if (!out.commit()) {
+				return QString();
+			}
+
+			return finalPath;
+		});
+
+	auto* watcher = new QFutureWatcher<QString>(this);
+	auto* engine = qmlEngine(this);
+
+	QObject::connect(watcher, &QFutureWatcher<QString>::finished, this, [=]() {
+			const QString finalPath = watcher->result();
+
+			if (!finalPath.isEmpty()) {
+				if (onSaved.isCallable() && engine) {
+					onSaved.call({
+						engine->toScriptValue(finalPath),
+						engine->toScriptValue(QUrl::fromLocalFile(finalPath))
+					});
+				}
+			} else {
+				qWarning() << "ZShellIo::cacheImage: failed to cache" << source;
+				if (onFailed.isCallable() && engine) {
+					onFailed.call({
+						engine->toScriptValue(source),
+						engine->toScriptValue(cacheDir)
+					});
+				}
+			}
+
+			watcher->deleteLater();
+		});
+
+	watcher->setFuture(future);
+}
+
+// ============================================================
+// loadSourceImage
+// ============================================================
+
+bool ZShellIo::loadSourceImage(const QUrl& source, QImage& image) const {
+	image = QImage();
+
+	if (source.isLocalFile()) {
+		QImageReader reader(source.toLocalFile());
+		reader.setAutoTransform(true);
+		image = reader.read();
+		return !image.isNull();
+	}
+
+	if (source.scheme() == "image") {
+		auto* engine = qmlEngine(const_cast<ZShellIo*>(this));
+		if (!engine) {
+			qWarning() << "ZShellIo::loadSourceImage: no QQmlEngine";
+			return false;
+		}
+
+		const QString providerId = source.host();
+
+		const QString imageId =
+			source.path().startsWith('/')
+		? source.path().mid(1)
+		: source.path();
+
+		auto* providerBase = engine->imageProvider(providerId);
+		if (!providerBase) {
+			qWarning() << "ZShellIo::loadSourceImage: provider not found"
+			           << providerId;
+			return false;
+		}
+
+		auto* provider = dynamic_cast<QQuickImageProvider*>(providerBase);
+		if (!provider) {
+			qWarning() << "ZShellIo::loadSourceImage: provider is not a QQuickImageProvider"
+			           << providerId;
+			return false;
+		}
+
+		QSize size;
+
+		switch (provider->imageType()) {
+		case QQuickImageProvider::Image:
+			image = provider->requestImage(imageId, &size, QSize());
+			break;
+
+		case QQuickImageProvider::Pixmap:
+			image = provider->requestPixmap(imageId, &size, QSize()).toImage();
+			break;
+
+		default:
+			qWarning() << "ZShellIo::loadSourceImage: unsupported provider type"
+			           << providerId;
+			return false;
+		}
+
+		return !image.isNull();
+	}
+
+	qWarning() << "ZShellIo::loadSourceImage: unsupported source" << source;
+	return false;
+}
+
+// ============================================================
+// File ops
+// ============================================================
+
 bool ZShellIo::copyFile(const QUrl& source, const QUrl& target, bool overwrite) const {
 	if (!source.isLocalFile()) {
 		qWarning() << "ZShellIo::copyFile: source" << source << "is not a local file";
@@ -101,10 +328,7 @@ bool ZShellIo::copyFile(const QUrl& source, const QUrl& target, bool overwrite)
 	}
 
 	if (overwrite) {
-        if (!QFile::remove(target.toLocalFile())) {
-            qWarning() << "ZShellIo::copyFile: overwrite was specified but failed to remove" << target.toLocalFile();
-            return false;
-        }
+		QFile::remove(target.toLocalFile());
 	}
 
 	return QFile::copy(source.toLocalFile(), target.toLocalFile());

Plugins/ZShell/writefile.hpp

@@ -1,31 +1,40 @@
 #pragma once
 
 #include <QtQuick/qquickitem.h>
-#include <qobject.h>
+#include <QImage>
+#include <QJSValue>
+#include <QObject>
 #include <qqmlintegration.h>
+#include <QUrl>
 
 namespace ZShell {
 
 class ZShellIo : public QObject {
 
-    Q_OBJECT
-    QML_ELEMENT
-    QML_SINGLETON
+Q_OBJECT
+QML_ELEMENT
+QML_SINGLETON
 
 public:
-    // clang-format off
-    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path);
-    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect);
-    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved);
-    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved, QJSValue onFailed);
-    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved);
-    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed);
-    // clang-format on
+// clang-format off
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved, QJSValue onFailed);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed);
 
-    Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target, bool overwrite = true) const;
-    Q_INVOKABLE bool deleteFile(const QUrl& path) const;
-    Q_INVOKABLE QString toLocalFile(const QUrl& url) const;
+Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir);
+Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir, QJSValue onSaved);
+Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir, QJSValue onSaved, QJSValue onFailed);
+// clang-format on
+
+Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target, bool overwrite = true) const;
+Q_INVOKABLE bool deleteFile(const QUrl& path) const;
+Q_INVOKABLE QString toLocalFile(const QUrl& url) const;
+
+private:
+bool loadSourceImage(const QUrl& source, QImage& image) const;
 };
 
-
 } // namespace ZShell

cli/src/zshell/__init__.py

@@ -1,16 +1,57 @@
 from __future__ import annotations
+import os
+import sys
+from pathlib import Path
+
 import typer
+from typer._completion_shared import install, _get_shell_name
+from typer._completion_classes import completion_init
 from zshell.subcommands import shell, scheme, screenshot, wallpaper, record
 
-app = typer.Typer()
+app = typer.Typer(name="zshell-cli", add_completion=False)
 
 app.add_typer(shell.app, name="shell")
 app.add_typer(scheme.app, name="scheme")
 app.add_typer(screenshot.app, name="screenshot")
 app.add_typer(wallpaper.app, name="wallpaper")
 app.add_typer(record.app, name="record")
-# app.add_typer(preset.app, name="preset")
+
+
+def _completion_installed() -> bool:
+    shell = _get_shell_name()
+    match shell:
+        case "zsh":
+            return (Path.home() / ".zfunc" / "_zshell-cli").exists()
+        case "bash":
+            return (Path.home() / ".bash_completions" / "zshell-cli.sh").exists()
+        case "fish":
+            return (Path.home() / ".config" / "fish" / "completions" / "zshell-cli.fish").exists()
+    return False
+
+
+def _install_completion() -> None:
+    if _completion_installed():
+        print("zshell-cli: Shell completion already installed.")
+        sys.exit(0)
+    shell = _get_shell_name()
+    if shell is None:
+        print("zshell-cli: Unable to detect shell type.", file=sys.stderr)
+        sys.exit(1)
+    try:
+        _, path = install(prog_name="zshell-cli")
+        print(f"zshell-cli: Shell completion installed ({shell}: {path})")
+        print("zshell-cli: Restart your shell or source the file to enable tab-completion.")
+    except Exception as e:
+        print(f"zshell-cli: Failed to install shell completion: {e}", file=sys.stderr)
+        raise typer.Exit(code=1)
 
 
 def main() -> None:
+    if "--install-autocomplete" in sys.argv:
+        _install_completion()
+        return
+    if "_ZSHELL_CLI_COMPLETE" in os.environ:
+        completion_init()
+    if sys.stdout.isatty() and not _completion_installed():
+        print("zshell-cli: Tip: run with --install-autocomplete for tab completion.", file=sys.stderr)
     app()

cli/src/zshell/subcommands/record.py

@@ -18,8 +18,7 @@ TEMP_RECORDING = STATE_DIR / "recording.mp4"
 REPLAY_RECORDING = STATE_DIR / "replay.mp4"
 NOTIF_ID_FILE = STATE_DIR / "notifid.txt"
 
-RECORDINGS_DIR = os.getenv("ZSHELL_RECORDINGS_DIR",
-                           str(Path(HOME) / "Videos/Recordings"))
+RECORDINGS_DIR = os.getenv("ZSHELL_RECORDINGS_DIR", str(Path(HOME) / "Videos/Recordings"))
 
 
 def _read_extra_args() -> list[str]:
@@ -36,7 +35,7 @@ def _is_recording() -> bool:
     return subprocess.run(["pidof", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0
 
 
-def _notify(summary: str, body: str = "", actions: list = None, timeout: int = 5000) -> Optional[int]:
+def _notify(summary: str, body: str = "", actions: list | None = None, timeout: int = 5000) -> Optional[int]:
     args = ["notify-send", summary, body, "-t", str(timeout), "-p"]
     if actions:
         for action in actions:
@@ -49,14 +48,12 @@ def _notify(summary: str, body: str = "", actions: list = None, timeout: int = 5
 
 
 def _close_notification(notif_id: int):
-    subprocess.run(["notify-send", "--close", str(notif_id)],
-                   stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(["notify-send", "--close", str(notif_id)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
 
 def _get_monitors() -> list[dict]:
     try:
-        res = subprocess.run(["hyprctl", "monitors", "-j"],
-                             capture_output=True, text=True)
+        res = subprocess.run(["hyprctl", "monitors", "-j"], capture_output=True, text=True)
         return json.loads(res.stdout)
     except Exception:
         return []
@@ -92,6 +89,7 @@ def _slurp_region() -> Optional[str]:
 
 def _parse_geometry(geometry: str) -> Optional[tuple[int, int, int, int]]:
     import re
+
     match = re.match(r"(\d+)x(\d+)\+(\d+)\+(\d+)", geometry)
     if match:
         return int(match.group(3)), int(match.group(4)), int(match.group(1)), int(match.group(2))
@@ -139,8 +137,7 @@ def start_recording(region: Optional[str], sound: bool):
     cmd.extend(extra_args)
     cmd.extend(["-o", str(TEMP_RECORDING)])
 
-    subprocess.Popen(cmd, start_new_session=True,
-                     stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.Popen(cmd, start_new_session=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     notif_id = _notify("Recording started", f"Saving to {TEMP_RECORDING}")
     if notif_id is not None:
@@ -148,14 +145,12 @@ def start_recording(region: Optional[str], sound: bool):
 
     time.sleep(1)
     if not _is_recording():
-        _notify("Recording failed",
-                "Check gpu-screen-recorder output.", timeout=5000)
+        _notify("Recording failed", "Check gpu-screen-recorder output.", timeout=5000)
         raise typer.Exit(code=1)
 
 
 def stop_recording(clipboard: bool):
-    subprocess.run(["pkill", "-f", RECORDER],
-                   stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(["pkill", "-f", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     for _ in range(50):
         if not _is_recording():
@@ -178,30 +173,31 @@ def stop_recording(clipboard: bool):
         NOTIF_ID_FILE.unlink()
 
     if clipboard:
-        subprocess.run(["wl-copy", "--type", "text/uri-list", f"file://{final_path}"],
-                       stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        subprocess.run(
+            ["wl-copy", "--type", "text/uri-list", f"file://{final_path}"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
 
     _notify("Recording stopped", f"Saved to {final_path}", timeout=5000)
 
 
 def toggle_pause():
-    subprocess.run(["pkill", "-USR2", "-f", RECORDER],
-                   stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(["pkill", "-USR2", "-f", RECORDER], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     typer.echo("Toggled pause.")
 
 
 @app.command()
 def record(
     region: Optional[str] = typer.Option(
-        None, "--region", "-r",
+        None,
+        "--region",
+        "-r",
         help="Record a region. Use 'slurp' (or omit value) to select interactively, or give 'WxH+X+Y'.",
     ),
-    sound: bool = typer.Option(
-        False, "--sound", "-s", help="Record audio from default output."),
-    pause: bool = typer.Option(
-        False, "--pause", "-p", help="Toggle pause/resume."),
-    clipboard: bool = typer.Option(
-        False, "--clipboard", "-c", help="Copy the final recording path to clipboard."),
+    sound: bool = typer.Option(False, "--sound", "-s", help="Record audio from default output."),
+    pause: bool = typer.Option(False, "--pause", "-p", help="Toggle pause/resume."),
+    clipboard: bool = typer.Option(False, "--clipboard", "-c", help="Copy the final recording path to clipboard."),
 ):
     """Start or stop a screen recording with gpu-screen-recorder."""
     if pause:

cli/src/zshell/subcommands/scheme.py

@@ -2,6 +2,7 @@ import typer
 import json
 import shutil
 import os
+import sys
 import re
 import subprocess
 
@@ -15,11 +16,61 @@ from materialyoucolor.score.score import Score
 from materialyoucolor.dynamiccolor.material_dynamic_colors import MaterialDynamicColors
 from materialyoucolor.hct.hct import Hct
 from materialyoucolor.utils.color_utils import argb_from_rgb
-from materialyoucolor.utils.math_utils import difference_degrees, rotation_direction, sanitize_degrees_double
+from materialyoucolor.utils.math_utils import (
+    difference_degrees,
+    rotation_direction,
+    sanitize_degrees_double,
+)
 
 app = typer.Typer()
 
 
+def _complete_scheme_name(incomplete):
+    schemes = [
+        "fruit-salad",
+        "expressive",
+        "monochrome",
+        "rainbow",
+        "tonal-spot",
+        "neutral",
+        "fidelity",
+        "content",
+        "vibrant",
+    ]
+    return [s for s in schemes if incomplete in s]
+
+
+def _complete_preset(incomplete):
+    results = []
+    for sid, meta in list_schemes().items():
+        for v in meta.variants:
+            preset = f"{sid}:{v.id}"
+            if incomplete in preset:
+                results.append((preset, f"{meta.name} - {v.name}"))
+    return results
+
+
+def _complete_mode(incomplete):
+    return [m for m in ("dark", "light") if incomplete in m]
+
+
+def _complete_accent(ctx, incomplete):
+    preset_val = ctx.params.get("preset")
+    if preset_val:
+        try:
+            p_scheme, p_variant = resolve_preset(preset_val)
+            for v in list_schemes()[p_scheme].variants:
+                if v.id == p_variant:
+                    return [a for a in v.accents if incomplete in a]
+        except (ValueError, KeyError):
+            pass
+    all_accents = set()
+    for meta in list_schemes().values():
+        for v in meta.variants:
+            all_accents.update(v.accents)
+    return [a for a in sorted(all_accents) if incomplete in a]
+
+
 @app.command()
 def list_presets(
     json_format: bool = typer.Option(False, "--json", help="Output in JSON format"),
@@ -30,7 +81,7 @@ def list_presets(
         for sid, meta in sorted(schemes.items()):
             variants = {}
             for v in meta.variants:
-                entry = {"modes": sorted(v.modes)}
+                entry: dict[str, Any] = {"modes": sorted(v.modes)}
                 if v.accents:
                     entry["accents"] = sorted(v.accents)
                     entry["default_accent"] = sorted(v.accents)[0]
@@ -55,14 +106,35 @@ def list_presets(
 
 @app.command()
 def generate(
-    image_path: Optional[Path] = typer.Option(None, help="Path to source image. Required for image mode."),
-    scheme: Optional[str] = typer.Option(
-        None, help="Color scheme algorithm to use for image mode. Ignored in preset mode."
+    image_path: Optional[Path] = typer.Option(
+        None, help="Path to source image. Required for image mode."
+    ),
+    scheme: Optional[str] = typer.Option(
+        None,
+        help="Color scheme algorithm to use for image mode. Ignored in preset mode.",
+        autocompletion=_complete_scheme_name,
+    ),
+    preset: Optional[str] = typer.Option(
+        None,
+        help="Name of a premade scheme in this format: <scheme>:<variant>",
+        autocompletion=_complete_preset,
+    ),
+    mode: Optional[str] = typer.Option(
+        None,
+        help="Mode of the preset scheme (dark or light).",
+        autocompletion=_complete_mode,
+    ),
+    accent: Optional[str] = typer.Option(
+        None,
+        help="Accent for schemes that support it (e.g. mauve).",
+        autocompletion=_complete_accent,
     ),
-    preset: Optional[str] = typer.Option(None, help="Name of a premade scheme in this format: <scheme>:<variant>"),
-    mode: Optional[str] = typer.Option(None, help="Mode of the preset scheme (dark or light)."),
-    accent: Optional[str] = typer.Option(None, help="Accent for schemes that support it (e.g. mauve)."),
 ):
+    if not any([image_path, scheme, preset, mode, accent]):
+        print(
+            "Hint: use --preset <scheme>:<variant> or --image-path <path>",
+            file=sys.stderr,
+        )
 
     HOME = str(os.getenv("HOME"))
     OUTPUT = Path(HOME + "/.local/state/zshell/scheme.json")
@@ -200,11 +272,15 @@ def generate(
     def harmonize(from_hct: Hct, to_hct: Hct, tone_boost: float) -> Hct:
         diff = difference_degrees(from_hct.hue, to_hct.hue)
         rotation = min(diff * 0.8, 100)
-        output_hue = sanitize_degrees_double(from_hct.hue + rotation * rotation_direction(from_hct.hue, to_hct.hue))
+        output_hue = sanitize_degrees_double(
+            from_hct.hue + rotation * rotation_direction(from_hct.hue, to_hct.hue)
+        )
         tone = max(0.0, min(100.0, from_hct.tone * (1 + tone_boost)))
         return Hct.from_hct(output_hue, from_hct.chroma, tone)
 
-    def terminal_palette(colors: dict[str, str], mode: str, variant: str) -> dict[str, str]:
+    def terminal_palette(
+        colors: dict[str, str], mode: str, variant: str
+    ) -> dict[str, str]:
         light = mode.lower() == "light"
 
         key_hex = (
@@ -236,7 +312,7 @@ def generate(
 
         image = Image.open(image_path)
         image = image.convert("RGB")
-        image.thumbnail(size, Image.NEAREST)
+        image.thumbnail(size, Image.Resampling.NEAREST)
 
         thumbnail_file.parent.mkdir(parents=True, exist_ok=True)
         image.save(thumbnail_path, "JPEG")
@@ -268,8 +344,15 @@ def generate(
         is_dark = ""
 
         with Image.open(image_path) as img:
-            img.thumbnail((1, 1), Image.LANCZOS)
-            hct = Hct.from_int(argb_from_rgb(*img.getpixel((0, 0))))
+            img.thumbnail((1, 1), Image.Resampling.LANCZOS)
+            px = img.getpixel((0, 0))
+            if isinstance(px, (int, float)):
+                r = g = b = int(px)
+            elif px is not None:
+                r, g, b = int(px[0]), int(px[1]), int(px[2])
+            else:
+                r = g = b = 0
+            hct = Hct.from_int(argb_from_rgb(r, g, b))
             is_dark = "light" if hct.tone > 50 else "dark"
 
         return is_dark
@@ -431,6 +514,8 @@ def generate(
 
             raw = tpl_path.read_text(encoding="utf-8")
             out_path, body = split_directive_and_body(raw)
+            if out_path is None:
+                continue
 
             out_path.parent.mkdir(parents=True, exist_ok=True)
 
@@ -484,23 +569,30 @@ def generate(
         with CONFIG.open() as f:
             config = json.load(f)
 
-        scheme = scheme or config["colors"]["schemeType"]
+        scheme_type = config["colors"].get("schemeType", "fruit-salad")
+        scheme = scheme or scheme_type
+        assert isinstance(scheme, str)
         config_mode = config["general"]["color"]["mode"]
         smart = bool(config["general"]["color"].get("smart", False))
         scheme_class = get_scheme_class(scheme)
 
+        p_variant = "default"
         if preset:
             p_scheme, p_variant = resolve_preset(preset)
             schemes = list_schemes()
             if accent and p_scheme in schemes:
                 meta = schemes[p_scheme]
-                var_accents = next((v.accents for v in meta.variants if v.id == p_variant), ())
+                var_accents = next(
+                    (v.accents for v in meta.variants if v.id == p_variant), ()
+                )
                 if accent not in var_accents:
                     available = ", ".join(var_accents) if var_accents else "none"
                     raise typer.BadParameter(
                         f"Accent '{accent}' not available for '{p_scheme}:{p_variant}'. Available accents: {available}"
                     )
-            palette_obj = get_palette(p_scheme, p_variant, mode or config_mode, accent=accent)
+            palette_obj = get_palette(
+                p_scheme, p_variant, mode or config_mode, accent=accent
+            )
             colors = palette_obj.colors
             effective_mode = palette_obj.mode
             name = palette_obj.scheme

cli/src/zshell/subcommands/shell.py

@@ -2,7 +2,6 @@ import subprocess
 import sys
 import time
 
-import click
 import typer
 
 args = ["qs", "-c", "zshell"]
@@ -14,7 +13,8 @@ app = typer.Typer()
 def kill():
     result = subprocess.run(args + ["kill"], capture_output=True)
     if result.returncode != 0:
-        raise click.ClickException("No running instance to kill.")
+        sys.stderr.write("No running instance to kill.\n")
+        sys.exit(1)
     sys.stderr.write(result.stderr.decode())
 
 
@@ -23,10 +23,12 @@ def start_instance(no_daemon: bool = False) -> None:
     stdout = result.stdout.decode().strip()
     if stdout:
         if "already running" in stdout.lower():
-            raise click.ClickException(stdout)
+            sys.stderr.write(stdout + "\n")
+            sys.exit(1)
     if result.returncode != 0:
         stderr = result.stderr.decode().strip()
-        raise click.ClickException(stderr)
+        sys.stderr.write(stderr + "\n")
+        sys.exit(1)
 
 
 @app.command()
@@ -50,7 +52,9 @@ def restart(no_daemon: bool = False):
 def show():
     result = subprocess.run(args + ["ipc"] + ["show"], capture_output=True)
     if result.returncode != 0:
-        raise click.ClickException(result.stderr.decode().strip())
+        sys.stderr.write(result.stderr.decode())
+        sys.exit(1)
+    sys.stdout.write(result.stdout.decode())
     sys.stderr.write(result.stderr.decode())
 
 
@@ -58,7 +62,8 @@ def show():
 def log():
     result = subprocess.run(args + ["log"], capture_output=True)
     if result.returncode != 0:
-        raise click.ClickException(result.stderr.decode().strip())
+        sys.stderr.write(result.stderr.decode())
+        sys.exit(1)
     sys.stdout.write(result.stdout.decode())
     sys.stderr.write(result.stderr.decode())
 
@@ -67,7 +72,8 @@ def log():
 def lock():
     result = subprocess.run(args + ["ipc"] + ["call"] + ["lock"] + ["lock"], capture_output=True)
     if result.returncode != 0:
-        raise click.ClickException(result.stderr.decode().strip())
+        sys.stderr.write(result.stderr.decode())
+        sys.exit(1)
     sys.stderr.write(result.stderr.decode())
 
 
@@ -75,5 +81,6 @@ def lock():
 def call(target: str, method: str, method_args: list[str] = typer.Argument(None)):
     result = subprocess.run(args + ["ipc"] + ["call"] + [target] + [method] + (method_args or []), capture_output=True)
     if result.returncode != 0:
-        raise click.ClickException(result.stderr.decode().strip())
+        sys.stderr.write(result.stderr.decode())
+        sys.exit(1)
     sys.stderr.write(result.stderr.decode())

cli/src/zshell/subcommands/wallpaper.py

@@ -34,9 +34,9 @@ def lockscreen(
         return
 
     if size[0] < 3840 or size[1] < 2160:
-        img = img.resize((size[0] // 2, size[1] // 2), Image.NEAREST)
+        img = img.resize((size[0] // 2, size[1] // 2), Image.Resampling.NEAREST)
     else:
-        img = img.resize((size[0] // 4, size[1] // 4), Image.NEAREST)
+        img = img.resize((size[0] // 4, size[1] // 4), Image.Resampling.NEAREST)
 
     img = img.filter(ImageFilter.GaussianBlur(blur_amount))
 

cli/tests/test_shell.py

@@ -62,8 +62,9 @@ class TestStart:
 class TestShow:
     @patch("zshell.subcommands.shell.subprocess.run")
     def test_show_runs_ipc_show(self, mock_run):
-        mock_run.return_value = CompletedProcess([], 0, b"", b"target visibilities\n")
-        invoke("show")
+        mock_run.return_value = CompletedProcess([], 0, b"target visibilities\n", b"")
+        result = invoke("show")
+        assert "target visibilities" in result.output
         mock_run.assert_called_once_with(["qs", "-c", "zshell", "ipc", "show"], capture_output=True)
 
 

scripts/SettingsIndex.mjs

@@ -180,6 +180,14 @@ export const settingsIndex = [
         section: "Bar",
         keywords: ["smoothing", "rounding"],
     },
+    // System tray section
+    {
+        name: "Tray icon size",
+        category: "bar",
+        categoryName: "Bar",
+        section: "Tray",
+        keywords: ["tray", "icon", "size"],
+    },
     // Popouts section
     {
         name: "Tray",

shell.qml

@@ -1,19 +1,25 @@
 //@ pragma UseQApplication
 //@ pragma Env QSG_RENDER_LOOP=threaded
-//@ pragma Env QSG_RHI_BACKEND=vulkan
+// @ pragma Env QSG_RHI_BACKEND=vulkan
 //@ pragma Env QSG_NO_VSYNC=1
 //@ pragma Env QS_NO_RELOAD_POPUP=1
 //@ pragma Env QT_SCALE_FACTOR_ROUNDING_POLICY=Round
 //@ pragma DropExpensiveFonts
 import Quickshell
+import Quickshell.Services.UPower
 import qs.Modules
 import qs.Modules.Wallpaper
 import qs.Modules.Lock
 import qs.Drawers
 import qs.Helpers
 import qs.Modules.Polkit
+import qs.Daemons
 
 ShellRoot {
+	id: root
+
+	readonly property bool laptop: UPower.displayDevice.isLaptopBattery
+
 	settings.watchFiles: true
 
 	Windows {
@@ -38,4 +44,11 @@ ShellRoot {
 
 	Polkit {
 	}
+
+	LazyLoader {
+		activeAsync: root.laptop
+
+		component: Battery {
+		}
+	}
 }