revert toaster enum

Reviewed-on: #117

.clang-format

@@ -0,0 +1,58 @@
+---
+BasedOnStyle: LLVM
+AccessModifierOffset: 0
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands: Align
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+ColumnLimit: 80
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+FixNamespaceComments: true
+IndentCaseLabels: false
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: false
+Language: Cpp
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+PenaltyBreakAssignment: 10
+PenaltyBreakBeforeFirstCallParameter: 100
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments: false
+SortIncludes: false
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: c++20
+TabWidth: 4
+UseTab: Always

.clang-tidy

@@ -0,0 +1,31 @@
+---
+Checks: >
+    -*,
+    bugprone-*,
+    clang-analyzer-*,
+    modernize-*,
+    -modernize-use-trailing-return-type,
+    performance-*,
+    readability-braces-around-statements,
+    readability-else-after-return,
+    readability-identifier-naming,
+    readability-redundant-*,
+    readability-simplify-*,
+CheckOptions:
+    readability-identifier-naming.ClassCase: CamelCase
+    readability-identifier-naming.EnumCase: CamelCase
+    readability-identifier-naming.FunctionCase: camelBack
+    readability-identifier-naming.MemberCase: camelBack
+    readability-identifier-naming.MemberPrefix: m_
+    readability-identifier-naming.MethodCase: camelBack
+    readability-identifier-naming.NamespaceCase: CamelCase
+    readability-identifier-naming.ParameterCase: camelBack
+    readability-identifier-naming.PrivateMemberPrefix: m_
+    readability-identifier-naming.StaticConstantCase: UPPER_CASE
+    readability-identifier-naming.StaticConstantPrefix: k
+    readability-identifier-naming.VariableCase: camelBack
+WarningsAsErrors: "*"
+HeaderFilterRegex: ".*"
+FormatStyle: file
+
+...

.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/

CMakeLists.txt

@@ -25,6 +25,7 @@ add_compile_options(
 
 if("plugin" IN_LIST ENABLE_MODULES)
 	add_subdirectory(Plugins)
+
 endif()
 
 if("shell" IN_LIST ENABLE_MODULES)

Components/CustomSlider.qml

@@ -10,31 +10,35 @@ Slider {
 	background: Item {
 		CustomRect {
 			anchors.bottom: parent.bottom
+			anchors.bottomMargin: root.implicitHeight / 6
 			anchors.left: parent.left
 			anchors.top: parent.top
+			anchors.topMargin: root.implicitHeight / 6
 			bottomRightRadius: root.implicitHeight / 6
 			color: root.color
-			implicitWidth: root.handle.x - root.implicitHeight / 2
-			radius: Appearance.rounding.full
+			implicitWidth: root.handle.x - root.implicitHeight / 6
+			radius: root.implicitHeight / 6
 			topRightRadius: root.implicitHeight / 6
 		}
 
 		CustomRect {
 			anchors.bottom: parent.bottom
+			anchors.bottomMargin: root.implicitHeight / 6
 			anchors.right: parent.right
 			anchors.top: parent.top
+			anchors.topMargin: root.implicitHeight / 6
 			bottomLeftRadius: root.implicitHeight / 6
-			color: DynamicColors.tPalette.m3surfaceContainer
-			implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 2
-			radius: Appearance.rounding.full
+			color: DynamicColors.tPalette.m3surfaceContainerHighest
+			implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 6
+			radius: root.implicitHeight / 6
 			topLeftRadius: root.implicitHeight / 6
 		}
 	}
 	handle: CustomRect {
 		anchors.verticalCenter: parent.verticalCenter
 		color: root.color
-		implicitHeight: 15
-		implicitWidth: 5
+		implicitHeight: root.implicitHeight
+		implicitWidth: root.implicitHeight / 4.5
 		radius: Appearance.rounding.full
 		x: root.visualPosition * root.availableWidth - implicitWidth / 2
 

Components/CustomSpinBox.qml

@@ -28,6 +28,7 @@ RowLayout {
 	CustomTextField {
 		id: textField
 
+		color: root.enabled ? DynamicColors.palette.m3onSurface : Qt.alpha(DynamicColors.palette.m3onSurface, 0.5)
 		implicitHeight: upButton.implicitHeight
 		inputMethodHints: Qt.ImhFormattedNumbersOnly
 		leftPadding: Appearance.padding.normal
@@ -36,7 +37,7 @@ RowLayout {
 		text: root.isEditing ? text : root.displayText
 
 		background: CustomRect {
-			color: DynamicColors.tPalette.m3surfaceContainerHigh
+			color: root.enabled ? DynamicColors.tPalette.m3surfaceContainerHigh : DynamicColors.tPalette.m3surfaceContainerLow
 			implicitWidth: 100
 			radius: Appearance.rounding.full
 		}
@@ -85,7 +86,7 @@ RowLayout {
 	CustomRect {
 		id: upButton
 
-		color: DynamicColors.palette.m3primary
+		color: root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 1)
 		implicitHeight: upIcon.implicitHeight + Appearance.padding.small * 2
 		implicitWidth: implicitHeight
 		radius: Appearance.rounding.full
@@ -113,13 +114,13 @@ RowLayout {
 			id: upIcon
 
 			anchors.centerIn: parent
-			color: DynamicColors.palette.m3onPrimary
+			color: root.enabled ? DynamicColors.palette.m3onPrimary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.5)
 			text: "keyboard_arrow_up"
 		}
 	}
 
 	CustomRect {
-		color: DynamicColors.palette.m3primary
+		color: root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 1)
 		implicitHeight: downIcon.implicitHeight + Appearance.padding.small * 2
 		implicitWidth: implicitHeight
 		radius: Appearance.rounding.full
@@ -147,7 +148,7 @@ RowLayout {
 			id: downIcon
 
 			anchors.centerIn: parent
-			color: DynamicColors.palette.m3onPrimary
+			color: root.enabled ? DynamicColors.palette.m3onPrimary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.5)
 			text: "keyboard_arrow_down"
 		}
 	}

Components/CustomSplitButton.qml

@@ -35,14 +35,10 @@ Row {
 	}
 
 	function openDropdown(): void {
-		if (root.disabled)
-			return;
 		SettingsDropdowns.open(menu, root);
 	}
 
 	function toggleDropdown(): void {
-		if (root.disabled)
-			return;
 		SettingsDropdowns.toggle(menu, root);
 	}
 
@@ -55,7 +51,7 @@ Row {
 
 	CustomRect {
 		bottomRightRadius: Appearance.rounding.small / 2
-		color: root.disabled ? root.disabledColor : root.color
+		color: !root.enabled ? root.disabledColor : root.color
 		implicitHeight: expandBtn.implicitHeight
 		implicitWidth: textRow.implicitWidth + root.horizontalPadding * 2
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
@@ -69,7 +65,7 @@ Row {
 			}
 
 			color: root.textColor
-			disabled: root.disabled
+			disabled: !root.enabled
 			rect.bottomRightRadius: parent.bottomRightRadius
 			rect.topRightRadius: parent.topRightRadius
 		}
@@ -86,7 +82,7 @@ Row {
 
 				Layout.alignment: Qt.AlignVCenter
 				animate: true
-				color: root.disabled ? root.disabledTextColor : root.textColor
+				color: !root.enabled ? root.disabledTextColor : root.textColor
 				fill: 1
 				text: root.active?.activeIcon ?? root.fallbackIcon
 			}
@@ -98,7 +94,7 @@ Row {
 				Layout.preferredWidth: implicitWidth
 				animate: true
 				clip: true
-				color: root.disabled ? root.disabledTextColor : root.textColor
+				color: !root.enabled ? root.disabledTextColor : root.textColor
 				text: root.active?.activeText ?? root.fallbackText
 
 				Behavior on Layout.preferredWidth {
@@ -116,7 +112,7 @@ Row {
 		property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) : Appearance.rounding.small / 2
 
 		bottomLeftRadius: rad
-		color: root.disabled ? root.disabledColor : root.color
+		color: !root.enabled ? root.disabledColor : root.color
 		implicitHeight: expandIcon.implicitHeight + root.verticalPadding * 2
 		implicitWidth: implicitHeight
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
@@ -135,7 +131,7 @@ Row {
 			}
 
 			color: root.textColor
-			disabled: root.disabled
+			disabled: !root.enabled
 			rect.bottomLeftRadius: parent.bottomLeftRadius
 			rect.topLeftRadius: parent.topLeftRadius
 		}
@@ -145,7 +141,7 @@ Row {
 
 			anchors.centerIn: parent
 			anchors.horizontalCenterOffset: root.expanded ? 0 : -Math.floor(root.verticalPadding / 4)
-			color: root.disabled ? root.disabledTextColor : root.textColor
+			color: !root.enabled ? root.disabledTextColor : root.textColor
 			rotation: root.expanded ? 180 : 0
 			text: "expand_more"
 

Components/CustomSwitch.qml

@@ -12,7 +12,7 @@ Switch {
 	implicitWidth: implicitIndicatorWidth
 
 	indicator: CustomRect {
-		color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
+		color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
 		implicitHeight: 13 + 7 * 2
 		implicitWidth: implicitHeight * 1.7
 		radius: Appearance.rounding.full
@@ -21,7 +21,7 @@ Switch {
 			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight
 
 			anchors.verticalCenter: parent.verticalCenter
-			color: root.checked ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
+			color: root.checked && root.enabled ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
 			implicitHeight: parent.implicitHeight - 10
 			implicitWidth: nonAnimWidth
 			radius: Appearance.rounding.full
@@ -38,7 +38,7 @@ Switch {
 
 			CustomRect {
 				anchors.fill: parent
-				color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
+				color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
 				opacity: root.pressed ? 0.1 : root.hovered ? 0.08 : 0
 				radius: parent.radius
 
@@ -114,7 +114,7 @@ Switch {
 					fillColor: "transparent"
 					startX: icon.start1.x
 					startY: icon.start1.y
-					strokeColor: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3surfaceContainerHighest
+					strokeColor: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3surfaceContainerHighest
 					strokeWidth: Appearance.font.size.larger * 0.15
 
 					Behavior on strokeColor {

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
 			}
 		};
 	}
@@ -293,10 +300,10 @@ Singleton {
 		return {
 			enable_pp: screenshot.enable_pp,
 			mode: screenshot.mode,
-			corner_radius: screenshot.corner_radius,
-			drop_shadow: screenshot.drop_shadow,
-			rounded_corners: screenshot.rounded_corners,
-			shadow_blur_radius: screenshot.shadow_blur_radius,
+			radius: screenshot.radius,
+			shadow: screenshot.shadow,
+			rounding: screenshot.rounding,
+			shadow_blur: screenshot.shadow_blur,
 			shadow_color: screenshot.shadow_color,
 			shadow_offset_x: screenshot.shadow_offset_x,
 			shadow_offset_y: screenshot.shadow_offset_y

Config/DynamicColors.qml

@@ -115,6 +115,10 @@ Singleton {
 		Config.save();
 	}
 
+	function swapRG(c: color): color {
+		return Qt.rgba(c.g, c.r, c.b, c.a);
+	}
+
 	Component.onCompleted: debounceTimer.triggered()
 
 	Connections {

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"

Config/Screenshot.qml

@@ -1,12 +1,12 @@
 import Quickshell.Io
 
 JsonObject {
-	property real corner_radius: 12.0
-	property bool drop_shadow: true
 	property bool enable_pp: true
 	property string mode: "manual"
-	property bool rounded_corners: false
-	property real shadow_blur_radius: 22.0
+	property real radius: 12.0
+	property bool rounding: false
+	property bool shadow: true
+	property real shadow_blur: 22.0
 	property list<int> shadow_color: [0, 0, 0, 160]
 	property real shadow_offset_x: 5.0
 	property real shadow_offset_y: 5.0

Daemons/BatteryService.qml

@@ -0,0 +1,70 @@
+import Quickshell
+import Quickshell.Services.UPower
+import QtQuick
+import ZShell
+import qs.Config
+import qs.Components.Toast
+import qs.Helpers
+
+Scope {
+	id: root
+
+	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) {
+			if (p < perc.perc)
+				return perc;
+		}
+
+		return null;
+	}
+
+	Connections {
+		function onOnBatteryChanged(): void {
+			if (!Battery.ready)
+				return;
+
+			if (Battery.onBattery) {
+				if (Config.utilities.toasts.chargingChanged)
+					Toaster.toast(qsTr("Charger unplugged"), qsTr("Battery is discharging"), "power_off");
+				const p = Battery.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: Battery
+	}
+
+	Connections {
+		function onCurrentPercChanged(): void {
+			if (!Battery.onBattery)
+				return;
+
+			const p = Battery.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 (!Battery.ready)
+				return;
+
+			const p = Battery.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: Battery
+	}
+}

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

@@ -2,20 +2,21 @@ import Quickshell
 import QtQuick
 import qs.Components
 import qs.Config
+import qs.Helpers
 import qs.Modules as BarPopouts
 
-CustomMouseArea {
+Item {
 	id: root
 
 	required property Item bar
 	property bool dashboardShortcutActive
-	property point dragStart
 	required property Drawing drawing
 	required property DrawingInput input
 	property bool osdShortcutActive
 	required property Panels panels
 	required property BarPopouts.Wrapper popouts
 	required property ShellScreen screen
+	property bool singleGestureTriggered: false
 	property bool utilitiesShortcutActive
 	required property PersistentProperties visibilities
 
@@ -52,78 +53,123 @@ CustomMouseArea {
 	}
 
 	anchors.fill: parent
-	cursorShape: (pressed && dragStart.y < bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
-	hoverEnabled: true
-	propagateComposedEvents: false
 
-	onContainsMouseChanged: {
-		if (!containsMouse) {
-			if (!osdShortcutActive) {
-				visibilities.osd = false;
-				root.panels.osd.hovered = false;
+	DragHandler {
+		id: singleHandler
+
+		cursorShape: (active && centroid.pressPosition.y < root.bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
+		dragThreshold: 0
+		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfDifferentType | PointerHandler.ApprovesTakeOverByAnything
+		maximumPointCount: 1
+		minimumPointCount: 1
+		target: null
+
+		onActiveChanged: {
+			if (!active)
+				root.singleGestureTriggered = false;
+		}
+		onCentroidChanged: {
+			const x = centroid.position.x;
+			const y = centroid.position.y;
+			const dragX = x - centroid.pressPosition.x;
+			const dragY = y - centroid.pressPosition.y;
+
+			if (centroid.pressPosition.y >= root.screen.height - Config.barConfig.border && dragY < -200)
+				root.visibilities.launcher = true;
+
+			if (root.singleGestureTriggered)
+				return;
+
+			if (centroid.pressPosition.y < root.bar.implicitHeight) {
+				if (dragY > 20) {
+					root.visibilities.settings = true;
+					root.singleGestureTriggered = true;
+				} else if (dragY < -20) {
+					root.visibilities.settings = false;
+					root.singleGestureTriggered = true;
+				}
 			}
 
-			if (!popouts.currentName.startsWith("traymenu")) {
-				popouts.hasCurrent = false;
+			if (!Config.dock.hoverToReveal && centroid.pressPosition.y > root.screen.height - root.bar.implicitHeight)
+				if (dragY < -10) {
+					root.visibilities.dock = true;
+					root.singleGestureTriggered = true;
+				}
+
+			if (centroid.pressPosition.x > root.screen.width - Config.barConfig.border && centroid.pressPosition.y < (root.screen.height / 2) && dragX < -20) {
+				root.visibilities.sidebar = true;
+				root.singleGestureTriggered = true;
 			}
 
-			if (Config.barConfig.autoHide)
-				bar.isHovered = false;
+			if (centroid.pressPosition.x >= root.screen.width - Config.barConfig.border && centroid.pressPosition.y > (root.screen.height / 2) && dragX < -20) {
+				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r+1', on_current_monitor = true })`);
+				root.singleGestureTriggered = true;
+			}
+
+			if (centroid.pressPosition.x <= Config.barConfig.border && dragX > 20) {
+				Hypr.dispatch(`hl.dsp.focus({ workspace = 'r-1', on_current_monitor = true })`);
+				root.singleGestureTriggered = true;
+			}
 		}
 	}
-	onPositionChanged: event => {
-		const x = event.x;
-		const y = event.y;
-		const dragX = x - dragStart.x;
-		const dragY = y - dragStart.y;
 
-		if (root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, x, y)) {
-			// root.input.z = 2;
-			root.panels.drawing.expanded = false;
-		}
+	HoverHandler {
+		id: hoverHandler
 
-		if (!visibilities.bar && Config.barConfig.autoHide && y < bar.implicitHeight)
-			bar.isHovered = true;
+		onHoveredChanged: {
+			if (!hovered) {
+				if (!root.osdShortcutActive) {
+					root.visibilities.osd = false;
+					root.panels.osd.hovered = false;
+				}
 
-		if (pressed && dragStart.y < bar.implicitHeight) {
-			if (dragY > 20)
-				visibilities.settings = true;
-			else if (dragY < -20)
-				visibilities.settings = false;
-		}
+				if (!root.popouts.currentName.startsWith("traymenu")) {
+					root.popouts.hasCurrent = false;
+				}
 
-		if (Config.dock.hoverToReveal && pressed && dragStart.y > root.screen.height - root.bar.implicitHeight)
-			if (dragY < -10)
-				visibilities.dock = true;
-
-		if (panels.sidebar.width === 0) {
-			const showOsd = inRightPanel(panels.osdWrapper, x, y);
-
-			if (showOsd) {
-				osdShortcutActive = false;
-				root.panels.osd.hovered = true;
-			}
-		} else {
-			const outOfSidebar = x < width - panels.sidebar.width;
-			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
-
-			if (!osdShortcutActive) {
-				visibilities.osd = showOsd;
-				root.panels.osd.hovered = showOsd;
-			} else if (showOsd) {
-				osdShortcutActive = false;
-				root.panels.osd.hovered = true;
+				if (Config.barConfig.autoHide)
+					root.bar.isHovered = false;
 			}
 		}
+		onPointChanged: {
+			const x = point.position.x;
+			const y = point.position.y;
 
-		if (Config.dock.enable && !Config.dock.hoverToReveal && !visibilities.dock && !visibilities.launcher && inBottomPanel(panels.dock, x, y))
-			visibilities.dock = true;
+			if (root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, x, y)) {
+				root.input.z = 2;
+				root.panels.drawing.expanded = false;
+			}
 
-		if (y < root.bar.implicitHeight) {
-			root.bar.checkPopout(x);
+			if (!root.visibilities.bar && Config.barConfig.autoHide && y < root.bar.implicitHeight)
+				root.bar.isHovered = true;
+
+			if (root.panels.sidebar.width === 0) {
+				const showOsd = root.inRightPanel(root.panels.osdWrapper, x, y);
+
+				if (showOsd) {
+					root.osdShortcutActive = false;
+					root.panels.osd.hovered = true;
+				}
+			} else {
+				const outOfSidebar = x < root.width - root.panels.sidebar.width;
+				const showOsd = outOfSidebar && root.inRightPanel(root.panels.osdWrapper, x, y);
+
+				if (!root.osdShortcutActive) {
+					root.visibilities.osd = showOsd;
+					root.panels.osd.hovered = showOsd;
+				} else if (showOsd) {
+					root.osdShortcutActive = false;
+					root.panels.osd.hovered = true;
+				}
+			}
+
+			if (Config.dock.enable && Config.dock.hoverToReveal && !root.visibilities.dock && !root.visibilities.launcher && root.inBottomPanel(root.panels.dock, x, y))
+				root.visibilities.dock = true;
+
+			if (y < root.bar.implicitHeight)
+				root.bar.checkPopout(x);
 		}
 	}
-	onPressed: event => dragStart = Qt.point(event.x, event.y)
 
 	Connections {
 		function onDashboardChanged() {
@@ -132,6 +178,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 +209,10 @@ CustomMouseArea {
 			}
 
 			if (root.visibilities.launcher) {
+				if (root.panels.dashboardWrapper.x < root.panels.launcher.x + root.panels.launcher.width) {
+					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 {
-				id: input
+			Loader {
+				id: inputLoader
 
-				bar: bar
-				drawing: drawing
-				panels: panels
-				popout: panels.drawing
-				visibilities: visibilities
+				active: visibilities.isDrawing
+				anchors.fill: parent
 				z: 2
+
+				sourceComponent: DrawingInput {
+					id: input
+
+					bar: bar
+					drawing: drawingLoader.item
+					panels: panels
+					popout: panels.drawing
+					visibilities: visibilities
+				}
 			}
 
 			Interactions {
@@ -327,8 +340,9 @@ Variants {
 
 				anchors.fill: parent
 				bar: bar
-				drawing: drawing
-				input: input
+				drawing: drawingLoader.item
+				enabled: true
+				input: inputLoader.item
 				panels: panels
 				popouts: panels.popouts
 				screen: scope.modelData
@@ -339,7 +353,7 @@ Variants {
 					id: panels
 
 					bar: bar
-					drawingItem: drawing
+					drawingItem: drawingLoader.item
 					screen: scope.modelData
 					visibilities: visibilities
 

Helpers/Battery.qml

@@ -0,0 +1,32 @@
+pragma Singleton
+
+import Quickshell
+import Quickshell.Services.UPower
+import qs.Config
+
+Singleton {
+	id: root
+
+	readonly property var colors: {
+		if (deviceState === UPowerDeviceState.Charging || deviceState === UPowerDeviceState.FullyCharged)
+			return {
+				fg: DynamicColors.swapRG(DynamicColors.palette.m3error),
+				bg: DynamicColors.swapRG(DynamicColors.palette.m3onError)
+			};
+		else if (currentPerc <= 0.2)
+			return {
+				fg: DynamicColors.palette.m3error,
+				bg: DynamicColors.palette.m3onError
+			};
+		else
+			return {
+				fg: DynamicColors.palette.m3onSurface,
+				bg: DynamicColors.palette.m3surface
+			};
+	}
+	readonly property real currentPerc: UPower.displayDevice.percentage
+	readonly property var deviceState: UPower.displayDevice.state
+	readonly property bool isLaptop: UPower.displayDevice.isLaptopBattery
+	readonly property bool onBattery: UPower.onBattery
+	readonly property bool ready: UPower.displayDevice.ready
+}

Helpers/GameMode.qml

@@ -36,7 +36,7 @@ Singleton {
 	PersistentProperties {
 		id: props
 
-		property bool enabled: Hypr.options["animations:enabled"] === 0
+		property bool enabled: Hypr.options.animations.enabled === 0
 
 		reloadableId: "gamemode"
 	}

Helpers/Hypr.qml

@@ -158,6 +158,5 @@ Singleton {
 
 	HyprExtras {
 		id: extras
-
 	}
 }

Helpers/Hyprsunset.qml

@@ -2,12 +2,13 @@ pragma Singleton
 
 import Quickshell
 import QtQuick
+import ZShell.Services
 import qs.Config
 
 Singleton {
 	id: root
 
-	property bool enabled
+	readonly property bool enabled: service.enabled
 	readonly property int end: Config.general.color.scheduleHyprsunsetEnd
 	property bool manualToggle: false
 	readonly property int start: Config.general.color.scheduleHyprsunsetStart
@@ -17,69 +18,20 @@ Singleton {
 		if (!Config.general.color.scheduleHyprsunset)
 			return;
 
-		var now = new Date();
-		if (now.getHours() >= root.start || now.getHours() < root.end) {
-			root.startNightLight(root.temp);
-		} else {
-			root.stopNightLight();
-		}
-	}
-
-	function startNightLight(temp: int): void {
-		Quickshell.execDetached(["hyprctl", "hyprsunset", "temperature", `${temp}`]);
-		root.enabled = true;
-	}
-
-	function stopNightLight(): void {
-		Quickshell.execDetached(["hyprctl", "hyprsunset", "identity"]);
-		root.enabled = false;
+		service.apply();
 	}
 
 	function toggleNightLight(): void {
-		if (enabled)
-			stopNightLight();
-		else
-			startNightLight(temp);
+		service.manualToggle = true;
+		service.toggle();
 	}
 
-	onManualToggleChanged: {
-		if (root.manualToggle)
-			manualTimer.start();
-	}
+	HyprsunsetManager {
+		id: service
 
-	Timer {
-		id: manualTimer
-
-		interval: 60000 * 60
-		repeat: false
-		running: false
-
-		onTriggered: {
-			root.manualToggle = false;
-		}
-	}
-
-	Timer {
-		interval: 5000
-		repeat: true
-		running: true
-		triggeredOnStart: true
-
-		onTriggered: {
-			if (!Config.general.color.scheduleHyprsunset)
-				return;
-
-			if (root.manualToggle)
-				return;
-
-			var now = new Date();
-			if (now.getHours() >= root.start || now.getHours() < root.end) {
-				if (!root.enabled)
-					root.startNightLight(root.temp);
-			} else {
-				if (root.enabled)
-					root.stopNightLight();
-			}
-		}
+		activeAuto: Config.general.color.scheduleHyprsunset
+		endTime: root.end
+		startTime: root.start
+		temp: root.temp
 	}
 }

Helpers/Picker.qml

@@ -26,16 +26,23 @@ MouseArea {
 			return (bc.pinned - ac.pinned) || ((bc.fullscreen !== 0) - (ac.fullscreen !== 0)) || (bc.floating - ac.floating);
 		});
 	}
+	readonly property int cornerRadius: Hypr.options.decoration.rounding
 	property real ex: screen.width
 	property real ey: screen.height
 	required property LazyLoader loader
 	property bool onClient
-	property real realBorderWidth: onClient ? (Hypr.options["general:border_size"] ?? 1) : 2
-	property real realRounding: onClient ? (Hypr.options["decoration:rounding"] ?? 0) : 0
+	property real realBorderWidth: onClient ? (Hypr.options.general.border_size ?? 1) : 2
+	property real realRounding: onClient ? (Hypr.options.decoration.rounding ?? 0) : 0
 	property real rsx: Math.min(sx, ex)
 	property real rsy: Math.min(sy, ey)
+	readonly property real scaleRatio: Hypr.monitorFor(screen).scale
 	required property ShellScreen screen
 	property real sh: Math.abs(sy - ey)
+	readonly property color shadowColor: Hypr.options.decoration.shadow.color
+	readonly property bool shadowEnabled: Hypr.options.decoration.shadow.enabled
+	readonly property var shadowOffset: Hypr.options.decoration.shadow.offset
+	readonly property int shadowRange: Hypr.options.decoration.shadow.range
+	readonly property int shadowRenderPower: Hypr.options.decoration.shadow.render_power
 	property real ssx
 	property real ssy
 	property real sw: Math.abs(sx - ex)
@@ -66,7 +73,14 @@ MouseArea {
 
 	function save(): void {
 		const tmpfile = Qt.resolvedUrl(`/tmp/zshell-picker-${Quickshell.processId}-${Date.now()}.png`);
-		const cmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--image"] : ["swappy", "-f"];
+		const rounding = root.cornerRadius > 0;
+		const shadow_blur = root.shadowRange / root.shadowRenderPower;
+		const r = Math.floor(root.shadowColor.r * 256);
+		const g = Math.floor(root.shadowColor.g * 256);
+		const b = Math.floor(root.shadowColor.b * 256);
+		const a = Math.floor(root.shadowColor.a * 256);
+		const args = Config.screenshot.mode === "auto" ? ["--rounding", `${rounding}`, "--radius", root.cornerRadius, "--shadow", root.shadowEnabled, "--shadow-blur", `${shadow_blur}`, "--shadow-color", `${r},${g},${b},${a}`, "--shadow-offset-x", root.shadowOffset[0], "--shadow-offset-y", root.shadowOffset[1]] : [];
+		const cmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--scale", root.scaleRatio, ...args, "--image"] : ["swappy", "-f"];
 		ZShellIo.saveItem(screencopy, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => Quickshell.execDetached([...cmd, path]));
 		closeAnim.start();
 	}

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/UPower.qml

@@ -1,26 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import Quickshell.Services.UPower
-
-Singleton {
-	id: root
-
-	readonly property real batteryPercent: UPower.displayDevice.percentage
-	readonly property list<UPowerDevice> devices: UPower.devices.values
-	readonly property UPowerDevice displayDevice: UPower.displayDevice
-	readonly property bool onBattery: UPower.onBattery
-	// property bool toastShown
-	//
-	// Connections {
-	// 	target: UPower
-	//
-	// 	function onPercentageChanged(): {
-	// 		if (root.batteryPercent >= 0.2 && toastShown)
-	// 			return;
-	//
-	// 		root.toastShown = true;
-	// 		Toaster.toast(qsTr("Battery "))
-	// 	}
-	// }
-}

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/Clock.qml

@@ -23,7 +23,7 @@ CustomRect {
 
 		anchors.centerIn: parent
 		color: root.visibilities.dashboard ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
-		font: Appearance.font.family.mono
+		font: Appearance.font.family.mono // qmllint disable incompatible-type
 		text: Time.dateStr
 
 		Behavior on color {

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"))
-			max -= panels.popouts.nonAnimHeight;
+		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/Lock/IdleMonitors.qml

@@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import Quickshell.Wayland
+import ZShell.Internal
 import qs.Config
 import qs.Helpers
 
@@ -29,6 +30,10 @@ Scope {
 			Quickshell.execDetached(action);
 	}
 
+    LidWatcher {
+        onAboutToSleep: root.lock.lock.locked = true
+    }
+
 	Variants {
 		model: Config.general.idle.timeouts
 

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/Categories/General.qml

@@ -69,7 +69,7 @@ SettingsPage {
 
 		CustomSplitButtonRow {
 			active: Config.general.color.mode === "light" ? menuItems[0] : menuItems[1]
-			buttonAlias.disabled: !Config.general.color.schemeGeneration
+			enabled: Config.general.color.schemeGeneration
 			label: qsTr("Scheme mode")
 
 			menuItems: [
@@ -103,7 +103,7 @@ SettingsPage {
 			id: schemeType
 
 			active: root.schemeTypeItem(menuItems, Config.colors.schemeType)
-			buttonAlias.disabled: !Config.general.color.schemeGeneration
+			enabled: Config.general.color.schemeGeneration
 			label: qsTr("Scheme type")
 			z: 2
 

Modules/Settings/Categories/Lockscreen.qml

@@ -1,5 +1,6 @@
 import qs.Modules.Settings.Categories.Lockscreen
 import qs.Modules.Settings.Controls
+import qs.Helpers
 import qs.Config
 
 SettingsPage {

Modules/Settings/Categories/Screenshot.qml

@@ -20,7 +20,8 @@ SettingsPage {
 		}
 
 		CustomSplitButtonRow {
-			// active: true
+			active: Config.screenshot.mode === "manual" ? menuItems[0] : menuItems[1]
+			enabled: Config.screenshot.enable_pp
 			label: qsTr("Effects mode")
 
 			menuItems: [
@@ -43,88 +44,107 @@ SettingsPage {
 		}
 
 		Separator {
-			visible: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual"
+		}
+
+		SettingSwitch {
+			enabled: Config.screenshot.enable_pp
+			name: "Enable rounded corners"
+			object: Config.screenshot
+			setting: "rounding"
+			shouldBeActive: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.rounding
 		}
 
 		SettingSpinBox {
+			enabled: Config.screenshot.enable_pp
 			min: 0
 			name: "Corner radius"
 			object: Config.screenshot
-			setting: "corner_radius"
+			setting: "radius"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.rounding
 			step: 1
-			visible: Config.screenshot.mode === "manual"
 		}
 
 		Separator {
-			visible: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual"
 		}
 
 		SettingSwitch {
-			name: "Enable drop shadow"
+			enabled: Config.screenshot.enable_pp
+			name: "Enable shadow"
 			object: Config.screenshot
-			setting: "drop_shadow"
-			visible: Config.screenshot.mode === "manual"
+			setting: "shadow"
+			shouldBeActive: Config.screenshot.mode === "manual"
 		}
 
 		Separator {
-			visible: Config.screenshot.mode === "manual"
-		}
-
-		SettingSwitch {
-			name: "Enable rounded corners"
-			object: Config.screenshot
-			setting: "rounded_corners"
-			visible: Config.screenshot.mode === "manual"
-		}
-
-		Separator {
-			visible: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 		}
 
 		SettingSpinBox {
+			enabled: Config.screenshot.enable_pp
 			min: 0
-			name: "Shadow blur radius"
+			name: "Shadow blur amount"
 			object: Config.screenshot
-			setting: "shadow_blur_radius"
+			setting: "shadow_blur"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 			step: 1
-			visible: Config.screenshot.mode === "manual"
 		}
 
 		Separator {
-			visible: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 		}
 
-		SettingSwitch {
-			name: "Shadow color broken atm"
-			object: Config.Screenshot
-			setting: "shadow_color"
-			visible: Config.screenshot.mode === "manual"
-		}
+		// SettingSwitch {
+		// 	name: "Shadow color broken atm"
+		// 	object: Config.Screenshot
+		// 	setting: "shadow_color"
+		// 	shouldBeActive: Config.screenshot.mode === "manual"
+		// }
+		//
+		// Separator {
+		// 	shouldBeActive: Config.screenshot.mode === "manual"
+		// }
 
-		Separator {
-			visible: Config.screenshot.mode === "manual"
-		}
+		// SettingSpinBox {
+		// 	min: 1
+		// 	name: "Shadow passes"
+		// 	object: Config.screenshot
+		// 	setting: "shadow_blur_passes"
+		// 	shouldBeActive: Config.screenshot.mode === "manual"
+		// 	step: 1
+		// }
+		//
+		// Separator {
+		// 	shouldBeActive: Config.screenshot.mode === "manual"
+		// }
 
 		SettingSpinBox {
+			enabled: Config.screenshot.enable_pp
 			min: 0
 			name: "Shadow offset X"
 			object: Config.screenshot
 			setting: "shadow_offset_x"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 			step: 1
-			visible: Config.screenshot.mode === "manual"
 		}
 
 		Separator {
-			visible: Config.screenshot.mode === "manual"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 		}
 
 		SettingSpinBox {
+			enabled: Config.screenshot.enable_pp
 			min: 0
 			name: "Shadow offset Y"
 			object: Config.screenshot
 			setting: "shadow_offset_y"
+			shouldBeActive: Config.screenshot.mode === "manual" && Config.screenshot.shadow
 			step: 1
-			visible: Config.screenshot.mode === "manual"
 		}
 	}
 }

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,28 @@ 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;
 
@@ -125,10 +141,11 @@ Item {
 						id: zoomSlider
 
 						Layout.fillWidth: true
-						Layout.preferredHeight: 10
+						Layout.preferredHeight: 30
 						from: 1.0
+						implicitHeight: 30
 						to: 5.0
-						value: cropRect.zoom
+						value: cropRectLoader.item ? cropRectLoader.item.zoom : 1.0
 
 						onMoved: {
 							delegate.zoomClipRect(value);
@@ -156,15 +173,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,72 +199,87 @@ Item {
 						text: delegate.modelData.name
 					}
 
-					CustomRect {
-						id: cropRect
+					Loader {
+						id: cropRectLoader
 
-						property real aspectRatio: delegate.modelData.width / delegate.modelData.height
-						readonly property real baseHeight: baseWidth / aspectRatio
-						readonly property real baseWidth: {
-							let fittedHeight = scaledImg.paintedHeight;
-							let fittedWidth = fittedHeight * aspectRatio;
+						active: scaledImg.paintedWidth > 0 && scaledImg.status == Image.Ready
 
-							if (fittedWidth > scaledImg.paintedWidth) {
-								fittedWidth = scaledImg.paintedWidth;
-								fittedHeight = fittedWidth / aspectRatio;
-							}
+						sourceComponent: Component {
+							CustomRect {
+								id: cropRect
 
-							return fittedWidth;
-						}
-						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 aspectRatio: delegate.modelData.width / delegate.modelData.height
+								readonly property real baseHeight: baseWidth / aspectRatio
+								readonly property real baseWidth: {
+									let fittedHeight = scaledImg.paintedHeight;
+									let fittedWidth = fittedHeight * aspectRatio;
 
-						function centerInImage() {
-							x = imageX + (scaledImg.paintedWidth - width) / 2;
-							y = imageY + (scaledImg.paintedHeight - height) / 2;
-						}
+									if (fittedWidth > scaledImg.paintedWidth) {
+										fittedWidth = scaledImg.paintedWidth;
+										fittedHeight = fittedWidth / aspectRatio;
+									}
 
-						function clampToBounds() {
-							x = Math.max(imageX, Math.min(x, imageX + scaledImg.paintedWidth - width));
+									return fittedWidth;
+								}
+								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: 1.0
 
-							y = Math.max(imageY, Math.min(y, imageY + scaledImg.paintedHeight - height));
-						}
+								function centerInImage() {
+									x = imageX + (scaledImg.paintedWidth - width) / 2;
+									y = imageY + (scaledImg.paintedHeight - height) / 2;
+								}
 
-						function restoreFromData() {
-							let data = scaledImg.displayData;
+								function clampToBounds() {
+									x = Math.max(imageX, Math.min(x, imageX + scaledImg.paintedWidth - width));
 
-							if (data && data.scaledX !== 0 || data.scaledY !== 0 || data.scaledWidth !== 0 || data.scaledHeight !== 0) {
-								x = data.scaledX;
-								y = data.scaledY;
+									y = Math.max(imageY, Math.min(y, imageY + scaledImg.paintedHeight - height));
+								}
 
-								clampToBounds();
-							} else {
-								zoom = 1.0;
-								centerInImage();
+								function restoreFromData() {
+									let data = Wallpapers.getCrop(delegate.modelData.name);
+
+									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 {
+										zoom = 1.0;
+										centerInImage();
+									}
+								}
+
+								border.color: DynamicColors.palette.m3primary
+								border.width: 2
+								height: baseHeight / zoom
+								opacity: 1
+								width: baseWidth / zoom
+
+								Behavior on opacity {
+									Anim {
+									}
+								}
+
+								Component.onCompleted: {
+									restoreFromData();
+								}
+								onHeightChanged: clampToBounds()
+								onWidthChanged: clampToBounds()
 							}
 						}
-
-						border.color: DynamicColors.palette.m3primary
-						border.width: 2
-						height: baseHeight / zoom
-						opacity: 1
-						width: baseWidth / zoom
-
-						Behavior on opacity {
-							Anim {
-							}
-						}
-
-						Component.onCompleted: clampToBounds()
-						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/Popouts/AudioPopup.qml

@@ -52,25 +52,25 @@ Item {
 
 		CustomRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 50 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
 
-			RowLayout {
-				id: outputVolume
+			Item {
+				id: sinkIcon
 
+				anchors.bottom: parent.bottom
 				anchors.left: parent.left
-				anchors.margins: Appearance.spacing.smaller
-				anchors.right: parent.right
-				anchors.verticalCenter: parent.verticalCenter
-				spacing: 15
+				anchors.leftMargin: Appearance.padding.normal
+				anchors.top: parent.top
+				implicitWidth: childrenRect.width
 
 				CustomRect {
-					Layout.alignment: Qt.AlignVCenter
-					Layout.preferredHeight: 40
-					Layout.preferredWidth: 40
+					anchors.centerIn: parent
 					color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+					implicitHeight: 40
+					implicitWidth: 40
 					radius: Appearance.rounding.full
 
 					MaterialIcon {
@@ -92,45 +92,53 @@ Item {
 						}
 					}
 				}
+			}
 
-				ColumnLayout {
+			ColumnLayout {
+				anchors.bottom: parent.bottom
+				anchors.bottomMargin: Appearance.padding.smallest
+				anchors.left: sinkIcon.right
+				anchors.leftMargin: Appearance.spacing.normal
+				anchors.right: parent.right
+				anchors.rightMargin: Appearance.padding.large
+				anchors.top: parent.top
+				anchors.topMargin: Appearance.padding.smaller
+
+				RowLayout {
+					Layout.fillHeight: true
 					Layout.fillWidth: true
 
-					RowLayout {
+					CustomText {
+						Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 						Layout.fillWidth: true
-
-						CustomText {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-							Layout.fillWidth: true
-							text: "Output Volume"
-						}
-
-						CustomText {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-							font.bold: true
-							text: qsTr("%1").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`)
-						}
+						text: "Output Volume"
 					}
 
-					CustomMouseArea {
-						Layout.bottomMargin: 5
-						Layout.fillWidth: true
-						Layout.preferredHeight: 10
+					CustomText {
+						Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+						font.bold: true
+						text: qsTr("%1").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`)
+					}
+				}
 
-						CustomSlider {
-							anchors.left: parent.left
-							anchors.right: parent.right
-							color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-							implicitHeight: 10
-							value: Audio.volume
+				CustomMouseArea {
+					Layout.bottomMargin: 5
+					Layout.fillHeight: true
+					Layout.fillWidth: true
 
-							Behavior on value {
-								Anim {
-								}
+					CustomSlider {
+						anchors.left: parent.left
+						anchors.right: parent.right
+						color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+						implicitHeight: parent.height
+						value: Audio.volume
+
+						Behavior on value {
+							Anim {
 							}
-
-							onMoved: Audio.setVolume(value)
 						}
+
+						onMoved: Audio.setVolume(value)
 					}
 				}
 			}
@@ -138,7 +146,7 @@ Item {
 
 		CustomClippingRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 50 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
@@ -165,20 +173,20 @@ Item {
 				}
 			}
 
-			RowLayout {
-				id: inputVolume
+			Item {
+				id: sourceIcon
 
+				anchors.bottom: parent.bottom
 				anchors.left: parent.left
-				anchors.margins: Appearance.spacing.smaller
-				anchors.right: parent.right
-				anchors.verticalCenter: parent.verticalCenter
-				spacing: 15
+				anchors.leftMargin: Appearance.padding.normal
+				anchors.top: parent.top
+				implicitWidth: childrenRect.width
 
 				CustomRect {
-					Layout.alignment: Qt.AlignVCenter
-					Layout.preferredHeight: 40
-					Layout.preferredWidth: 40
+					anchors.centerIn: parent
 					color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+					implicitHeight: 40
+					implicitWidth: 40
 					radius: Appearance.rounding.full
 
 					MaterialIcon {
@@ -200,46 +208,53 @@ Item {
 						}
 					}
 				}
+			}
 
-				ColumnLayout {
+			ColumnLayout {
+				anchors.bottom: parent.bottom
+				anchors.bottomMargin: Appearance.padding.smallest
+				anchors.left: sourceIcon.right
+				anchors.leftMargin: Appearance.spacing.normal
+				anchors.right: parent.right
+				anchors.rightMargin: Appearance.padding.large
+				anchors.top: parent.top
+				anchors.topMargin: Appearance.padding.smaller
+
+				RowLayout {
+					Layout.fillHeight: true
 					Layout.fillWidth: true
 
-					RowLayout {
-						Layout.fillHeight: true
+					CustomText {
+						Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 						Layout.fillWidth: true
-
-						CustomText {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-							Layout.fillWidth: true
-							text: "Input Volume"
-						}
-
-						CustomText {
-							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-							font.bold: true
-							text: qsTr("%1").arg(Audio.sourceMuted ? qsTr("Muted") : `${Math.round(Audio.sourceVolume * 100)}%`)
-						}
+						text: "Input Volume"
 					}
 
-					CustomMouseArea {
-						Layout.bottomMargin: 5
-						Layout.fillWidth: true
-						implicitHeight: 10
+					CustomText {
+						Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+						font.bold: true
+						text: qsTr("%1").arg(Audio.sourceMuted ? qsTr("Muted") : `${Math.round(Audio.sourceVolume * 100)}%`)
+					}
+				}
 
-						CustomSlider {
-							anchors.left: parent.left
-							anchors.right: parent.right
-							color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-							implicitHeight: 10
-							value: Audio.sourceVolume
+				CustomMouseArea {
+					Layout.bottomMargin: 5
+					Layout.fillHeight: true
+					Layout.fillWidth: true
 
-							Behavior on value {
-								Anim {
-								}
+					CustomSlider {
+						anchors.left: parent.left
+						anchors.right: parent.right
+						color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+						implicitHeight: parent.height
+						value: Audio.sourceVolume
+
+						Behavior on value {
+							Anim {
 							}
-
-							onMoved: Audio.setSourceVolume(value)
 						}
+
+						onMoved: Audio.setSourceVolume(value)
 					}
 				}
 			}
@@ -265,7 +280,7 @@ Item {
 				required property var modelData
 
 				Layout.fillWidth: true
-				Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
+				Layout.preferredHeight: 50 + Appearance.spacing.smaller * 2
 				Layout.topMargin: root.topMargin
 				color: DynamicColors.tPalette.m3surfaceContainer
 				radius: root.rounding
@@ -292,18 +307,20 @@ Item {
 					}
 				}
 
-				RowLayout {
-					id: layoutVolume
+				Item {
+					id: appBoxIcon
 
-					anchors.fill: parent
-					anchors.margins: Appearance.spacing.smaller
-					spacing: 15
+					anchors.bottom: parent.bottom
+					anchors.left: parent.left
+					anchors.leftMargin: Appearance.padding.normal
+					anchors.top: parent.top
+					implicitWidth: childrenRect.width
 
 					CustomRect {
-						Layout.alignment: Qt.AlignVCenter
-						Layout.preferredHeight: 40
-						Layout.preferredWidth: 40
+						anchors.centerIn: parent
 						color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+						implicitHeight: 40
+						implicitWidth: 40
 						radius: Appearance.rounding.full
 
 						MaterialIcon {
@@ -325,55 +342,58 @@ Item {
 							}
 						}
 					}
+				}
 
-					ColumnLayout {
-						Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+				TextMetrics {
+					id: metrics
+
+					elide: Text.ElideRight
+					elideWidth: root.width - 50
+					text: Audio.getStreamName(appBox.modelData)
+				}
+
+				ColumnLayout {
+					anchors.bottom: parent.bottom
+					anchors.bottomMargin: Appearance.padding.smallest
+					anchors.left: appBoxIcon.right
+					anchors.leftMargin: Appearance.spacing.normal
+					anchors.right: parent.right
+					anchors.rightMargin: Appearance.padding.large
+					anchors.top: parent.top
+					anchors.topMargin: Appearance.padding.smaller
+
+					RowLayout {
 						Layout.fillHeight: true
+						Layout.fillWidth: true
 
-						TextMetrics {
-							id: metrics
-
-							elide: Text.ElideRight
-							elideWidth: root.width - 50
-							text: Audio.getStreamName(appBox.modelData)
-						}
-
-						RowLayout {
-							Layout.fillHeight: true
-							Layout.fillWidth: true
-
-							CustomText {
-								Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-								Layout.fillHeight: true
-								Layout.fillWidth: true
-								elide: Text.ElideRight
-								text: metrics.elidedText
-							}
-
-							CustomText {
-								Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-								Layout.fillHeight: true
-								font.bold: true
-								text: qsTr("%1").arg(appBox.modelData.audio.muted ? qsTr("Muted") : `${Math.round(appBox.modelData.audio.volume * 100)}%`)
-							}
-						}
-
-						CustomMouseArea {
+						CustomText {
 							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-							Layout.fillHeight: true
 							Layout.fillWidth: true
-							implicitHeight: 10
+							elide: Text.ElideRight
+							text: metrics.elidedText
+						}
 
-							CustomSlider {
-								anchors.left: parent.left
-								anchors.right: parent.right
-								color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-								implicitHeight: 10
-								value: appBox.modelData.audio.volume
+						CustomText {
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+							font.bold: true
+							text: qsTr("%1").arg(appBox.modelData.audio.muted ? qsTr("Muted") : `${Math.round(appBox.modelData.audio.volume * 100)}%`)
+						}
+					}
 
-								onMoved: {
-									Audio.setStreamVolume(appBox.modelData, value);
-								}
+					CustomMouseArea {
+						Layout.bottomMargin: 5
+						Layout.fillHeight: true
+						Layout.fillWidth: true
+
+						CustomSlider {
+							anchors.left: parent.left
+							anchors.right: parent.right
+							color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+							implicitHeight: parent.height
+							value: appBox.modelData.audio.volume
+
+							onMoved: {
+								Audio.setStreamVolume(appBox.modelData, value);
 							}
 						}
 					}

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/SysTray/Widgets/UPowerWidget.qml

@@ -3,33 +3,120 @@ import QtQuick
 import QtQuick.Layouts
 import qs.Components
 import qs.Config
-import qs.Helpers as Helpers
+import qs.Helpers
 
-RowLayout {
+Item {
 	id: root
 
-	MaterialIcon {
-		Layout.alignment: Qt.AlignVCenter
-		animate: true
-		color: !Helpers.UPower.onBattery || UPower.displayDevice.percentage > 0.2 ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3error
-		fill: 1
-		text: {
-			if (!Helpers.UPower.displayDevice.isLaptopBattery) {
-				if (PowerProfiles.profile === PowerProfile.PowerSaver)
-					return "nest_eco_leaf";
-				if (PowerProfiles.profile === PowerProfile.Performance)
-					return "bolt";
-				return "power_settings_new";
+	implicitHeight: Battery.isLaptop ? batteryIconLoader.item.implicitHeight : upowerIconLoader.item.implicitHeight
+	implicitWidth: Battery.isLaptop ? batteryIconLoader.item.implicitWidth : upowerIconLoader.item.implicitWidth
+
+	Loader {
+		id: batteryIconLoader
+
+		active: Battery.isLaptop
+		anchors.centerIn: parent
+
+		sourceComponent: Row {
+			id: batteryIcon
+
+			property real batHeight: 16
+			property real batWidth: 30
+			property real nubHeight: 6
+			property real nubWidth: 2
+			property real radius: Appearance.rounding.smallest / 2
+
+			spacing: 1
+
+			CustomRect {
+				id: track
+
+				anchors.verticalCenter: parent.verticalCenter
+				color: Battery.colors.bg
+				height: batteryIcon.batHeight
+				radius: batteryIcon.radius
+				width: batteryIcon.batWidth
+
+				CustomText {
+					color: Battery.colors.fg
+					font.pointSize: Appearance.font.size.larger / 1.5
+					font.weight: 800
+					height: track.height
+					horizontalAlignment: Text.AlignHCenter
+					text: Math.round(Battery.currentPerc * 100)
+					verticalAlignment: Text.AlignVCenter
+					width: track.width
+				}
+
+				Item {
+					clip: true
+					width: parent.width * Battery.currentPerc
+
+					anchors {
+						bottom: parent.bottom
+						left: parent.left
+						top: parent.top
+					}
+
+					CustomRect {
+						id: fill
+
+						color: Battery.colors.fg
+						height: track.height
+						radius: track.radius
+						width: track.width
+
+						CustomText {
+							id: batteryLabel
+
+							clip: true
+							color: Battery.colors.bg
+							font.pointSize: 7.5
+							font.weight: 800
+							height: track.height
+							horizontalAlignment: Text.AlignHCenter
+							text: Math.round(Battery.currentPerc * 100)
+							verticalAlignment: Text.AlignVCenter
+							width: track.width
+						}
+					}
+				}
 			}
 
-			const perc = Helpers.UPower.displayDevice.percentage;
-			const charging = [UPowerDeviceState.Charging, UPowerDeviceState.FullyCharged, UPowerDeviceState.PendingCharge].includes(Helpers.UPower.displayDevice.state);
-			if (perc === 1)
-				return charging ? "battery_charging_full" : "battery_full";
-			let level = Math.floor(perc * 7);
-			if (charging && (level === 4 || level === 1))
-				level--;
-			return charging ? `battery_charging_${(level + 3) * 10}` : `battery_${level}_bar`;
+			CustomRect {
+				id: nub
+
+				anchors.verticalCenter: parent.verticalCenter
+				bottomRightRadius: 20
+				color: Battery.currentPerc < 0.99 ? track.color : fill.color
+				height: batteryIcon.nubHeight
+				topRightRadius: 20
+				width: batteryIcon.nubWidth
+			}
+		}
+	}
+
+	Loader {
+		id: upowerIconLoader
+
+		active: !Battery.isLaptop
+		anchors.centerIn: parent
+
+		sourceComponent: RowLayout {
+			id: upowerIcon
+
+			MaterialIcon {
+				Layout.alignment: Qt.AlignVCenter
+				animate: true
+				fill: 1
+				text: {
+					if (PowerProfiles.profile === PowerProfile.PowerSaver)
+						return "nest_eco_leaf";
+					if (PowerProfiles.profile === PowerProfile.Performance)
+						return "bolt";
+					return "power_settings_new";
+				}
+			}
 		}
 	}
 }

Modules/Updates/UpdatesPopout.qml

@@ -11,150 +11,161 @@ 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 {
-		id: noUpdates
+	Loader {
+		id: noUpdatesLoader
 
+		active: !root.hasUpdates
 		anchors.centerIn: parent
-		height: 200
-		visible: script.values.length === 0
-		width: 600
 
-		MaterialIcon {
-			id: noUpdatesIcon
+		sourceComponent: Item {
+			id: noUpdates
 
-			anchors.horizontalCenter: parent.horizontalCenter
-			anchors.top: parent.top
-			color: DynamicColors.tPalette.m3onSurfaceVariant
-			font.pointSize: Appearance.font.size.extraLarge * 3
-			horizontalAlignment: Text.AlignHCenter
-			text: "check"
-		}
+			height: 200
+			width: 300
 
-		CustomText {
-			anchors.horizontalCenter: parent.horizontalCenter
-			anchors.top: noUpdatesIcon.bottom
-			color: DynamicColors.tPalette.m3onSurfaceVariant
-			horizontalAlignment: Text.AlignHCenter
-			text: qsTr("No updates available")
-			verticalAlignment: Text.AlignVCenter
+			MaterialIcon {
+				id: noUpdatesIcon
+
+				anchors.horizontalCenter: parent.horizontalCenter
+				anchors.top: parent.top
+				color: DynamicColors.tPalette.m3onSurfaceVariant
+				font.pointSize: Appearance.font.size.extraLarge * 3
+				horizontalAlignment: Text.AlignHCenter
+				text: "check"
+			}
+
+			CustomText {
+				anchors.horizontalCenter: parent.horizontalCenter
+				anchors.top: noUpdatesIcon.bottom
+				color: DynamicColors.tPalette.m3onSurfaceVariant
+				horizontalAlignment: Text.AlignHCenter
+				text: qsTr("No updates available")
+				verticalAlignment: Text.AlignVCenter
+			}
 		}
 	}
 
-	CustomListView {
-		id: updatesList
+	Loader {
+		id: updatesListLoader
 
+		active: root.hasUpdates
 		anchors.centerIn: parent
-		contentHeight: childrenRect.height
-		contentWidth: 600
-		displayMarginBeginning: root.itemHeight
-		displayMarginEnd: root.itemHeight
-		implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
-		implicitWidth: contentWidth
-		spacing: Appearance.spacing.normal
-		visible: script.values.length > 0
 
-		delegate: CustomRect {
-			id: update
+		sourceComponent: CustomListView {
+			id: updatesList
 
-			required property var modelData
-			readonly property list<string> sections: modelData.update.split(" ")
+			contentHeight: childrenRect.height
+			contentWidth: 600
+			displayMarginBeginning: root.itemHeight
+			displayMarginEnd: root.itemHeight
+			implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
+			implicitWidth: contentWidth
+			spacing: Appearance.spacing.normal
 
-			// anchors.left: parent.left
-			// anchors.right: parent.right
-			color: DynamicColors.tPalette.m3surfaceContainer
-			implicitHeight: root.itemHeight
-			implicitWidth: 600
-			radius: Appearance.rounding.small - Appearance.padding.small
+			delegate: CustomRect {
+				id: update
 
-			RowLayout {
-				anchors.fill: parent
-				anchors.leftMargin: Appearance.padding.smaller
-				anchors.rightMargin: Appearance.padding.smaller
+				required property var modelData
+				readonly property list<string> sections: modelData.update.split(" ")
 
-				MaterialIcon {
-					font.pointSize: Appearance.font.size.large * 2
-					text: "package_2"
-				}
-
-				ColumnLayout {
-					Layout.fillWidth: true
-
-					CustomText {
-						Layout.fillWidth: true
-						Layout.preferredHeight: 25
-						elide: Text.ElideRight
-						font.pointSize: Appearance.font.size.large
-						text: update.sections[0]
-					}
-
-					CustomText {
-						Layout.fillWidth: true
-						color: DynamicColors.palette.m3onSurfaceVariant
-						text: Updates.formatUpdateTime(update.modelData.timestamp)
-					}
-				}
+				// anchors.left: parent.left
+				// anchors.right: parent.right
+				color: DynamicColors.tPalette.m3surfaceContainer
+				implicitHeight: root.itemHeight
+				implicitWidth: 600
+				radius: Appearance.rounding.small - Appearance.padding.small
 
 				RowLayout {
-					Layout.fillHeight: true
-					Layout.preferredWidth: 300
-
-					MarqueeText {
-						id: versionFrom
-
-						Layout.fillHeight: true
-						Layout.preferredWidth: 125
-						animate: true
-						color: DynamicColors.palette.m3tertiary
-						font.pointSize: Appearance.font.size.large
-						horizontalAlignment: Text.AlignHCenter
-						marqueeEnabled: true
-						pauseMs: 4000
-						text: update.sections[1]
-						width: 125
-					}
+					anchors.fill: parent
+					anchors.leftMargin: Appearance.padding.smaller
+					anchors.rightMargin: Appearance.padding.smaller
 
 					MaterialIcon {
-						Layout.fillHeight: true
-						color: DynamicColors.palette.m3secondary
-						font.pointSize: Appearance.font.size.extraLarge
-						horizontalAlignment: Text.AlignHCenter
-						text: "arrow_right_alt"
-						verticalAlignment: Text.AlignVCenter
+						font.pointSize: Appearance.font.size.large * 2
+						text: "package_2"
 					}
 
-					MarqueeText {
-						id: versionTo
+					ColumnLayout {
+						Layout.fillWidth: true
 
+						CustomText {
+							Layout.fillWidth: true
+							Layout.preferredHeight: 25
+							elide: Text.ElideRight
+							font.pointSize: Appearance.font.size.large
+							text: update.sections[0]
+						}
+
+						CustomText {
+							Layout.fillWidth: true
+							color: DynamicColors.palette.m3onSurfaceVariant
+							text: Updates.formatUpdateTime(update.modelData.timestamp)
+						}
+					}
+
+					RowLayout {
 						Layout.fillHeight: true
-						Layout.preferredWidth: 120
-						animate: true
-						color: DynamicColors.palette.m3primary
-						font.pointSize: Appearance.font.size.large
-						horizontalAlignment: Text.AlignHCenter
-						marqueeEnabled: true
-						pauseMs: 4000
-						text: update.sections[3]
-						width: 125
+						Layout.preferredWidth: 300
+
+						MarqueeText {
+							id: versionFrom
+
+							Layout.fillHeight: true
+							Layout.preferredWidth: 125
+							animate: true
+							color: DynamicColors.palette.m3tertiary
+							font.pointSize: Appearance.font.size.large
+							horizontalAlignment: Text.AlignHCenter
+							marqueeEnabled: true
+							pauseMs: 4000
+							text: update.sections[1]
+							width: 125
+						}
+
+						MaterialIcon {
+							Layout.fillHeight: true
+							color: DynamicColors.palette.m3secondary
+							font.pointSize: Appearance.font.size.extraLarge
+							horizontalAlignment: Text.AlignHCenter
+							text: "arrow_right_alt"
+							verticalAlignment: Text.AlignVCenter
+						}
+
+						MarqueeText {
+							id: versionTo
+
+							Layout.fillHeight: true
+							Layout.preferredWidth: 120
+							animate: true
+							color: DynamicColors.palette.m3primary
+							font.pointSize: Appearance.font.size.large
+							horizontalAlignment: Text.AlignHCenter
+							marqueeEnabled: true
+							pauseMs: 4000
+							text: update.sections[3]
+							width: 125
+						}
 					}
 				}
 			}
-		}
-		model: ScriptModel {
-			id: script
+			model: ScriptModel {
+				id: script
 
-			objectProp: "update"
-			values: Object.entries(Updates.updates).sort((a, b) => b[1] - a[1]).map(([update, timestamp]) => ({
-						update,
-						timestamp
-					}))
+				objectProp: "update"
+				values: Object.entries(Updates.updates).sort((a, b) => b[1] - a[1]).map(([update, timestamp]) => ({
+							update,
+							timestamp
+						}))
+			}
 		}
 	}
 }

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/Blobs/blobgroup.hpp

@@ -18,13 +18,13 @@ public:
 explicit BlobGroup(QObject* parent = nullptr);
 ~BlobGroup() override;
 
-qreal smoothing() const {
+[[nodiscard]] qreal smoothing() const {
 	return m_smoothing;
 }
 
 void setSmoothing(qreal s);
 
-QColor color() const {
+[[nodiscard]] QColor color() const {
 	return m_color;
 }
 
@@ -36,11 +36,11 @@ void removeShape(BlobShape* shape);
 void setInvertedRect(BlobInvertedRect* rect);
 void clearInvertedRect(BlobInvertedRect* rect);
 
-const QList<BlobShape*>& shapes() const {
+[[nodiscard]] const QList<BlobShape*>& shapes() const {
 	return m_shapes;
 }
 
-BlobInvertedRect* invertedRect() const {
+[[nodiscard]] BlobInvertedRect* invertedRect() const {
 	return m_invertedRect;
 }
 

Plugins/ZShell/Blobs/blobinvertedrect.hpp

@@ -16,25 +16,25 @@ public:
 explicit BlobInvertedRect(QQuickItem* parent = nullptr);
 ~BlobInvertedRect() override;
 
-qreal borderLeft() const {
+[[nodiscard]] qreal borderLeft() const {
 	return m_borderLeft;
 }
 
 void setBorderLeft(qreal v);
 
-qreal borderRight() const {
+[[nodiscard]] qreal borderRight() const {
 	return m_borderRight;
 }
 
 void setBorderRight(qreal v);
 
-qreal borderTop() const {
+[[nodiscard]] qreal borderTop() const {
 	return m_borderTop;
 }
 
 void setBorderTop(qreal v);
 
-qreal borderBottom() const {
+[[nodiscard]] qreal borderBottom() const {
 	return m_borderBottom;
 }
 
@@ -47,7 +47,7 @@ void borderTopChanged();
 void borderBottomChanged();
 
 protected:
-bool isInvertedRect() const override {
+[[nodiscard]] bool isInvertedRect() const override {
 	return true;
 }
 

Plugins/ZShell/Blobs/blobmaterial.hpp

@@ -21,8 +21,8 @@ struct BlobRectData {
 
 class BlobMaterial : public QSGMaterial {
 public:
-QSGMaterialType* type() const override;
-QSGMaterialShader* createShader(QSGRendererInterface::RenderMode) const override;
+[[nodiscard]] QSGMaterialType* type() const override;
+[[nodiscard]] QSGMaterialShader* createShader(QSGRendererInterface::RenderMode) const override;
 int compare(const QSGMaterial* other) const override;
 
 float m_paddedX = 0;

Plugins/ZShell/Blobs/blobrect.cpp

@@ -14,15 +14,11 @@ BlobRect::~BlobRect() {
 }
 
 void BlobRect::updatePolish() {
-	BlobShape::updatePolish();
-
 	if (m_physicsActive) {
-		// Check if deformation is visually imperceptible
 		float totalDelta = std::abs(m_dm00 - 1.0f) + std::abs(m_dm01) + std::abs(m_dm11 - 1.0f);
 		float totalVel = std::abs(m_dmVel00) + std::abs(m_dmVel01) + std::abs(m_dmVel11);
 
 		if (totalDelta < 0.004f && totalVel < 0.05f) {
-			// Snap to rest, no visible deformation
 			m_dm00 = 1.0f;
 			m_dm01 = 0.0f;
 			m_dm11 = 1.0f;
@@ -31,6 +27,16 @@ void BlobRect::updatePolish() {
 			emit rawDeformMatrixChanged();
 			updateCenteredDeformMatrix();
 			m_physicsActive = false;
+
+			if (m_group) {
+				QMetaObject::invokeMethod(
+					this,
+					[this]() {
+					if (m_group)
+						m_group->markDirty();
+				},
+					Qt::QueuedConnection);
+			}
 		} else {
 			QMetaObject::invokeMethod(
 				this,
@@ -41,6 +47,8 @@ void BlobRect::updatePolish() {
 				Qt::QueuedConnection);
 		}
 	}
+
+	BlobShape::updatePolish();
 }
 
 void BlobRect::updatePhysics() {
@@ -56,7 +64,6 @@ void BlobRect::updatePhysics() {
 	const float dt = static_cast<float>(m_elapsed.restart()) / 1000.0f;
 	if (dt > 0.1f || dt < 0.001f) {
 		m_prevScenePos = scenePos;
-		// Still check atRest on skipped frames to avoid getting stuck
 		if (m_physicsActive)
 			checkAtRest(0.0f);
 		return;
@@ -74,8 +81,6 @@ void BlobRect::updatePhysics() {
 		m_physicsActive = true;
 	}
 
-	// Compute target deformation matrix from velocity
-	// R(θ) * diag(stretch, compress) * R(θ)^T
 	const float kStretchFactor = static_cast<float>(m_deformScale);
 	constexpr float kMaxStretch = 0.35f;
 
@@ -98,7 +103,6 @@ void BlobRect::updatePhysics() {
 		target11 = targetStretch * sin2 + targetCompress * cos2;
 	}
 
-	// Underdamped spring on each matrix component
 	const float kStiffness = static_cast<float>(m_stiffness);
 	const float kDamping = static_cast<float>(m_damping);
 
@@ -238,9 +242,19 @@ void BlobRect::checkAtRest(float speed) {
 		m_dmVel00 = 0.0f;
 		m_dmVel01 = 0.0f;
 		m_dmVel11 = 0.0f;
-		m_deformMatrix = QMatrix4x4(); // identity
+		m_deformMatrix = QMatrix4x4();
 		emit rawDeformMatrixChanged();
 		updateCenteredDeformMatrix();
 		m_physicsActive = false;
+
+		if (m_group) {
+			QMetaObject::invokeMethod(
+				this,
+				[this]() {
+				if (m_group)
+					m_group->markDirty();
+			},
+				Qt::QueuedConnection);
+		}
 	}
 }

Plugins/ZShell/Blobs/blobrect.hpp

@@ -24,7 +24,7 @@ public:
 explicit BlobRect(QQuickItem* parent = nullptr);
 ~BlobRect() override;
 
-qreal stiffness() const {
+[[nodiscard]] qreal stiffness() const {
 	return m_stiffness;
 }
 
@@ -35,7 +35,7 @@ void setStiffness(qreal s) {
 	}
 }
 
-qreal damping() const {
+[[nodiscard]] qreal damping() const {
 	return m_damping;
 }
 
@@ -46,7 +46,7 @@ void setDamping(qreal d) {
 	}
 }
 
-qreal deformScale() const {
+[[nodiscard]] qreal deformScale() const {
 	return m_deformScale;
 }
 
@@ -62,25 +62,25 @@ QQmlListProperty<BlobRect> exclude();
 bool isExcluded(const BlobShape* other) const override;
 void cornerRadii(float out[4]) const override;
 
-qreal topLeftRadius() const {
+[[nodiscard]] qreal topLeftRadius() const {
 	return m_topLeftRadius;
 }
 
 void setTopLeftRadius(qreal r);
 
-qreal topRightRadius() const {
+[[nodiscard]] qreal topRightRadius() const {
 	return m_topRightRadius;
 }
 
 void setTopRightRadius(qreal r);
 
-qreal bottomLeftRadius() const {
+[[nodiscard]] qreal bottomLeftRadius() const {
 	return m_bottomLeftRadius;
 }
 
 void setBottomLeftRadius(qreal r);
 
-qreal bottomRightRadius() const {
+[[nodiscard]] qreal bottomRightRadius() const {
 	return m_bottomRightRadius;
 }
 

Plugins/ZShell/Blobs/blobshape.cpp

@@ -9,7 +9,6 @@
 #include <cmath>
 
 static float deformPadding(const QMatrix4x4& dm, float hw, float hh) {
-	// Bounding box of the deformed shape: |M * corners|
 	const float dm00 = dm(0, 0), dm01 = dm(0, 1);
 	const float dm10 = dm(1, 0), dm11 = dm(1, 1);
 	const float boundX = std::abs(dm00) * hw + std::abs(dm01) * hh;
@@ -69,16 +68,17 @@ void BlobShape::geometryChange(const QRectF& newGeometry, const QRectF& oldGeome
 	QQuickItem::geometryChange(newGeometry, oldGeometry);
 	updateCenteredDeformMatrix();
 	if (m_group) {
-		// Accumulate sub-pixel drift so slow movements don't desync the shader
 		m_pendingDx += static_cast<float>(newGeometry.x() - oldGeometry.x());
 		m_pendingDy += static_cast<float>(newGeometry.y() - oldGeometry.y());
-		// Accumulate size delta across multiple frames so incremental size
-		// changes that are each below the threshold still trigger a dirty
-		// mark once their accumulated delta exceeds it.
 		m_pendingDw += static_cast<float>(newGeometry.width() - oldGeometry.width());
 		m_pendingDh += static_cast<float>(newGeometry.height() - oldGeometry.height());
-		if (std::abs(m_pendingDx) > 0.5f || std::abs(m_pendingDy) > 0.5f ||
-		    std::abs(m_pendingDw) > 0.5f || std::abs(m_pendingDh) > 0.5f) {
+
+		const float deformMag = std::abs(m_deformMatrix(0, 0) - 1.0f) + std::abs(m_deformMatrix(0, 1)) +
+		                        std::abs(m_deformMatrix(1, 0)) + std::abs(m_deformMatrix(1, 1) - 1.0f);
+		const float syncThreshold = deformMag > 0.001f ? 0.05f : 0.5f;
+
+		if (std::abs(m_pendingDx) > syncThreshold || std::abs(m_pendingDy) > syncThreshold ||
+		    std::abs(m_pendingDw) > syncThreshold || std::abs(m_pendingDh) > syncThreshold) {
 			m_pendingDx = 0;
 			m_pendingDy = 0;
 			m_pendingDw = 0;
@@ -124,7 +124,6 @@ void BlobShape::updatePolish() {
 	if (!m_group)
 		return;
 
-	// Ensure all shapes have up-to-date physics (only once per frame)
 	m_group->ensurePhysicsUpdated();
 
 	const QPointF scenePos = mapToScene(QPointF(0, 0));
@@ -149,13 +148,11 @@ void BlobShape::updatePolish() {
 		                           width() + 2.0 * static_cast<double>(totalPad), height() + 2.0 * static_cast<double>(totalPad));
 	}
 
-	// Filter nearby normal rects
 	m_cachedRects.clear();
 	m_cachedMyIndex = -2;
 	const QRectF myPadded(static_cast<double>(m_cachedPaddedX), static_cast<double>(m_cachedPaddedY),
 	                      static_cast<double>(m_cachedPaddedW), static_cast<double>(m_cachedPaddedH));
 
-	// Track shape pointers parallel to m_cachedRects for pairwise exclusion lookups
 	QVector<BlobShape*> rectShapes;
 	rectShapes.reserve(m_group->shapes().size());
 
@@ -163,7 +160,6 @@ void BlobShape::updatePolish() {
 		if (other->isInvertedRect())
 			continue;
 
-		// Skip zero-size rects
 		if (other->width() <= 0 || other->height() <= 0)
 			continue;
 
@@ -202,7 +198,6 @@ void BlobShape::updatePolish() {
 			r.offsetX = dm(0, 3);
 			r.offsetY = dm(1, 3);
 
-			// Pre-compute inverse deformation matrix
 			const float det = a * d - c * b;
 			const float invDet = std::abs(det) > 1e-6f ? 1.0f / det : 1.0f;
 			r.invDeform[0] = d * invDet;
@@ -210,12 +205,10 @@ void BlobShape::updatePolish() {
 			r.invDeform[2] = -c * invDet;
 			r.invDeform[3] = a * invDet;
 
-			// Pre-compute minimum eigenvalue (avoids per-pixel sqrt)
 			const float halfTr = 0.5f * (a + d);
 			const float halfDiff = 0.5f * (a - d);
 			r.minEig = halfTr - std::sqrt(halfDiff * halfDiff + c * c);
 
-			// Pre-compute screen-space AABB half-extents
 			r.screenHalfX = std::abs(a) * r.hw + std::abs(c) * r.hh;
 			r.screenHalfY = std::abs(b) * r.hw + std::abs(d) * r.hh;
 
@@ -227,8 +220,6 @@ void BlobShape::updatePolish() {
 	if (isInvertedRect())
 		m_cachedMyIndex = -1;
 
-	// Compute pairwise exclude masks. Bit j in entry i is set iff rect i excludes rect j
-	// or rect j excludes rect i. The shader uses this to avoid smin between excluded pairs.
 	const auto cachedCount = m_cachedRects.size();
 	for (qsizetype i = 0; i < cachedCount; ++i) {
 		int mask = 0;
@@ -243,7 +234,6 @@ void BlobShape::updatePolish() {
 		m_cachedRects[i].excludeMask = mask;
 	}
 
-	// Cache inverted rect data
 	m_cachedHasInverted = false;
 	m_cachedInvertedRadius = 0;
 	memset(m_cachedInvertedOuter, 0, sizeof(m_cachedInvertedOuter));
@@ -262,7 +252,6 @@ void BlobShape::updatePolish() {
 		const float innerHW = outerHW - static_cast<float>((inv->borderLeft() + inv->borderRight()) / 2.0);
 		const float innerHH = outerHH - static_cast<float>((inv->borderTop() + inv->borderBottom()) / 2.0);
 
-		// Check if this rect is near the border (within 2x smoothing of inner edge)
 		bool nearBorder = isInvertedRect();
 		if (!nearBorder) {
 			const float margin = pad * 2.0f;
@@ -270,7 +259,6 @@ void BlobShape::updatePolish() {
 			const float myCY = m_cachedPaddedY + m_cachedPaddedH * 0.5f;
 			const float myHW = m_cachedPaddedW * 0.5f;
 			const float myHH = m_cachedPaddedH * 0.5f;
-			// Near border if any edge of padded rect is within margin of inner edge
 			nearBorder = (myCX - myHW < innerCX - innerHW + margin) || (myCX + myHW > innerCX + innerHW - margin) ||
 			             (myCY - myHH < innerCY - innerHH + margin) || (myCY + myHH > innerCY + innerHH - margin);
 		}
@@ -291,7 +279,6 @@ void BlobShape::updatePolish() {
 		}
 	}
 
-	// Pre-compute effective per-corner radii (moves O(N²) work from GPU to CPU)
 	const float smoothFactor = pad;
 	constexpr float minR = 2.0f;
 	const auto rectCount = m_cachedRects.size();
@@ -328,7 +315,6 @@ void BlobShape::updatePolish() {
 			fTl = std::min(fTl, cpuSmoothstep(0.0f, smoothFactor, -cpuSdBox(cTlX, cTlY, icx, icy, ihw, ihh)));
 		}
 
-		// Combine base radii with fill factors into effective per-corner radii
 		ri.radius[0] = std::max(ri.radius[0] * fTr, minR);
 		ri.radius[1] = std::max(ri.radius[1] * fBr, minR);
 		ri.radius[2] = std::max(ri.radius[2] * fBl, minR);
@@ -357,7 +343,6 @@ QSGNode* BlobShape::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) {
 		node->setFlag(QSGNode::OwnsMaterial);
 	}
 
-	// Update geometry
 	auto* geometry = node->geometry();
 	auto* v = geometry->vertexDataAsTexturedPoint2D();
 
@@ -373,7 +358,6 @@ QSGNode* BlobShape::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) {
 
 	node->markDirty(QSGNode::DirtyGeometry);
 
-	// Update material
 	auto* material = static_cast<BlobMaterial*>(node->material());
 	material->m_paddedX = m_cachedPaddedX;
 	material->m_paddedY = m_cachedPaddedY;

Plugins/ZShell/Blobs/blobshape.hpp

@@ -21,23 +21,23 @@ public:
 explicit BlobShape(QQuickItem* parent = nullptr);
 ~BlobShape() override = default;
 
-BlobGroup* group() const {
+[[nodiscard]] BlobGroup* group() const {
 	return m_group;
 }
 
 void setGroup(BlobGroup* g);
 
-qreal radius() const {
+[[nodiscard]] qreal radius() const {
 	return m_radius;
 }
 
 void setRadius(qreal r);
 
-QMatrix4x4 deformMatrix() const {
+[[nodiscard]] QMatrix4x4 deformMatrix() const {
 	return m_centeredDeformMatrix;
 }
 
-QMatrix4x4 rawDeformMatrix() const {
+[[nodiscard]] QMatrix4x4 rawDeformMatrix() const {
 	return m_deformMatrix;
 }
 
@@ -53,7 +53,7 @@ void geometryChange(const QRectF& newGeometry, const QRectF& oldGeometry) overri
 void updatePolish() override;
 QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) override;
 
-virtual bool isInvertedRect() const {
+[[nodiscard]] virtual bool isInvertedRect() const {
 	return false;
 }
 
@@ -72,10 +72,9 @@ void updateCenteredDeformMatrix();
 
 BlobGroup* m_group = nullptr;
 qreal m_radius = 0;
-QMatrix4x4 m_deformMatrix;     // identity by default
+QMatrix4x4 m_deformMatrix;
 QMatrix4x4 m_centeredDeformMatrix;
 
-// Cached data from updatePolish
 float m_cachedPaddedX = 0;
 float m_cachedPaddedY = 0;
 float m_cachedPaddedW = 0;
@@ -84,10 +83,10 @@ QRectF m_localPaddedRect;
 QVector<BlobRectData> m_cachedRects;
 int m_cachedMyIndex = -2;
 float m_pendingDx = 0;
-	float m_pendingDy = 0;
-	float m_pendingDw = 0;
-	float m_pendingDh = 0;
-	bool m_cachedHasInverted = false;
+float m_pendingDy = 0;
+float m_pendingDw = 0;
+float m_pendingDh = 0;
+bool m_cachedHasInverted = false;
 float m_cachedInvertedRadius = 0;
 float m_cachedInvertedOuter[4] = {};
 float m_cachedInvertedInner[4] = {};

Plugins/ZShell/CMakeLists.txt

@@ -50,6 +50,7 @@ qml_module(ZShell
         Qt::Quick
         Qt::Concurrent
         Qt::Sql
+		Qt::DBus
 		PkgConfig::Qalculate
 )
 

Plugins/ZShell/Internal/CMakeLists.txt

@@ -8,6 +8,8 @@ qml_module(ZShell-internal
 		circularbuffer.hpp circularbuffer.cpp
 		sparklineitem.hpp sparklineitem.cpp
 		arcgauge.hpp arcgauge.cpp
+		wallpaperimage.hpp wallpaperimage.cpp
+		lidwatcher.hpp lidwatcher.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/cachingimagemanager.hpp

@@ -7,59 +7,60 @@
 namespace ZShell::internal {
 
 class CachingImageManager : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
+Q_OBJECT
+QML_ELEMENT
 
-    Q_PROPERTY(QQuickItem* item READ item WRITE setItem NOTIFY itemChanged REQUIRED)
-    Q_PROPERTY(QUrl cacheDir READ cacheDir WRITE setCacheDir NOTIFY cacheDirChanged REQUIRED)
+Q_PROPERTY(QQuickItem* item READ item WRITE setItem NOTIFY itemChanged REQUIRED)
+Q_PROPERTY(QUrl cacheDir READ cacheDir WRITE setCacheDir NOTIFY cacheDirChanged REQUIRED)
 
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
-    Q_PROPERTY(QUrl cachePath READ cachePath NOTIFY cachePathChanged)
+Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
+Q_PROPERTY(QUrl cachePath READ cachePath NOTIFY cachePathChanged)
 
 public:
-    explicit CachingImageManager(QObject* parent = nullptr)
-        : QObject(parent)
-        , m_item(nullptr) {}
+explicit CachingImageManager(QObject* parent = nullptr)
+	: QObject(parent)
+	, m_item(nullptr) {
+}
 
-    [[nodiscard]] QQuickItem* item() const;
-    void setItem(QQuickItem* item);
+[[nodiscard]] QQuickItem* item() const;
+void setItem(QQuickItem* item);
 
-    [[nodiscard]] QUrl cacheDir() const;
-    void setCacheDir(const QUrl& cacheDir);
+[[nodiscard]] QUrl cacheDir() const;
+void setCacheDir(const QUrl& cacheDir);
 
-    [[nodiscard]] QString path() const;
-    void setPath(const QString& path);
+[[nodiscard]] QString path() const;
+void setPath(const QString& path);
 
-    [[nodiscard]] QUrl cachePath() const;
+[[nodiscard]] QUrl cachePath() const;
 
-    Q_INVOKABLE void updateSource();
-    Q_INVOKABLE void updateSource(const QString& path);
+Q_INVOKABLE void updateSource();
+Q_INVOKABLE void updateSource(const QString& path);
 
 signals:
-    void itemChanged();
-    void cacheDirChanged();
+void itemChanged();
+void cacheDirChanged();
 
-    void pathChanged();
-    void cachePathChanged();
-    void usingCacheChanged();
+void pathChanged();
+void cachePathChanged();
+void usingCacheChanged();
 
 private:
-    QString m_shaPath;
+QString m_shaPath;
 
-    QQuickItem* m_item;
-    QUrl m_cacheDir;
+QQuickItem* m_item;
+QUrl m_cacheDir;
 
-    QString m_path;
-    QUrl m_cachePath;
+QString m_path;
+QUrl m_cachePath;
 
-    QMetaObject::Connection m_widthConn;
-    QMetaObject::Connection m_heightConn;
+QMetaObject::Connection m_widthConn;
+QMetaObject::Connection m_heightConn;
 
-    [[nodiscard]] qreal effectiveScale() const;
-    [[nodiscard]] QSize effectiveSize() const;
+[[nodiscard]] qreal effectiveScale() const;
+[[nodiscard]] QSize effectiveSize() const;
 
-    void createCache(const QString& path, const QString& cache, const QString& fillMode, const QSize& size) const;
-    [[nodiscard]] static QString sha256sum(const QString& path);
+void createCache(const QString& path, const QString& cache, const QString& fillMode, const QSize& size) const;
+[[nodiscard]] static QString sha256sum(const QString& path);
 };
 
 } // namespace ZShell::internal

Plugins/ZShell/Internal/circularbuffer.cpp

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 CircularBuffer::CircularBuffer(QObject* parent)
 	: QObject(parent) {
@@ -92,4 +92,4 @@ qreal CircularBuffer::at(int index) const {
 	return m_data[actualIndex];
 }
 
-} // namespace caelestia::internal
+} // namespace ZShell::internal

Plugins/ZShell/Internal/circularbuffer.hpp

@@ -4,7 +4,7 @@
 #include <qqmlintegration.h>
 #include <qvector.h>
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 class CircularBuffer : public QObject {
 Q_OBJECT
@@ -41,4 +41,4 @@ int m_count = 0;
 int m_capacity = 0;
 };
 
-} // namespace caelestia::internal
+} // namespace ZShell::internal

Plugins/ZShell/Internal/circularindicatormanager.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <qeasingcurve.h>
 #include <qobject.h>
 #include <qqmlintegration.h>

Plugins/ZShell/Internal/hyprdevices.hpp

@@ -8,67 +8,67 @@
 namespace ZShell::internal::hypr {
 
 class HyprKeyboard : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("HyprKeyboard instances can only be retrieved from a HyprDevices")
+Q_OBJECT
+QML_ELEMENT
+        QML_UNCREATABLE("HyprKeyboard instances can only be retrieved from a HyprDevices")
 
-    Q_PROPERTY(QVariantHash lastIpcObject READ lastIpcObject NOTIFY lastIpcObjectChanged)
-    Q_PROPERTY(QString address READ address NOTIFY addressChanged)
-    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QString layout READ layout NOTIFY layoutChanged)
-    Q_PROPERTY(QString activeKeymap READ activeKeymap NOTIFY activeKeymapChanged)
-    Q_PROPERTY(bool capsLock READ capsLock NOTIFY capsLockChanged)
-    Q_PROPERTY(bool numLock READ numLock NOTIFY numLockChanged)
-    Q_PROPERTY(bool main READ main NOTIFY mainChanged)
+Q_PROPERTY(QVariantHash lastIpcObject READ lastIpcObject NOTIFY lastIpcObjectChanged)
+Q_PROPERTY(QString address READ address NOTIFY addressChanged)
+Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+Q_PROPERTY(QString layout READ layout NOTIFY layoutChanged)
+Q_PROPERTY(QString activeKeymap READ activeKeymap NOTIFY activeKeymapChanged)
+Q_PROPERTY(bool capsLock READ capsLock NOTIFY capsLockChanged)
+Q_PROPERTY(bool numLock READ numLock NOTIFY numLockChanged)
+Q_PROPERTY(bool main READ main NOTIFY mainChanged)
 
 public:
-    explicit HyprKeyboard(QJsonObject ipcObject, QObject* parent = nullptr);
+explicit HyprKeyboard(QJsonObject ipcObject, QObject* parent = nullptr);
 
-    [[nodiscard]] QVariantHash lastIpcObject() const;
-    [[nodiscard]] QString address() const;
-    [[nodiscard]] QString name() const;
-    [[nodiscard]] QString layout() const;
-    [[nodiscard]] QString activeKeymap() const;
-    [[nodiscard]] bool capsLock() const;
-    [[nodiscard]] bool numLock() const;
-    [[nodiscard]] bool main() const;
+[[nodiscard]] QVariantHash lastIpcObject() const;
+[[nodiscard]] QString address() const;
+[[nodiscard]] QString name() const;
+[[nodiscard]] QString layout() const;
+[[nodiscard]] QString activeKeymap() const;
+[[nodiscard]] bool capsLock() const;
+[[nodiscard]] bool numLock() const;
+[[nodiscard]] bool main() const;
 
-    bool updateLastIpcObject(QJsonObject object);
+bool updateLastIpcObject(QJsonObject object);
 
 signals:
-    void lastIpcObjectChanged();
-    void addressChanged();
-    void nameChanged();
-    void layoutChanged();
-    void activeKeymapChanged();
-    void capsLockChanged();
-    void numLockChanged();
-    void mainChanged();
+void lastIpcObjectChanged();
+void addressChanged();
+void nameChanged();
+void layoutChanged();
+void activeKeymapChanged();
+void capsLockChanged();
+void numLockChanged();
+void mainChanged();
 
 private:
-    QJsonObject m_lastIpcObject;
+QJsonObject m_lastIpcObject;
 };
 
 class HyprDevices : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("HyprDevices instances can only be retrieved from a HyprExtras")
+Q_OBJECT
+QML_ELEMENT
+        QML_UNCREATABLE("HyprDevices instances can only be retrieved from a HyprExtras")
 
-    Q_PROPERTY(
-        QQmlListProperty<ZShell::internal::hypr::HyprKeyboard> keyboards READ keyboards NOTIFY keyboardsChanged)
+Q_PROPERTY(
+	QQmlListProperty<ZShell::internal::hypr::HyprKeyboard> keyboards READ keyboards NOTIFY keyboardsChanged)
 
 public:
-    explicit HyprDevices(QObject* parent = nullptr);
+explicit HyprDevices(QObject* parent = nullptr);
 
-    [[nodiscard]] QQmlListProperty<HyprKeyboard> keyboards();
+[[nodiscard]] QQmlListProperty<HyprKeyboard> keyboards();
 
-    bool updateLastIpcObject(QJsonObject object);
+bool updateLastIpcObject(QJsonObject object);
 
 signals:
-    void keyboardsChanged();
+void keyboardsChanged();
 
 private:
-    QList<HyprKeyboard*> m_keyboards;
+QList<HyprKeyboard*> m_keyboards;
 };
 
 } // namespace ZShell::internal::hypr

Plugins/ZShell/Internal/hyprextras.cpp

@@ -1,11 +1,18 @@
 #include "hyprextras.hpp"
 #include "hyprdevices.hpp"
 
+#include <functional>
+#include <memory>
+
 #include <qdir.h>
+#include <qcolor.h>
 #include <qjsonarray.h>
+#include <qjsondocument.h>
+#include <qjsonobject.h>
 #include <qlocalsocket.h>
 #include <qloggingcategory.h>
 #include <qmetatype.h>
+#include <qobject.h>
 #include <qregularexpression.h>
 #include <qvariant.h>
 
@@ -163,6 +170,86 @@ static QString buildHlConfigCall(const QString& key, const QVariant& value) {
 	return out;
 }
 
+static QColor colorFromInt(quint32 value) {
+	const int a = (value >> 24) & 0xFF;
+	const int r = (value >> 16) & 0xFF;
+	const int g = (value >> 8) & 0xFF;
+	const int b = value & 0xFF;
+
+	return QColor(r, g, b, a);
+}
+
+static QVariant parseGetOptionValue(const QJsonObject& obj) {
+	if (obj.contains(QStringLiteral("bool"))) {
+		return obj.value(QStringLiteral("bool")).toBool();
+	}
+
+	if (obj.contains(QStringLiteral("int"))) {
+		const auto value = obj.value(QStringLiteral("int")).toInt();
+
+		const auto option = obj.value(QStringLiteral("option")).toString();
+
+		if (option.contains(QStringLiteral("color")) || option.contains(QStringLiteral("col."))) {
+			return colorFromInt(static_cast<quint32>(value));
+		}
+
+		return value;
+	}
+
+	if (obj.contains(QStringLiteral("float"))) {
+		return obj.value(QStringLiteral("float")).toDouble();
+	}
+
+	if (obj.contains(QStringLiteral("str"))) {
+		return obj.value(QStringLiteral("str")).toString();
+	}
+
+	if (obj.contains(QStringLiteral("current"))) {
+		return obj.value(QStringLiteral("current")).toVariant();
+	}
+
+	if (obj.contains(QStringLiteral("value"))) {
+		return obj.value(QStringLiteral("value")).toVariant();
+	}
+
+	if (obj.contains(QStringLiteral("vec2"))) {
+		return obj.value(QStringLiteral("vec2")).toVariant();
+	}
+
+	if (obj.contains(QStringLiteral("data"))) {
+		const auto data = obj.value(QStringLiteral("data"));
+		if (data.isObject()) {
+			const auto d = data.toObject();
+			if (d.contains(QStringLiteral("current"))) {
+				return d.value(QStringLiteral("current")).toVariant();
+			}
+			if (d.contains(QStringLiteral("value"))) {
+				return d.value(QStringLiteral("value")).toVariant();
+			}
+		} else {
+			return data.toVariant();
+		}
+	}
+
+	return {};
+}
+
+static void insertNestedValue(QVariantMap& root, const QStringList& path, const QVariant& value) {
+	if (path.isEmpty()) {
+		return;
+	}
+
+	if (path.size() == 1) {
+		root.insert(path.first(), value);
+		return;
+	}
+
+	const QString head = path.first();
+	QVariantMap child = root.value(head).toMap();
+	insertNestedValue(child, path.mid(1), value);
+	root.insert(head, child);
+}
+
 } // namespace
 
 HyprExtras::HyprExtras(QObject* parent)
@@ -203,7 +290,7 @@ HyprExtras::HyprExtras(QObject* parent)
 	m_socket->connectToServer(m_eventSocket, QLocalSocket::ReadOnly);
 }
 
-QVariantHash HyprExtras::options() const {
+QVariantMap HyprExtras::options() const {
 	return m_options;
 }
 
@@ -269,30 +356,64 @@ void HyprExtras::refreshOptions() {
 		m_optionsRefresh->close();
 	}
 
-	m_optionsRefresh = makeRequestJson(QStringLiteral("descriptions"), [this](bool success, const QJsonDocument& response) {
-			m_optionsRefresh.reset();
-			if (!success) {
+	++m_optionsRefreshGeneration;
+	const quint64 generation = m_optionsRefreshGeneration;
+
+	static const QStringList optionKeys = {
+		QStringLiteral("general:border_size"),
+		QStringLiteral("decoration:rounding"),
+		QStringLiteral("animations:enabled"),
+		QStringLiteral("decoration:shadow:enabled"),
+		QStringLiteral("decoration:shadow:offset"),
+		QStringLiteral("decoration:shadow:color"),
+		QStringLiteral("decoration:shadow:range"),
+		QStringLiteral("decoration:shadow:render_power"),
+	};
+
+	auto nextOptions = std::make_shared<QVariantMap>();
+
+	auto step = std::make_shared<std::function<void(int)> >();
+	*step = [this, generation, nextOptions, step](int index) {
+			if (generation != m_optionsRefreshGeneration) {
 				return;
 			}
 
-			const auto options = response.array();
-			bool dirty = false;
-
-			for (const auto& o : std::as_const(options)) {
-				const auto obj = o.toObject();
-				const auto key = obj.value(QStringLiteral("value")).toString();
-				const auto value = obj.value(QStringLiteral("data")).toObject().value(QStringLiteral("current")).toVariant();
-
-				if (m_options.value(key) != value) {
-					dirty = true;
-					m_options.insert(key, value);
+			if (index >= optionKeys.size()) {
+				if (m_options != *nextOptions) {
+					m_options = *nextOptions;
+					emit optionsChanged();
 				}
+				return;
 			}
 
-			if (dirty) {
-				emit optionsChanged();
-			}
-		});
+			const QString key = optionKeys.at(index);
+
+			m_optionsRefresh = makeRequestJson(
+				QStringLiteral("getoption ") + key,
+				[this, generation, nextOptions, step, index, key](bool success, const QJsonDocument& response)
+			{
+				m_optionsRefresh.reset();
+
+				if (generation != m_optionsRefreshGeneration) {
+					return;
+				}
+
+				if (success && response.isObject()) {
+					const QVariant value = parseGetOptionValue(response.object());
+					if (value.isValid()) {
+						insertNestedValue(*nextOptions, key.split(QLatin1Char(':'), Qt::SkipEmptyParts), value);
+					} else {
+						qCWarning(lcHypr) << "refreshOptions: getoption returned no usable value for" << key;
+					}
+				} else if (!success) {
+					qCWarning(lcHypr) << "refreshOptions: getoption request error for" << key;
+				}
+
+				(*step)(index + 1);
+			});
+		};
+
+	(*step)(0);
 }
 
 void HyprExtras::refreshDevices() {

Plugins/ZShell/Internal/hyprextras.hpp

@@ -1,9 +1,13 @@
 #pragma once
 
+#include <functional>
+
+#include <qjsondocument.h>
 #include <qlocalsocket.h>
 #include <qobject.h>
 #include <qqmlintegration.h>
 #include <qsharedpointer.h>
+#include <qstringlist.h>
 #include <qvariant.h>
 
 namespace ZShell::internal::hypr {
@@ -15,13 +19,13 @@ Q_OBJECT
 QML_ELEMENT
         Q_MOC_INCLUDE("hyprdevices.hpp")
 
-Q_PROPERTY(QVariantHash options READ options NOTIFY optionsChanged)
+Q_PROPERTY(QVariantMap options READ options NOTIFY optionsChanged)
 Q_PROPERTY(ZShell::internal::hypr::HyprDevices* devices READ devices CONSTANT)
 
 public:
 explicit HyprExtras(QObject* parent = nullptr);
 
-[[nodiscard]] QVariantHash options() const;
+[[nodiscard]] QVariantMap options() const;
 [[nodiscard]] HyprDevices* devices() const;
 
 Q_INVOKABLE void message(const QString& message);
@@ -42,11 +46,12 @@ QString m_eventSocket;
 QLocalSocket* m_socket;
 bool m_socketValid;
 
-QVariantHash m_options;
+QVariantMap m_options;
 HyprDevices* const m_devices;
 
 SocketPtr m_optionsRefresh;
 SocketPtr m_devicesRefresh;
+quint64 m_optionsRefreshGeneration = 0;
 
 void socketError(QLocalSocket::LocalSocketError error) const;
 void socketStateChanged(QLocalSocket::LocalSocketState state);

Plugins/ZShell/Internal/lidwatcher.cpp

@@ -0,0 +1,86 @@
+#include "lidwatcher.hpp"
+
+#include <QtDBus/qdbusconnection.h>
+#include <QtDBus/qdbuserror.h>
+#include <QtDBus/qdbusinterface.h>
+#include <QtDBus/qdbusreply.h>
+#include <qloggingcategory.h>
+
+Q_LOGGING_CATEGORY(lcLidWatcher, "ZShell.internal.logindmanager", QtInfoMsg)
+
+namespace ZShell::internal {
+
+LidWatcher::LidWatcher(QObject* parent) : QObject(parent) {
+	auto bus = QDBusConnection::systemBus();
+	if (!bus.isConnected()) {
+		qCWarning(lcLidWatcher)
+		        << "Failed to connect to system bus:" << bus.lastError().message();
+		return;
+	}
+
+	bool ok = bus.connect("org.freedesktop.login1",
+	                      "/org/freedesktop/login1",
+	                      "org.freedesktop.login1.Manager",
+	                      "PrepareForSleep",
+	                      this,
+	                      SLOT(handlePrepareForSleep(bool)));
+
+	if (!ok) {
+		qCWarning(lcLidWatcher)
+		        << "Failed to connect to PrepareForSleep signal:"
+		        << bus.lastError().message();
+	}
+
+	QDBusInterface login1("org.freedesktop.login1",
+	                      "/org/freedesktop/login1",
+	                      "org.freedesktop.login1.Manager",
+	                      bus);
+	const QDBusReply<QDBusObjectPath> reply = login1.call("GetSession", "auto");
+	if (!reply.isValid()) {
+		qCWarning(lcLidWatcher) << "Failed to get session path";
+		return;
+	}
+	const auto sessionPath = reply.value().path();
+
+	ok = bus.connect("org.freedesktop.login1",
+	                 sessionPath,
+	                 "org.freedesktop.login1.Session",
+	                 "Lock",
+	                 this,
+	                 SLOT(handleLockRequested()));
+
+	if (!ok) {
+		qCWarning(lcLidWatcher)
+		        << "Failed to connect to Lock signal:" << bus.lastError().message();
+	}
+
+	ok = bus.connect("org.freedesktop.login1",
+	                 sessionPath,
+	                 "org.freedesktop.login1.Session",
+	                 "Unlock",
+	                 this,
+	                 SLOT(handleUnlockRequested()));
+
+	if (!ok) {
+		qCWarning(lcLidWatcher) << "Failed to connect to Unlock signal:"
+		                        << bus.lastError().message();
+	}
+}
+
+void LidWatcher::handlePrepareForSleep(bool sleep) {
+	if (sleep) {
+		emit aboutToSleep();
+	} else {
+		emit resumed();
+	}
+}
+
+void LidWatcher::handleLockRequested() {
+	emit lockRequested();
+}
+
+void LidWatcher::handleUnlockRequested() {
+	emit unlockRequested();
+}
+
+} // namespace ZShell::internal

Plugins/ZShell/Internal/lidwatcher.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <qobject.h>
+#include <qqmlintegration.h>
+
+namespace ZShell::internal {
+
+class LidWatcher : public QObject {
+Q_OBJECT
+QML_ELEMENT
+
+public:
+explicit LidWatcher(QObject* parent = nullptr);
+
+signals:
+void aboutToSleep();
+void resumed();
+void lockRequested();
+void unlockRequested();
+
+private slots:
+void handlePrepareForSleep(bool sleep);
+void handleLockRequested();
+void handleUnlockRequested();
+};
+
+} // namespace ZShell::internal

Plugins/ZShell/Internal/sparklineitem.cpp

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

Plugins/ZShell/Internal/sparklineitem.hpp

@@ -7,7 +7,7 @@
 
 #include "circularbuffer.hpp"
 
-namespace caelestia::internal {
+namespace ZShell::internal {
 
 class SparklineItem : public QQuickPaintedItem {
 Q_OBJECT
@@ -87,4 +87,4 @@ int m_historyLength = 30;
 qreal m_lineWidth = 2.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/Models/filesystemmodel.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <qabstractitemmodel.h>
 #include <qdir.h>
 #include <qfilesystemwatcher.h>
@@ -13,136 +14,136 @@
 namespace ZShell::models {
 
 class FileSystemEntry : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("FileSystemEntry instances can only be retrieved from a FileSystemModel")
+Q_OBJECT
+QML_ELEMENT
+        QML_UNCREATABLE("FileSystemEntry instances can only be retrieved from a FileSystemModel")
 
-    Q_PROPERTY(QString path READ path CONSTANT)
-    Q_PROPERTY(QString relativePath READ relativePath NOTIFY relativePathChanged)
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(QString baseName READ baseName CONSTANT)
-    Q_PROPERTY(QString parentDir READ parentDir CONSTANT)
-    Q_PROPERTY(QString suffix READ suffix CONSTANT)
-    Q_PROPERTY(qint64 size READ size CONSTANT)
-    Q_PROPERTY(bool isDir READ isDir CONSTANT)
-    Q_PROPERTY(bool isImage READ isImage CONSTANT)
-    Q_PROPERTY(QString mimeType READ mimeType CONSTANT)
+Q_PROPERTY(QString path READ path CONSTANT)
+Q_PROPERTY(QString relativePath READ relativePath NOTIFY relativePathChanged)
+Q_PROPERTY(QString name READ name CONSTANT)
+Q_PROPERTY(QString baseName READ baseName CONSTANT)
+Q_PROPERTY(QString parentDir READ parentDir CONSTANT)
+Q_PROPERTY(QString suffix READ suffix CONSTANT)
+Q_PROPERTY(qint64 size READ size CONSTANT)
+Q_PROPERTY(bool isDir READ isDir CONSTANT)
+Q_PROPERTY(bool isImage READ isImage CONSTANT)
+Q_PROPERTY(QString mimeType READ mimeType CONSTANT)
 
 public:
-    explicit FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent = nullptr);
+explicit FileSystemEntry(const QString& path, const QString& relativePath, QObject* parent = nullptr);
 
-    [[nodiscard]] QString path() const;
-    [[nodiscard]] QString relativePath() const;
-    [[nodiscard]] QString name() const;
-    [[nodiscard]] QString baseName() const;
-    [[nodiscard]] QString parentDir() const;
-    [[nodiscard]] QString suffix() const;
-    [[nodiscard]] qint64 size() const;
-    [[nodiscard]] bool isDir() const;
-    [[nodiscard]] bool isImage() const;
-    [[nodiscard]] QString mimeType() const;
+[[nodiscard]] QString path() const;
+[[nodiscard]] QString relativePath() const;
+[[nodiscard]] QString name() const;
+[[nodiscard]] QString baseName() const;
+[[nodiscard]] QString parentDir() const;
+[[nodiscard]] QString suffix() const;
+[[nodiscard]] qint64 size() const;
+[[nodiscard]] bool isDir() const;
+[[nodiscard]] bool isImage() const;
+[[nodiscard]] QString mimeType() const;
 
-    void updateRelativePath(const QDir& dir);
+void updateRelativePath(const QDir& dir);
 
 signals:
-    void relativePathChanged();
+void relativePathChanged();
 
 private:
-    const QFileInfo m_fileInfo;
+const QFileInfo m_fileInfo;
 
-    const QString m_path;
-    QString m_relativePath;
+const QString m_path;
+QString m_relativePath;
 
-    mutable bool m_isImage;
-    mutable bool m_isImageInitialised;
+mutable bool m_isImage;
+mutable bool m_isImageInitialised;
 
-    mutable QString m_mimeType;
-    mutable bool m_mimeTypeInitialised;
+mutable QString m_mimeType;
+mutable bool m_mimeTypeInitialised;
 };
 
 class FileSystemModel : public QAbstractListModel {
-    Q_OBJECT
-    QML_ELEMENT
+Q_OBJECT
+QML_ELEMENT
 
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
-    Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged)
-    Q_PROPERTY(bool watchChanges READ watchChanges WRITE setWatchChanges NOTIFY watchChangesChanged)
-    Q_PROPERTY(bool showHidden READ showHidden WRITE setShowHidden NOTIFY showHiddenChanged)
-    Q_PROPERTY(bool sortReverse READ sortReverse WRITE setSortReverse NOTIFY sortReverseChanged)
-    Q_PROPERTY(Filter filter READ filter WRITE setFilter NOTIFY filterChanged)
-    Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters NOTIFY nameFiltersChanged)
+Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
+Q_PROPERTY(bool recursive READ recursive WRITE setRecursive NOTIFY recursiveChanged)
+Q_PROPERTY(bool watchChanges READ watchChanges WRITE setWatchChanges NOTIFY watchChangesChanged)
+Q_PROPERTY(bool showHidden READ showHidden WRITE setShowHidden NOTIFY showHiddenChanged)
+Q_PROPERTY(bool sortReverse READ sortReverse WRITE setSortReverse NOTIFY sortReverseChanged)
+Q_PROPERTY(Filter filter READ filter WRITE setFilter NOTIFY filterChanged)
+Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters NOTIFY nameFiltersChanged)
 
-    Q_PROPERTY(QQmlListProperty<ZShell::models::FileSystemEntry> entries READ entries NOTIFY entriesChanged)
+Q_PROPERTY(QQmlListProperty<ZShell::models::FileSystemEntry> entries READ entries NOTIFY entriesChanged)
 
 public:
-    enum Filter {
-        NoFilter,
-        Images,
-        Files,
-        Dirs
-    };
-    Q_ENUM(Filter)
+enum Filter {
+	NoFilter,
+	Images,
+	Files,
+	Dirs
+};
+Q_ENUM(Filter)
 
-    explicit FileSystemModel(QObject* parent = nullptr);
+explicit FileSystemModel(QObject* parent = nullptr);
 
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    QHash<int, QByteArray> roleNames() const override;
+[[nodiscard]] int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+[[nodiscard]] QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+[[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
-    [[nodiscard]] QString path() const;
-    void setPath(const QString& path);
+[[nodiscard]] QString path() const;
+void setPath(const QString& path);
 
-    [[nodiscard]] bool recursive() const;
-    void setRecursive(bool recursive);
+[[nodiscard]] bool recursive() const;
+void setRecursive(bool recursive);
 
-    [[nodiscard]] bool watchChanges() const;
-    void setWatchChanges(bool watchChanges);
+[[nodiscard]] bool watchChanges() const;
+void setWatchChanges(bool watchChanges);
 
-    [[nodiscard]] bool showHidden() const;
-    void setShowHidden(bool showHidden);
+[[nodiscard]] bool showHidden() const;
+void setShowHidden(bool showHidden);
 
-    [[nodiscard]] bool sortReverse() const;
-    void setSortReverse(bool sortReverse);
+[[nodiscard]] bool sortReverse() const;
+void setSortReverse(bool sortReverse);
 
-    [[nodiscard]] Filter filter() const;
-    void setFilter(Filter filter);
+[[nodiscard]] Filter filter() const;
+void setFilter(Filter filter);
 
-    [[nodiscard]] QStringList nameFilters() const;
-    void setNameFilters(const QStringList& nameFilters);
+[[nodiscard]] QStringList nameFilters() const;
+void setNameFilters(const QStringList& nameFilters);
 
-    [[nodiscard]] QQmlListProperty<FileSystemEntry> entries();
+[[nodiscard]] QQmlListProperty<FileSystemEntry> entries();
 
 signals:
-    void pathChanged();
-    void recursiveChanged();
-    void watchChangesChanged();
-    void showHiddenChanged();
-    void sortReverseChanged();
-    void filterChanged();
-    void nameFiltersChanged();
-    void entriesChanged();
+void pathChanged();
+void recursiveChanged();
+void watchChangesChanged();
+void showHiddenChanged();
+void sortReverseChanged();
+void filterChanged();
+void nameFiltersChanged();
+void entriesChanged();
 
 private:
-    QDir m_dir;
-    QFileSystemWatcher m_watcher;
-    QList<FileSystemEntry*> m_entries;
-    QHash<QString, QFuture<QPair<QSet<QString>, QSet<QString>>>> m_futures;
+QDir m_dir;
+QFileSystemWatcher m_watcher;
+QList<FileSystemEntry*> m_entries;
+QHash<QString, QFuture<QPair<QSet<QString>, QSet<QString> > > > m_futures;
 
-    QString m_path;
-    bool m_recursive;
-    bool m_watchChanges;
-    bool m_showHidden;
-    bool m_sortReverse;
-    Filter m_filter;
-    QStringList m_nameFilters;
+QString m_path;
+bool m_recursive;
+bool m_watchChanges;
+bool m_showHidden;
+bool m_sortReverse;
+Filter m_filter;
+QStringList m_nameFilters;
 
-    void watchDirIfRecursive(const QString& path);
-    void update();
-    void updateWatcher();
-    void updateEntries();
-    void updateEntriesForDir(const QString& dir);
-    void applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths);
-    [[nodiscard]] bool compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const;
+void watchDirIfRecursive(const QString& path);
+void update();
+void updateWatcher();
+void updateEntries();
+void updateEntriesForDir(const QString& dir);
+void applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths);
+[[nodiscard]] bool compareEntries(const FileSystemEntry* a, const FileSystemEntry* b) const;
 };
 
 } // namespace ZShell::models

Plugins/ZShell/Services/CMakeLists.txt

@@ -9,6 +9,7 @@ qml_module(ZShell-services
         cavaprovider.hpp cavaprovider.cpp
 		desktopmodel.hpp desktopmodel.cpp
 		desktopstatemanager.hpp desktopstatemanager.cpp
+		hyprsunsetmanager.hpp hyprsunsetmanager.cpp
     LIBRARIES
 		Qt6::Core
 		Qt6::Qml

Plugins/ZShell/Services/audiocollector.hpp

@@ -59,7 +59,7 @@ quint32 readChunk(double* out, quint32 count = 0);
 
 private:
 explicit AudioCollector(QObject* parent = nullptr);
-~AudioCollector();
+~AudioCollector() override;
 
 std::jthread m_thread;
 std::vector<float> m_buffer1;

Plugins/ZShell/Services/audioprovider.hpp

@@ -11,11 +11,10 @@ Q_OBJECT
 
 public:
 explicit AudioProcessor(QObject* parent = nullptr);
-~AudioProcessor();
+~AudioProcessor() override;
 
 void init();
 
-public slots:
 void start();
 void stop();
 
@@ -31,7 +30,7 @@ Q_OBJECT
 
 public:
 explicit AudioProvider(QObject* parent = nullptr);
-~AudioProvider();
+~AudioProvider() override;
 
 protected:
 AudioProcessor* m_processor;

Plugins/ZShell/Services/beattracker.hpp

@@ -11,7 +11,7 @@ Q_OBJECT
 
 public:
 explicit BeatProcessor(QObject* parent = nullptr);
-~BeatProcessor();
+~BeatProcessor() override;
 
 signals:
 void beat(smpl_t bpm);

Plugins/ZShell/Services/cavaprovider.hpp

@@ -11,7 +11,7 @@ Q_OBJECT
 
 public:
 explicit CavaProcessor(QObject* parent = nullptr);
-~CavaProcessor();
+~CavaProcessor() override;
 
 void setBars(int bars);
 

Plugins/ZShell/Services/desktopmodel.hpp

@@ -4,6 +4,7 @@
 #include <QList>
 #include <QString>
 #include <QQmlEngine>
+#include <cstdint>
 
 namespace ZShell::services {
 
@@ -30,9 +31,9 @@ enum DesktopRoles {
 
 explicit DesktopModel(QObject *parent = nullptr);
 
-int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-QHash<int, QByteArray> roleNames() const override;
+[[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+[[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+[[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
 Q_INVOKABLE void loadDirectory(const QString &path);
 Q_INVOKABLE void moveIcon(int index, int newX, int newY);
@@ -43,4 +44,4 @@ QList<DesktopItem> m_items;
 void saveCurrentLayout();
 };
 
-} // namespace ZShell::services
+} // namespace ZShell::Services

Plugins/ZShell/Services/desktopstatemanager.hpp

@@ -18,7 +18,7 @@ Q_INVOKABLE void saveLayout(const QVariantMap& layout);
 Q_INVOKABLE QVariantMap getLayout();
 
 private:
-QString getConfigFilePath() const;
+[[nodiscard]] QString getConfigFilePath() const;
 };
 
 } // namespace ZShell::services

Plugins/ZShell/Services/hyprsunsetmanager.cpp

@@ -0,0 +1,147 @@
+#include "hyprsunsetmanager.hpp"
+#include <qlogging.h>
+#include <qobject.h>
+#include <qprocess.h>
+#include <qtimer.h>
+
+namespace ZShell::services {
+
+HyprsunsetManager::HyprsunsetManager(QObject* parent) : QObject(parent) {
+	connect(&m_timer, &QTimer::timeout, this, &HyprsunsetManager::apply);
+	connect(&m_manualTimer, &QTimer::timeout, this, [this] {
+			m_manualToggle = false;
+			emit manualToggleChanged();
+			apply();
+		});
+	connect(&m_startCooldown, &QTimer::timeout, this, [this] {
+			m_startAllowed = true;
+			apply();
+		});
+
+	m_startCooldown.start(2000);
+	m_manualTimer.setSingleShot(true);
+	m_timer.start(60000);
+
+	m_process.setStandardInputFile(QProcess::nullDevice());
+	m_process.setStandardOutputFile(QProcess::nullDevice());
+}
+
+int HyprsunsetManager::startTime() const {
+	return m_startTime;
+}
+
+int HyprsunsetManager::endTime() const {
+	return m_endTime;
+}
+
+bool HyprsunsetManager::manualToggle() const {
+	return m_manualToggle;
+}
+
+bool HyprsunsetManager::enabled() const {
+	return m_enabled;
+}
+
+bool HyprsunsetManager::activeAuto() const {
+	return m_activeAuto;
+}
+
+int HyprsunsetManager::temp() const {
+	return m_temp;
+}
+
+void HyprsunsetManager::setActiveAuto(bool activeAuto) {
+	if (activeAuto == m_activeAuto)
+		return;
+
+	m_activeAuto = activeAuto;
+	emit activeAutoChanged();
+}
+
+void HyprsunsetManager::setManualToggle(bool toggle) {
+	if (toggle == m_manualToggle)
+		return;
+
+	m_manualToggle = toggle;
+	emit manualToggleChanged();
+
+	m_manualTimer.start(60 * 60 * 1000);
+}
+
+void HyprsunsetManager::setEndTime(const int& time) {
+	if (time == m_endTime)
+		return;
+
+	m_endTime = time;
+	emit endTimeChanged();
+	apply();
+}
+
+void HyprsunsetManager::setStartTime(const int& time) {
+	if (time == m_startTime)
+		return;
+
+	m_startTime = time;
+	emit startTimeChanged();
+	apply();
+}
+
+void HyprsunsetManager::setTemp(const int& temp) {
+	if (temp == m_temp)
+		return;
+
+	m_temp = temp;
+	emit tempChanged();
+	apply();
+}
+
+void HyprsunsetManager::toggle() {
+	if (m_enabled) {
+		end();
+	} else {
+		start();
+	}
+}
+
+void HyprsunsetManager::start() {
+	if (m_enabled && m_initialized)
+		return;
+
+	m_initialized = true;
+	m_enabled = true;
+
+	emit enabledChanged();
+
+	m_process.setProgram("hyprctl");
+	m_process.setArguments({"hyprsunset", "temperature", QString::number(m_temp)});
+	m_process.startDetached();
+}
+
+void HyprsunsetManager::end() {
+	if (!m_enabled && m_initialized)
+		return;
+
+	m_initialized = true;
+	m_enabled = false;
+
+	emit enabledChanged();
+
+	m_process.setProgram("hyprctl");
+	m_process.setArguments({"hyprsunset", "identity"});
+	m_process.startDetached();
+}
+
+void HyprsunsetManager::apply() {
+	if (m_manualToggle || !m_activeAuto || !m_startAllowed)
+		return;
+
+	const auto current = QTime::currentTime().hour();
+
+	if (current >= m_startTime || current < m_endTime) {
+		start();
+	} else {
+		end();
+	}
+}
+
+};

Plugins/ZShell/Services/hyprsunsetmanager.hpp

@@ -0,0 +1,66 @@
+#pragma once
+
+#include <QObject>
+#include <QTime>
+#include <QProcess>
+#include <QTimer>
+#include <qqmlintegration.h>
+#include <qtmetamacros.h>
+
+namespace ZShell::services {
+
+class HyprsunsetManager : public QObject {
+Q_OBJECT
+QML_ELEMENT
+Q_PROPERTY(bool enabled READ enabled NOTIFY enabledChanged)
+Q_PROPERTY(int startTime READ startTime WRITE setStartTime NOTIFY startTimeChanged)
+Q_PROPERTY(int endTime READ endTime WRITE setEndTime NOTIFY endTimeChanged)
+Q_PROPERTY(int temp READ temp WRITE setTemp NOTIFY tempChanged)
+Q_PROPERTY(bool activeAuto READ activeAuto WRITE setActiveAuto NOTIFY activeAutoChanged)
+Q_PROPERTY(bool manualToggle READ manualToggle WRITE setManualToggle NOTIFY manualToggleChanged)
+
+public:
+explicit HyprsunsetManager(QObject* parent = nullptr);
+
+[[nodiscard]] int startTime() const;
+[[nodiscard]] int endTime() const;
+[[nodiscard]] bool enabled() const;
+[[nodiscard]] int temp() const;
+[[nodiscard]] bool activeAuto() const;
+[[nodiscard]] bool manualToggle() const;
+
+Q_INVOKABLE void toggle();
+Q_INVOKABLE void apply();
+
+void setStartTime(const int& time);
+void setEndTime(const int& time);
+void setTemp(const int& temp);
+void setActiveAuto(bool activeAuto);
+void setManualToggle(bool toggle);
+
+signals:
+void enabledChanged();
+void startTimeChanged();
+void activeAutoChanged();
+void endTimeChanged();
+void tempChanged();
+void manualToggleChanged();
+
+private:
+int m_startTime;
+int m_endTime;
+bool m_enabled = false;
+bool m_manualToggle = false;
+bool m_activeAuto;
+bool m_startAllowed = false;
+bool m_initialized = false;
+QTimer m_startCooldown;
+int m_temp;
+QProcess m_process;
+QTimer m_timer;
+QTimer m_manualTimer;
+void start();
+void end();
+};
+
+};

Plugins/ZShell/appdb.hpp

@@ -9,98 +9,98 @@
 namespace ZShell {
 
 class AppEntry : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
-    QML_UNCREATABLE("AppEntry instances can only be retrieved from an AppDb")
+Q_OBJECT
+QML_ELEMENT
+        QML_UNCREATABLE("AppEntry instances can only be retrieved from an AppDb")
 
-    // The actual DesktopEntry, but we don't have access to the type so it's a QObject
-    Q_PROPERTY(QObject* entry READ entry CONSTANT)
+// The actual DesktopEntry, but we don't have access to the type so it's a QObject
+Q_PROPERTY(QObject* entry READ entry CONSTANT)
 
-    Q_PROPERTY(quint32 frequency READ frequency NOTIFY frequencyChanged)
-    Q_PROPERTY(QString id READ id CONSTANT)
-    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QString comment READ comment NOTIFY commentChanged)
-    Q_PROPERTY(QString execString READ execString NOTIFY execStringChanged)
-    Q_PROPERTY(QString startupClass READ startupClass NOTIFY startupClassChanged)
-    Q_PROPERTY(QString genericName READ genericName NOTIFY genericNameChanged)
-    Q_PROPERTY(QString categories READ categories NOTIFY categoriesChanged)
-    Q_PROPERTY(QString keywords READ keywords NOTIFY keywordsChanged)
+Q_PROPERTY(quint32 frequency READ frequency NOTIFY frequencyChanged)
+Q_PROPERTY(QString id READ id CONSTANT)
+Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+Q_PROPERTY(QString comment READ comment NOTIFY commentChanged)
+Q_PROPERTY(QString execString READ execString NOTIFY execStringChanged)
+Q_PROPERTY(QString startupClass READ startupClass NOTIFY startupClassChanged)
+Q_PROPERTY(QString genericName READ genericName NOTIFY genericNameChanged)
+Q_PROPERTY(QString categories READ categories NOTIFY categoriesChanged)
+Q_PROPERTY(QString keywords READ keywords NOTIFY keywordsChanged)
 
 public:
-    explicit AppEntry(QObject* entry, quint32 frequency, QObject* parent = nullptr);
+explicit AppEntry(QObject* entry, quint32 frequency, QObject* parent = nullptr);
 
-    [[nodiscard]] QObject* entry() const;
+[[nodiscard]] QObject* entry() const;
 
-    [[nodiscard]] quint32 frequency() const;
-    void setFrequency(quint32 frequency);
-    void incrementFrequency();
+[[nodiscard]] quint32 frequency() const;
+void setFrequency(quint32 frequency);
+void incrementFrequency();
 
-    [[nodiscard]] QString id() const;
-    [[nodiscard]] QString name() const;
-    [[nodiscard]] QString comment() const;
-    [[nodiscard]] QString execString() const;
-    [[nodiscard]] QString startupClass() const;
-    [[nodiscard]] QString genericName() const;
-    [[nodiscard]] QString categories() const;
-    [[nodiscard]] QString keywords() const;
+[[nodiscard]] QString id() const;
+[[nodiscard]] QString name() const;
+[[nodiscard]] QString comment() const;
+[[nodiscard]] QString execString() const;
+[[nodiscard]] QString startupClass() const;
+[[nodiscard]] QString genericName() const;
+[[nodiscard]] QString categories() const;
+[[nodiscard]] QString keywords() const;
 
 signals:
-    void frequencyChanged();
-    void nameChanged();
-    void commentChanged();
-    void execStringChanged();
-    void startupClassChanged();
-    void genericNameChanged();
-    void categoriesChanged();
-    void keywordsChanged();
+void frequencyChanged();
+void nameChanged();
+void commentChanged();
+void execStringChanged();
+void startupClassChanged();
+void genericNameChanged();
+void categoriesChanged();
+void keywordsChanged();
 
 private:
-    QObject* m_entry;
-    quint32 m_frequency;
+QObject* m_entry;
+quint32 m_frequency;
 };
 
 class AppDb : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
+Q_OBJECT
+QML_ELEMENT
 
-    Q_PROPERTY(QString uuid READ uuid CONSTANT)
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged REQUIRED)
-    Q_PROPERTY(QObjectList entries READ entries WRITE setEntries NOTIFY entriesChanged REQUIRED)
-    Q_PROPERTY(QQmlListProperty<ZShell::AppEntry> apps READ apps NOTIFY appsChanged)
+Q_PROPERTY(QString uuid READ uuid CONSTANT)
+Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged REQUIRED)
+Q_PROPERTY(QObjectList entries READ entries WRITE setEntries NOTIFY entriesChanged REQUIRED)
+Q_PROPERTY(QQmlListProperty<ZShell::AppEntry> apps READ apps NOTIFY appsChanged)
 
 public:
-    explicit AppDb(QObject* parent = nullptr);
+explicit AppDb(QObject* parent = nullptr);
 
-    [[nodiscard]] QString uuid() const;
+[[nodiscard]] QString uuid() const;
 
-    [[nodiscard]] QString path() const;
-    void setPath(const QString& path);
+[[nodiscard]] QString path() const;
+void setPath(const QString& path);
 
-    [[nodiscard]] QObjectList entries() const;
-    void setEntries(const QObjectList& entries);
+[[nodiscard]] QObjectList entries() const;
+void setEntries(const QObjectList& entries);
 
-    [[nodiscard]] QQmlListProperty<AppEntry> apps();
+[[nodiscard]] QQmlListProperty<AppEntry> apps();
 
-    Q_INVOKABLE void incrementFrequency(const QString& id);
+Q_INVOKABLE void incrementFrequency(const QString& id);
 
 signals:
-    void pathChanged();
-    void entriesChanged();
-    void appsChanged();
+void pathChanged();
+void entriesChanged();
+void appsChanged();
 
 private:
-    QTimer* m_timer;
+QTimer* m_timer;
 
-    const QString m_uuid;
-    QString m_path;
-    QObjectList m_entries;
-    QHash<QString, AppEntry*> m_apps;
-    mutable QList<AppEntry*> m_sortedApps;
+const QString m_uuid;
+QString m_path;
+QObjectList m_entries;
+QHash<QString, AppEntry*> m_apps;
+mutable QList<AppEntry*> m_sortedApps;
 
-    QList<AppEntry*>& getSortedApps() const;
-    quint32 getFrequency(const QString& id) const;
-    void updateAppFrequencies();
-    void updateApps();
+QList<AppEntry*>& getSortedApps() const;
+quint32 getFrequency(const QString& id) const;
+void updateAppFrequencies();
+void updateApps();
 };
 
 } // namespace ZShell

Plugins/ZShell/imageanalyser.hpp

@@ -9,53 +9,53 @@
 namespace ZShell {
 
 class ImageAnalyser : public QObject {
-    Q_OBJECT
-    QML_ELEMENT
+Q_OBJECT
+QML_ELEMENT
 
-    Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(QQuickItem* sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged)
-    Q_PROPERTY(int rescaleSize READ rescaleSize WRITE setRescaleSize NOTIFY rescaleSizeChanged)
-    Q_PROPERTY(QColor dominantColour READ dominantColour NOTIFY dominantColourChanged)
-    Q_PROPERTY(qreal luminance READ luminance NOTIFY luminanceChanged)
+Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
+Q_PROPERTY(QQuickItem* sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged)
+Q_PROPERTY(int rescaleSize READ rescaleSize WRITE setRescaleSize NOTIFY rescaleSizeChanged)
+Q_PROPERTY(QColor dominantColour READ dominantColour NOTIFY dominantColourChanged)
+Q_PROPERTY(qreal luminance READ luminance NOTIFY luminanceChanged)
 
 public:
-    explicit ImageAnalyser(QObject* parent = nullptr);
+explicit ImageAnalyser(QObject* parent = nullptr);
 
-    [[nodiscard]] QString source() const;
-    void setSource(const QString& source);
+[[nodiscard]] QString source() const;
+void setSource(const QString& source);
 
-    [[nodiscard]] QQuickItem* sourceItem() const;
-    void setSourceItem(QQuickItem* sourceItem);
+[[nodiscard]] QQuickItem* sourceItem() const;
+void setSourceItem(QQuickItem* sourceItem);
 
-    [[nodiscard]] int rescaleSize() const;
-    void setRescaleSize(int rescaleSize);
+[[nodiscard]] int rescaleSize() const;
+void setRescaleSize(int rescaleSize);
 
-    [[nodiscard]] QColor dominantColour() const;
-    [[nodiscard]] qreal luminance() const;
+[[nodiscard]] QColor dominantColour() const;
+[[nodiscard]] qreal luminance() const;
 
-    Q_INVOKABLE void requestUpdate();
+Q_INVOKABLE void requestUpdate();
 
 signals:
-    void sourceChanged();
-    void sourceItemChanged();
-    void rescaleSizeChanged();
-    void dominantColourChanged();
-    void luminanceChanged();
+void sourceChanged();
+void sourceItemChanged();
+void rescaleSizeChanged();
+void dominantColourChanged();
+void luminanceChanged();
 
 private:
-    using AnalyseResult = QPair<QColor, qreal>;
+using AnalyseResult = QPair<QColor, qreal>;
 
-    QFutureWatcher<AnalyseResult>* const m_futureWatcher;
+QFutureWatcher<AnalyseResult>* const m_futureWatcher;
 
-    QString m_source;
-    QQuickItem* m_sourceItem;
-    int m_rescaleSize;
+QString m_source;
+QQuickItem* m_sourceItem;
+int m_rescaleSize;
 
-    QColor m_dominantColour;
-    qreal m_luminance;
+QColor m_dominantColour;
+qreal m_luminance;
 
-    void update();
-    static void analyse(QPromise<AnalyseResult>& promise, const QImage& image, int rescaleSize);
+void update();
+static void analyse(QPromise<AnalyseResult>& promise, const QImage& image, int rescaleSize);
 };
 
 } // namespace ZShell