scroll deceleration env

Reviewed-on: #117

Components/Anim.qml

@@ -2,7 +2,62 @@ import QtQuick
 import qs.Config
 
 NumberAnimation {
-	duration: Appearance.anim.durations.normal
+	enum Type {
-	easing.bezierCurve: Appearance.anim.curves.standard
+		StandardSmall = 0,
-	easing.type: Easing.BezierSpline
+		Standard,
+		StandardLarge,
+		StandardExtraLarge,
+		EmphasizedSmall,
+		Emphasized,
+		EmphasizedLarge,
+		EmphasizedExtraLarge,
+		FastSpatial,
+		DefaultSpatial,
+		SlowSpatial,
+		FastEffects,
+		DefaultEffects,
+		SlowEffects
+	}
+
+	property int type: Anim.DefaultSpatial
+
+	duration: {
+		if (type < Anim.StandardSmall || type > Anim.SlowEffects)
+			return Appearance.anim.durations.normal;
+
+		if (type === Anim.FastSpatial)
+			return Appearance.anim.durations.expressiveFastSpatial;
+		if (type === Anim.DefaultSpatial)
+			return Appearance.anim.durations.expressiveDefaultSpatial;
+		if (type === Anim.SlowSpatial)
+			return Appearance.anim.durations.large;
+		if (type === Anim.FastEffects)
+			return Appearance.anim.durations.expressiveFastEffects;
+		if (type === Anim.DefaultEffects)
+			return Appearance.anim.durations.expressiveEffects;
+		if (type === Anim.SlowEffects)
+			return Appearance.anim.durations.expressiveSlowEffects;
+
+		const types = ["small", "normal", "large", "extraLarge"];
+		const idx = type % 4; // 0-7 are the 4 standard types
+		return Appearance.anim.durations[types[idx]];
+	}
+	easing.bezierCurve: {
+		if (type === Anim.FastSpatial)
+			return Appearance.anim.curves.expressiveFastSpatial;
+		if (type === Anim.DefaultSpatial)
+			return Appearance.anim.curves.expressiveDefaultSpatial;
+		if (type === Anim.SlowSpatial)
+			return Appearance.anim.curves.expressiveSlowSpatial;
+		if (type === Anim.FastEffects)
+			return Appearance.anim.curves.expressiveFastEffects;
+		if (type === Anim.DefaultEffects)
+			return Appearance.anim.curves.expressiveDefaultEffects;
+		if (type === Anim.SlowEffects)
+			return Appearance.anim.curves.expressiveSlowEffects;
+
+		if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
+			return Appearance.anim.curves.emphasized;
+		return Appearance.anim.curves.standard;
+	}
 }

Components/CustomSlider.qml

@@ -1,51 +1,174 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Templates
+import ZShell.Components
+import ZShell
+import qs.Components
 import qs.Config
 
 Slider {
 	id: root
 
-	property color color: DynamicColors.palette.m3primary
+	property bool animateWave
+	property color bgColor: enabled ? DynamicColors.palette.m3secondaryContainer : Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color fgColor: enabled ? DynamicColors.palette.m3primary : Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	property real filledWidth
+	property real pos: visualPosition
+	property int waveDuration: 1000
+	property real waveFrequency: 6
+	property bool wavy
+
+	signal interaction(v: real)
+
+	implicitHeight: 12
+	implicitWidth: 200
+
+	contentItem: Item {
+		anchors.fill: parent
 
-	background: Item {
 		CustomRect {
-			anchors.bottom: parent.bottom
+			id: remaining
-			anchors.bottomMargin: root.implicitHeight / 6
+
-			anchors.left: parent.left
+			anchors.left: handle.right
-			anchors.top: parent.top
+			anchors.leftMargin: Appearance.spacing.extraSmall
-			anchors.topMargin: root.implicitHeight / 6
+			anchors.right: parent.right
-			bottomRightRadius: root.implicitHeight / 6
+			anchors.verticalCenter: parent.verticalCenter
-			color: root.color
+			bottomLeftRadius: Appearance.rounding.extraSmall / 2
-			implicitWidth: root.handle.x - root.implicitHeight / 6
+			color: root.bgColor
-			radius: root.implicitHeight / 6
+			implicitHeight: parent.height * (parent.height <= 12 ? opacity : Math.min(opacity * 2, 1))
-			topRightRadius: root.implicitHeight / 6
+			opacity: Math.min(width, 12) / 12
+			radius: Appearance.rounding.small
+			topLeftRadius: Appearance.rounding.extraSmall / 2
 		}
 
 		CustomRect {
-			anchors.bottom: parent.bottom
-			anchors.bottomMargin: root.implicitHeight / 6
 			anchors.right: parent.right
-			anchors.top: parent.top
+			anchors.rightMargin: 4 * remaining.opacity
-			anchors.topMargin: root.implicitHeight / 6
+			anchors.verticalCenter: parent.verticalCenter
-			bottomLeftRadius: root.implicitHeight / 6
+			color: root.fgColor
-			color: DynamicColors.tPalette.m3surfaceContainerHighest
+			implicitHeight: 4 * remaining.opacity
-			implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 6
+			implicitWidth: implicitHeight
-			radius: root.implicitHeight / 6
+			opacity: remaining.opacity
-			topLeftRadius: root.implicitHeight / 6
+			radius: Appearance.rounding.full
+		}
+
+		CustomRect {
+			id: handle
+
+			anchors.left: filled.right
+			anchors.leftMargin: Appearance.spacing.extraSmall
+			anchors.verticalCenter: parent.verticalCenter
+			color: root.fgColor
+			implicitHeight: {
+				const mult = parent.height <= 12 ? 3 : 1.2;
+				const pressMult = parent.height <= 12 ? 4 : 1.5;
+				return parent.height * (mouse.pressed ? pressMult : mult);
+			}
+			implicitWidth: 4
+			radius: Appearance.rounding.full
+
+			Behavior on implicitHeight {
+				Anim {
+					type: Anim.FastSpatial
+				}
+			}
+		}
+
+		Loader {
+			id: filled
+
+			anchors.left: parent.left
+			anchors.verticalCenter: parent.verticalCenter
+			asynchronous: true
+			sourceComponent: root.wavy ? waveComp : lineComp
+		}
+
+		Component {
+			id: lineComp
+
+			CustomRect {
+				bottomRightRadius: Appearance.rounding.extraSmall / 2
+				color: root.fgColor
+				implicitHeight: root.height
+				implicitWidth: root.filledWidth
+				radius: Appearance.rounding.small
+				topRightRadius: Appearance.rounding.extraSmall / 2
+			}
+		}
+
+		Component {
+			id: waveComp
+
+			WavyLine {
+				color: root.fgColor
+				frequency: root.waveFrequency
+				fullLength: root.width - handle.implicitWidth - handle.anchors.leftMargin
+				implicitHeight: lineWidth * amplitudeMultiplier * 2 + lineWidth
+				implicitWidth: root.filledWidth
+				lineWidth: root.height * 0.7
+				startX: x
+
+				Behavior on color {
+					CAnim {
+					}
+				}
+				Anim on waveProgress {
+					duration: root.waveDuration
+					easing.type: Easing.Linear
+					from: 0
+					loops: Animation.Infinite
+					paused: !root.animateWave
+					running: true
+					to: 1
+				}
+			}
 		}
 	}
-	handle: CustomRect {
+	Behavior on filledWidth {
-		anchors.verticalCenter: parent.verticalCenter
+		id: widthBehavior
-		color: root.color
-		implicitHeight: root.implicitHeight
-		implicitWidth: root.implicitHeight / 4.5
-		radius: Appearance.rounding.full
-		x: root.visualPosition * root.availableWidth - implicitWidth / 2
 
-		MouseArea {
+		Anim {
-			acceptedButtons: Qt.NoButton
+		}
-			anchors.fill: parent
+	}
-			cursorShape: Qt.PointingHandCursor
+
+	Component.onCompleted: filledWidth = Qt.binding(() => (width - handle.implicitWidth - handle.anchors.leftMargin) * pos)
+
+	Binding {
+		id: posBinding
+
+		property: "pos"
+		target: root
+		value: ZUtils.clamp(mouse.pressStartPos + mouse.dragMovement, 0, 1)
+		when: mouse.pressed
+	}
+
+	MouseArea {
+		id: mouse
+
+		property real dragMovement
+		property real pressStartPos
+		property real pressStartX
+
+		anchors.left: parent.left
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+		implicitHeight: handle.implicitHeight
+		preventStealing: true
+
+		onPositionChanged: e => {
+			dragMovement = (e.x - pressStartX) / width;
+			root.interaction(posBinding.value);
+		}
+		onPressed: e => {
+			widthBehavior.enabled = false;
+			pressStartX = e.x;
+			pressStartPos = root.visualPosition;
+		}
+		onReleased: e => {
+			root.interaction(posBinding.value);
+			widthBehavior.enabled = true;
+			dragMovement = 0;
 		}
 	}
 }

Components/CustomSplitButton.qml

@@ -1,7 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
 import qs.Config
-import qs.Helpers
 
 Row {
 	id: root
@@ -12,62 +11,46 @@ Row {
 	}
 
 	property alias active: menu.active
-	property color color: type == CustomSplitButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondaryContainer
+	property color colour: type == CustomSplitButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondaryContainer
 	property bool disabled
-	property color disabledColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color disabledColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
-	property color disabledTextColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	property color disabledTextColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	readonly property alias expandBtn: expandBtn
 	property alias expanded: menu.expanded
 	property string fallbackIcon
 	property string fallbackText
-	property real horizontalPadding: Appearance.padding.normal
+	property real horizontalPadding: Appearance.padding.larger
-	property alias iconLabel: iconLabel
+	readonly property alias iconLabel: iconLabel
-	property alias label: label
+	readonly property alias label: label
-	property alias menu: menu
+	readonly property alias menu: menu
 	property alias menuItems: menu.items
 	property bool menuOnTop
-	property alias stateLayer: stateLayer
+	property real minLeftWidth
-	property color textColor: type == CustomSplitButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
+	readonly property alias stateLayer: stateLayer
+	property color textColour: type == CustomSplitButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
+	readonly property alias textRow: textRow
 	property int type: CustomSplitButton.Filled
-	property real verticalPadding: Appearance.padding.smaller
+	property real verticalPadding: Appearance.padding.small
 
-	function closeDropdown(): void {
+	spacing: Math.floor(Appearance.spacing.extraSmall)
-		SettingsDropdowns.close(menu);
-	}
-
-	function openDropdown(): void {
-		SettingsDropdowns.open(menu, root);
-	}
-
-	function toggleDropdown(): void {
-		SettingsDropdowns.toggle(menu, root);
-	}
-
-	spacing: Math.floor(Appearance.spacing.small / 2)
-
-	onExpandedChanged: {
-		if (!expanded)
-			SettingsDropdowns.forget(menu);
-	}
 
 	CustomRect {
 		bottomRightRadius: Appearance.rounding.small / 2
-		color: !root.enabled ? root.disabledColor : root.color
+		color: root.disabled ? root.disabledColour : root.colour
 		implicitHeight: expandBtn.implicitHeight
-		implicitWidth: textRow.implicitWidth + root.horizontalPadding * 2
+		implicitWidth: Math.max(root.minLeftWidth, textRow.implicitWidth + root.horizontalPadding * 2)
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
 		topRightRadius: Appearance.rounding.small / 2
 
 		StateLayer {
 			id: stateLayer
 
-			function onClicked(): void {
+			bottomRightRadius: parent.bottomRightRadius
-				root.active?.clicked();
+			color: root.textColour
-			}
+			disabled: root.disabled
+			topRightRadius: parent.topRightRadius
 
-			color: root.textColor
+			onClicked: root.active?.clicked()
-			disabled: !root.enabled
-			rect.bottomRightRadius: parent.bottomRightRadius
-			rect.topRightRadius: parent.topRightRadius
 		}
 
 		RowLayout {
@@ -82,7 +65,7 @@ Row {
 
 				Layout.alignment: Qt.AlignVCenter
 				animate: true
-				color: !root.enabled ? root.disabledTextColor : root.textColor
+				color: root.disabled ? root.disabledTextColour : root.textColour
 				fill: 1
 				text: root.active?.activeIcon ?? root.fallbackIcon
 			}
@@ -94,12 +77,12 @@ Row {
 				Layout.preferredWidth: implicitWidth
 				animate: true
 				clip: true
-				color: !root.enabled ? root.disabledTextColor : root.textColor
+				color: root.disabled ? root.disabledTextColour : root.textColour
 				text: root.active?.activeText ?? root.fallbackText
 
 				Behavior on Layout.preferredWidth {
 					Anim {
-						easing.bezierCurve: Appearance.anim.curves.emphasized
+						type: Anim.Emphasized
 					}
 				}
 			}
@@ -112,7 +95,7 @@ Row {
 		property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) : Appearance.rounding.small / 2
 
 		bottomLeftRadius: rad
-		color: !root.enabled ? root.disabledColor : root.color
+		color: root.disabled ? root.disabledColour : root.colour
 		implicitHeight: expandIcon.implicitHeight + root.verticalPadding * 2
 		implicitWidth: implicitHeight
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
@@ -126,14 +109,12 @@ Row {
 		StateLayer {
 			id: expandStateLayer
 
-			function onClicked(): void {
+			color: root.textColour
-				root.toggleDropdown();
+			disabled: root.disabled
-			}
-
-			color: root.textColor
-			disabled: !root.enabled
 			rect.bottomLeftRadius: parent.bottomLeftRadius
 			rect.topLeftRadius: parent.topLeftRadius
+
+			onClicked: root.expanded = !root.expanded
 		}
 
 		MaterialIcon {
@@ -141,7 +122,7 @@ Row {
 
 			anchors.centerIn: parent
 			anchors.horizontalCenterOffset: root.expanded ? 0 : -Math.floor(root.verticalPadding / 4)
-			color: !root.enabled ? root.disabledTextColor : root.textColor
+			color: root.disabled ? root.disabledTextColour : root.textColour
 			rotation: root.expanded ? 180 : 0
 			text: "expand_more"
 
@@ -154,24 +135,14 @@ Row {
 				}
 			}
 		}
+	}
 
-		Menu {
+	Menu {
-			id: menu
+		id: menu
 
-			anchors.bottomMargin: Appearance.spacing.small
+		attachSideY: root.menuOnTop ? Menu.Top : Menu.Bottom
-			anchors.right: parent.right
+		attachTo: expandBtn
-			anchors.top: parent.bottom
+		marginY: Appearance.spacing.small * (root.menuOnTop ? -1 : 1)
-			anchors.topMargin: Appearance.spacing.small
+		thisSideY: root.menuOnTop ? Menu.Bottom : Menu.Top
-
-			states: State {
-				when: root.menuOnTop
-
-				AnchorChanges {
-					anchors.bottom: expandBtn.top
-					anchors.top: undefined
-					target: menu
-				}
-			}
-		}
 	}
 }

Components/CustomSplitButtonRow.qml

@@ -9,7 +9,6 @@ Item {
 
 	property alias active: splitButton.active
 	property alias buttonAlias: splitButton
-	property bool enabled: true
 	property alias expanded: splitButton.expanded
 	property int expandedZ: 100
 	required property string label
@@ -25,7 +24,7 @@ Item {
 	implicitHeight: row.implicitHeight + Appearance.padding.smaller * 2
 	opacity: shouldBeActive ? 1 : 0
 	scale: shouldBeActive ? 1 : 0.8
-	z: root.expanded ? expandedZ : -1
+	z: splitButton.menu.implicitHeight > 0 ? expandedZ : 1
 
 	Behavior on opacity {
 		Anim {
@@ -50,7 +49,6 @@ Item {
 			color: root.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onSurfaceVariant
 			font.pointSize: Appearance.font.size.larger
 			text: root.label
-			z: root.expanded ? root.expandedZ : -1
 		}
 
 		CustomSplitButton {
@@ -58,14 +56,16 @@ Item {
 
 			enabled: root.enabled
 			type: CustomSplitButton.Filled
-			z: root.expanded ? root.expandedZ : -1
+			z: 2
 
 			menu.onItemSelected: item => {
 				root.selected(item);
-				splitButton.closeDropdown();
+			// splitButton.closeDropdown();
 			}
 			stateLayer.onClicked: {
-				splitButton.toggleDropdown();
+				// splitButton.toggleDropdown();
+				splitButton.expanded = !splitButton.expanded;
+				console.log(root.z);
 			}
 		}
 	}

Components/CustomSwitch.qml

@@ -1,6 +1,6 @@
 import QtQuick
-import QtQuick.Templates
 import QtQuick.Shapes
+import QtQuick.Templates
 import qs.Config
 
 Switch {
@@ -13,26 +13,28 @@ Switch {
 
 	indicator: CustomRect {
 		color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
-		implicitHeight: 13 + 7 * 2
+		implicitHeight: Appearance.font.size.medium + Appearance.padding.normal * 2
 		implicitWidth: implicitHeight * 1.7
 		radius: Appearance.rounding.full
 
 		CustomRect {
-			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight
+			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.2 : implicitHeight
 
 			anchors.verticalCenter: parent.verticalCenter
 			color: root.checked && root.enabled ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
-			implicitHeight: parent.implicitHeight - 10
+			implicitHeight: parent.implicitHeight - Appearance.padding.extraSmall
 			implicitWidth: nonAnimWidth
 			radius: Appearance.rounding.full
-			x: root.checked ? parent.implicitWidth - nonAnimWidth - 10 / 2 : 10 / 2
+			x: root.checked ? parent.implicitWidth - nonAnimWidth - Appearance.padding.extraSmall / 2 : Appearance.padding.extraSmall / 2
 
 			Behavior on implicitWidth {
 				Anim {
+					type: Anim.FastSpatial
 				}
 			}
 			Behavior on x {
 				Anim {
+					type: Anim.FastSpatial
 				}
 			}
 
@@ -44,6 +46,7 @@ Switch {
 
 				Behavior on opacity {
 					Anim {
+						type: Anim.DefaultEffects
 					}
 				}
 			}
@@ -63,14 +66,14 @@ Switch {
 				}
 				property point end2: {
 					if (root.pressed)
-						return Qt.point(width, height / 2);
+						return Qt.point(width * 0.8, height / 2);
 					if (root.checked)
 						return Qt.point(width * 0.85, height * 0.2);
 					return Qt.point(width * 0.85, height * 0.15);
 				}
 				property point start1: {
 					if (root.pressed)
-						return Qt.point(width * 0.1, height / 2);
+						return Qt.point(width * 0.2, height / 2);
 					if (root.checked)
 						return Qt.point(width * 0.15, height / 2);
 					return Qt.point(width * 0.15, height * 0.15);
@@ -88,7 +91,7 @@ Switch {
 
 				anchors.centerIn: parent
 				asynchronous: true
-				height: parent.implicitHeight - Appearance.padding.small * 2
+				height: parent.implicitHeight - Appearance.padding.larger
 				preferredRendererType: Shape.CurveRenderer
 				width: height
 
@@ -110,7 +113,7 @@ Switch {
 				}
 
 				ShapePath {
-					capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
+					capStyle: ShapePath.RoundCap
 					fillColor: "transparent"
 					startX: icon.start1.x
 					startY: icon.start1.y
@@ -148,8 +151,7 @@ Switch {
 	}
 
 	component PropAnim: PropertyAnimation {
-		duration: MaterialEasing.expressiveEffectsTime
+		duration: Appearance.anim.durations.expressiveFastSpatial
-		easing.bezierCurve: MaterialEasing.expressiveEffects
+		easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
-		easing.type: Easing.BezierSpline
 	}
 }

Components/Elevation.qml

@@ -1,6 +1,6 @@
-import qs.Config
 import QtQuick
 import QtQuick.Effects
+import qs.Config
 
 RectangularShadow {
 	property real dp: [0, 1, 3, 6, 8, 12][level]
@@ -13,6 +13,7 @@ RectangularShadow {
 
 	Behavior on dp {
 		Anim {
+			type: Anim.SlowEffects
 		}
 	}
 }

Components/Menu.qml

@@ -2,109 +2,169 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
+import Quickshell
 import qs.Config
+import qs.Drawers
 
-Elevation {
+MouseArea {
 	id: root
 
+	enum Side {
+		Top,
+		Bottom,
+		Left,
+		Right
+	}
+
 	property MenuItem active: items[0] ?? null
+	property int attachSideX: Menu.Right
+	property int attachSideY: Menu.Bottom
+	required property Item attachTo
 	property bool expanded
 	property list<MenuItem> items
+	property real marginX
+	property real marginY
+	property int thisSideX: Menu.Right
+	property int thisSideY: Menu.Top
 
 	signal itemSelected(item: MenuItem)
 
-	implicitHeight: root.expanded ? column.implicitHeight + Appearance.padding.small * 2 : 0
+	anchors.fill: parent
-	implicitWidth: Math.max(200, column.implicitWidth)
+	enabled: expanded
-	level: 2
+	layer.enabled: opacity < 1
-	opacity: root.expanded ? 1 : 0
+	opacity: expanded ? 1 : 0
-	radius: Appearance.rounding.normal
+	parent: {
-
+		const win = QsWindow.window;
-	Behavior on implicitHeight {
+		const contentWin = win as Windows;
-		Anim {
+		return contentWin ? contentWin.interactionWrapper : (win as QsWindow).contentItem;
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		}
 	}
+
 	Behavior on opacity {
 		Anim {
-			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			type: Anim.DefaultEffects
 		}
 	}
 
-	CustomClippingRect {
+	onClicked: expanded = false
-		anchors.fill: parent
-		color: DynamicColors.palette.m3surfaceContainer
-		radius: parent.radius
 
-		ColumnLayout {
+	TransformWatcher {
-			id: column
+		id: watcher
 
-			anchors.left: parent.left
+		a: root.parent
-			anchors.right: parent.right
+		b: root.attachTo
-			anchors.verticalCenter: parent.verticalCenter
+	}
-			spacing: 5
 
-			Repeater {
+	Elevation {
-				model: root.items
+		id: menu
 
-				CustomRect {
+		implicitHeight: column.implicitHeight + column.anchors.margins * 2
-					id: item
+		implicitWidth: Math.max(200, column.implicitWidth + column.anchors.margins * 2)
+		level: 2
+		radius: Appearance.rounding.medium
+		x: {
+			watcher.transform;
+			const item = root.attachTo;
+			let off = root.attachSideX === Menu.Left ? 0 : item.width;
+			if (root.thisSideX === Menu.Right)
+				off -= width;
+			return item.mapToItem(root.parent, off, 0).x + root.marginX;
+		}
+		y: {
+			watcher.transform;
+			const item = root.attachTo;
+			let off = root.attachSideY === Menu.Top ? 0 : item.height;
+			if (root.thisSideY === Menu.Bottom)
+				off -= height;
+			return item.mapToItem(root.parent, 0, off).y + root.marginY;
+		}
 
-					readonly property bool active: modelData === root.active
+		transform: Scale {
-					required property int index
+			origin.y: root.thisSideY === Menu.Bottom ? menu.height : 0
-					required property MenuItem modelData
+			yScale: root.expanded ? 1 : 0.1
 
-					Layout.fillWidth: true
+			Behavior on yScale {
-					implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.normal * 2
+				Anim {
-					implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.normal * 2
+				}
+			}
+		}
+
+		CustomRect {
+			anchors.fill: parent
+			color: DynamicColors.palette.m3surfaceContainerLow
+			radius: parent.radius
+
+			ColumnLayout {
+				id: column
+
+				anchors.fill: parent
+				anchors.margins: Appearance.padding.extraSmall
+				spacing: Appearance.spacing.extraSmall
+
+				Repeater {
+					id: repeater
+
+					model: root.items
 
 					CustomRect {
-						anchors.fill: parent
+						id: item
-						anchors.leftMargin: Appearance.padding.small
+
-						anchors.rightMargin: Appearance.padding.small
+						readonly property bool active: modelData === root.active
-						color: Qt.alpha(DynamicColors.palette.m3secondaryContainer, active ? 1 : 0)
+						required property int index
-						radius: Appearance.rounding.normal - Appearance.padding.small
+						required property MenuItem modelData
+
+						Layout.fillWidth: true
+						color: Qt.alpha(DynamicColors.palette.m3tertiaryContainer, active ? 1 : 0)
+						implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.larger * 2
+						implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.larger * 2
+						radius: Appearance.rounding.small
+
+						Behavior on radius {
+							Anim {
+							}
+						}
 
 						StateLayer {
-							function onClicked(): void {
+							color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
+							disabled: !root.expanded
+
+							onClicked: {
 								root.itemSelected(item.modelData);
 								root.active = item.modelData;
+								item.modelData.clicked();
 								root.expanded = false;
 							}
-
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
-							disabled: !root.expanded
-						}
-					}
-
-					RowLayout {
-						id: menuOptionRow
-
-						anchors.fill: parent
-						anchors.margins: Appearance.padding.normal
-						spacing: Appearance.spacing.small
-
-						MaterialIcon {
-							Layout.alignment: Qt.AlignVCenter
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurfaceVariant
-							text: item.modelData.icon
 						}
 
-						CustomText {
+						RowLayout {
-							Layout.alignment: Qt.AlignVCenter
+							id: menuOptionRow
-							Layout.fillWidth: true
-							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
-							text: item.modelData.text
-						}
 
-						Loader {
+							anchors.fill: parent
-							Layout.alignment: Qt.AlignVCenter
+							anchors.margins: Appearance.padding.larger
-							active: item.modelData.trailingIcon.length > 0
+							spacing: Appearance.spacing.small
-							visible: active
 
-							sourceComponent: MaterialIcon {
+							MaterialIcon {
-								color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
+								Layout.alignment: Qt.AlignVCenter
-								text: item.modelData.trailingIcon
+								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurfaceVariant
+								text: item.modelData.icon
+							}
+
+							CustomText {
+								Layout.alignment: Qt.AlignVCenter
+								Layout.fillWidth: true
+								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
+								text: item.modelData.text
+							}
+
+							Loader {
+								Layout.alignment: Qt.AlignVCenter
+								active: item.modelData.trailingIcon.length > 0
+								asynchronous: true
+								visible: active
+
+								sourceComponent: MaterialIcon {
+									color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurfaceVariant
+									text: item.modelData.trailingIcon
+								}
 							}
 						}
 					}

Components/StateLayer.qml

@@ -1,15 +1,53 @@
-import qs.Config
 import QtQuick
+import QtQuick.Shapes
+import ZShell
+import ZShell.Components
+import qs.Helpers
+import qs.Config
 
 MouseArea {
 	id: root
 
-	property color color: DynamicColors.palette.m3onSurface
+	property alias bottomLeftRadius: base.bottomLeftRadius
+	property alias bottomRightRadius: base.bottomRightRadius
+	property real circleRadius
+	property alias color: base.color
 	property bool disabled
-	property real radius: parent?.radius ?? 0
+	readonly property real endRadius: {
-	property alias rect: hoverLayer
+		const d1 = distSq(0, 0);
+		const d2 = distSq(width, 0);
+		const d3 = distSq(0, height);
+		const d4 = distSq(width, height);
+		return (Math.sqrt(Math.max(d1, d2, d3, d4)) + (shapeMorph ? 24 : 0)) * 1.3;
+	}
+	property real endRadiusAtPress
+	property bool manualPressOverride
+	property real pressX: width / 2
+	property real pressY: height / 2
+	property alias radius: base.radius
+	readonly property alias rect: base
+	property bool shapeMorph
+	property bool showHoverBackground: true
+	property real stateOpacity: containsMouse ? 0.08 : 0
+	property alias topLeftRadius: base.topLeftRadius
+	property alias topRightRadius: base.topRightRadius
 
-	function onClicked(): void {
+	function clamp(r: real): real {
+		return Math.max(0, Math.min(r, width / 2, height / 2));
+	}
+
+	function distSq(x: real, y: real): real {
+		return (pressX - x) ** 2 + (pressY - y) ** 2;
+	}
+
+	function press(x: real, y: real): void {
+		pressX = x;
+		pressY = y;
+		fadeAnim.complete();
+		circleRadius = 0;
+		circle.opacity = 0.1;
+		rippleAnim.restart();
+		endRadiusAtPress = endRadius;
 	}
 
 	anchors.fill: parent
@@ -17,79 +55,146 @@ MouseArea {
 	enabled: !disabled
 	hoverEnabled: true
 
-	onClicked: event => !disabled && onClicked(event)
+	Behavior on stateOpacity {
-	onPressed: event => {
+		Anim {
-		if (disabled)
+			type: Anim.DefaultEffects
-			return;
+		}
-
-		rippleAnim.x = event.x;
-		rippleAnim.y = event.y;
-
-		const dist = (ox, oy) => ox * ox + oy * oy;
-		rippleAnim.radius = Math.sqrt(Math.max(dist(event.x, event.y), dist(event.x, height - event.y), dist(width - event.x, event.y), dist(width - event.x, height - event.y)));
-
-		rippleAnim.restart();
 	}
 
-	SequentialAnimation {
+	onCircleRadiusChanged: {
+		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
+			fadeAnim.start();
+	}
+	onClicked: event => !disabled && onClicked(event)
+	onManualPressOverrideChanged: {
+		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
+			fadeAnim.start();
+	}
+	onPressed: e => press(e.x, e.y)
+	onPressedChanged: {
+		if (!(pressed || manualPressOverride) && !rippleAnim.running && circle.opacity > 0)
+			fadeAnim.start();
+	}
+
+	Anim {
 		id: rippleAnim
 
-		property real radius
+		alwaysRunToEnd: true
-		property real x
+		duration: Appearance.anim.durations.expressiveSlowEffects * 2
-		property real y
+		easing.bezierCurve: Appearance.anim.curves.standard
-
+		property: "circleRadius"
-		PropertyAction {
+		target: root
-			property: "x"
+		to: root.endRadius
-			target: ripple
-			value: rippleAnim.x
-		}
-
-		PropertyAction {
-			property: "y"
-			target: ripple
-			value: rippleAnim.y
-		}
-
-		PropertyAction {
-			property: "opacity"
-			target: ripple
-			value: 0.08
-		}
-
-		Anim {
-			easing.bezierCurve: MaterialEasing.standardDecel
-			from: 0
-			properties: "implicitWidth,implicitHeight"
-			target: ripple
-			to: rippleAnim.radius * 2
-		}
-
-		Anim {
-			property: "opacity"
-			target: ripple
-			to: 0
-		}
 	}
 
-	CustomClippingRect {
+	Anim {
-		id: hoverLayer
+		id: fadeAnim
+
+		property: "opacity"
+		target: circle
+		to: 0
+		type: Anim.SlowEffects
+	}
+
+	CustomRect {
+		id: base
 
 		anchors.fill: parent
-		border.pixelAligned: false
+		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
-		color: Qt.alpha(root.color, root.disabled ? 0 : root.pressed ? 0.1 : root.containsMouse ? 0.08 : 0)
+		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
-		radius: root.radius
+		color: DynamicColors.palette.m3onSurface
+		opacity: root.stateOpacity
+		// Pick up radius from parent if it has one (parent can be anything with radius props)
+		// qmllint disable missing-property
+		radius: root.parent?.radius ?? 0
+		topLeftRadius: root.parent?.topLeftRadius ?? radius ?? 0
+		topRightRadius: root.parent?.topRightRadius ?? radius ?? 0
+		// qmllint enable missing-property
+	}
 
-		CustomRect {
+	Shape {
-			id: ripple
+		id: circle
 
-			border.pixelAligned: false
+		anchors.fill: parent
-			color: root.color
+		opacity: 0
-			opacity: 0
+		preferredRendererType: Shape.CurveRenderer
-			radius: Appearance.rounding.full
 
-			transform: Translate {
+		ShapePath {
-				x: -ripple.width / 2
+			fillColor: base.color
-				y: -ripple.height / 2
+			startX: root.clamp(base.topLeftRadius)
+			startY: 0
+			strokeColor: "transparent"
+			strokeWidth: 0
+
+			fillGradient: RadialGradient {
+				centerRadius: root.circleRadius
+				centerX: root.pressX
+				centerY: root.pressY
+				focalX: centerX
+				focalY: centerY
+
+				GradientStop {
+					color: Qt.alpha(base.color, 1)
+					position: 0
+				}
+
+				GradientStop {
+					color: Qt.alpha(base.color, 1)
+					position: ZUtils.clamp(1 - 0.2 * root.endRadius / root.circleRadius, 0.01, 0.99)
+				}
+
+				GradientStop {
+					color: Qt.alpha(base.color, ZUtils.clamp((root.circleRadius / root.endRadius - 0.9) / 0.1, 0, 1))
+					position: 1
+				}
+			}
+
+			PathLine {
+				x: root.width - root.clamp(base.topRightRadius)
+				y: 0
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.topRightRadius)
+				radiusY: root.clamp(base.topRightRadius)
+				relativeX: root.clamp(base.topRightRadius)
+				relativeY: root.clamp(base.topRightRadius)
+			}
+
+			PathLine {
+				x: root.width
+				y: root.height - root.clamp(base.bottomRightRadius)
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.bottomRightRadius)
+				radiusY: root.clamp(base.bottomRightRadius)
+				relativeX: -root.clamp(base.bottomRightRadius)
+				relativeY: root.clamp(base.bottomRightRadius)
+			}
+
+			PathLine {
+				x: root.clamp(base.bottomLeftRadius)
+				y: root.height
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.bottomLeftRadius)
+				radiusY: root.clamp(base.bottomLeftRadius)
+				relativeX: -root.clamp(base.bottomLeftRadius)
+				relativeY: -root.clamp(base.bottomLeftRadius)
+			}
+
+			PathLine {
+				x: 0
+				y: root.clamp(base.topLeftRadius)
+			}
+
+			PathArc {
+				radiusX: root.clamp(base.topLeftRadius)
+				radiusY: root.clamp(base.topLeftRadius)
+				x: root.clamp(base.topLeftRadius)
+				y: 0
 			}
 		}
 	}

Config/Appearance.qml

@@ -7,8 +7,6 @@ Singleton {
 	readonly property AppearanceConf.Deform deform: Config.appearance.deform
 	readonly property AppearanceConf.FontStuff font: Config.appearance.font
 	readonly property AppearanceConf.Padding padding: Config.appearance.padding
-	// Literally just here to shorten accessing stuff :woe:
-	// Also kinda so I can keep accessing it with `Appearance.xxx` instead of `Conf.appearance.xxx`
 	readonly property AppearanceConf.Rounding rounding: Config.appearance.rounding
 	readonly property AppearanceConf.Spacing spacing: Config.appearance.spacing
 	readonly property AppearanceConf.Transparency transparency: Config.appearance.transparency

Config/AppearanceConf.qml

@@ -28,9 +28,13 @@ JsonObject {
 		property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
 		property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
 		property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
+		property list<real> expressiveDefaultEffects: [0.34, 0.8, 0.34, 1, 1, 1]
 		property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
 		property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
+		property list<real> expressiveFastEffects: [0.31, 0.94, 0.34, 1, 1, 1]
 		property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
+		property list<real> expressiveSlowEffects: [0.34, 0.88, 0.34, 1, 1, 1]
+		property list<real> expressiveSlowSpatial: [0.39, 1.29, 0.35, 0.98, 1, 1]
 		property list<real> standard: [0.2, 0, 0, 1, 1, 1]
 		property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
 		property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
@@ -38,7 +42,9 @@ JsonObject {
 	component AnimDurations: JsonObject {
 		property int expressiveDefaultSpatial: 500 * scale
 		property int expressiveEffects: 200 * scale
+		property int expressiveFastEffects: 150 * scale
 		property int expressiveFastSpatial: 350 * scale
+		property int expressiveSlowEffects: 300 * scale
 		property int extraLarge: 1000 * scale
 		property int large: 600 * scale
 		property int normal: 400 * scale
@@ -57,7 +63,8 @@ JsonObject {
 	component FontSize: JsonObject {
 		property int extraLarge: 28 * scale
 		property int large: 18 * scale
-		property int larger: 15 * scale
+		property int larger: 16 * scale
+		property int medium: 14 * scale
 		property int normal: 13 * scale
 		property real scale: 1
 		property int small: 11 * scale
@@ -70,23 +77,28 @@ JsonObject {
 		}
 	}
 	component Padding: JsonObject {
-		property int large: 15 * scale
+		property int extraLargeIncreased: 32 * scale
-		property int larger: 13 * scale
+		property int extraSmall: 4 * scale
-		property int normal: 9 * scale
+		property int large: 16 * scale
+		property int larger: 12 * scale
+		property int normal: 8 * scale
 		property real scale: 1
 		property int small: 5 * scale
 		property int smaller: 7 * scale
 		property int smallest: 2 * scale
 	}
 	component Rounding: JsonObject {
+		property int extraSmall: 4 * scale
 		property int full: 1000 * scale
 		property int large: 24 * scale
+		property int medium: 16 * scale
 		property int normal: 18 * scale
 		property real scale: 1
 		property int small: 12 * scale
 		property int smallest: 8 * scale
 	}
 	component Spacing: JsonObject {
+		property int extraSmall: 4 * scale
 		property int large: 20 * scale
 		property int larger: 16 * scale
 		property int normal: 12 * scale

Drawers/Drawers.qml

@@ -0,0 +1,25 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+
+Variants {
+	model: Quickshell.screens
+
+	Scope {
+		id: scope
+
+		required property ShellScreen modelData
+
+		Exclusions {
+			bar: content.bar
+			screen: scope.modelData
+		}
+
+		Windows {
+			id: content
+
+			screen: scope.modelData
+		}
+	}
+}

Drawers/Interactions.qml

@@ -59,7 +59,7 @@ Item {
 
 		cursorShape: (active && centroid.pressPosition.y < root.bar.implicitHeight) ? Qt.ClosedHandCursor : undefined
 		dragThreshold: 0
-		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfDifferentType | PointerHandler.ApprovesTakeOverByAnything
+		grabPermissions: PointerHandler.CanTakeOverFromHandlersOfSameType | PointerHandler.ApprovesTakeOverByAnything
 		maximumPointCount: 1
 		minimumPointCount: 1
 		target: null
@@ -69,14 +69,17 @@ Item {
 				root.singleGestureTriggered = false;
 		}
 		onCentroidChanged: {
-			if (root.singleGestureTriggered)
-				return;
-
 			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;

Drawers/Windows.qml

@@ -9,397 +9,382 @@ import Quickshell.Hyprland
 import ZShell.Blobs
 import qs.Daemons
 import qs.Components
-import qs.Modules
 import qs.Modules.Bar
 import qs.Config
 import qs.Helpers
 import qs.Drawers
 
-Variants {
+CustomWindow {
-	model: Quickshell.screens
+	id: root
 
-	Scope {
+	readonly property alias bar: bar
-		id: scope
+	readonly property bool hasFullscreen: Hypr.monitorFor(screen)?.activeWorkspace?.toplevels.values.some(t => t.lastIpcObject.fullscreen === 2)
+	readonly property alias interactionWrapper: interactions
+	property var root: Quickshell.shellDir
 
-		required property var modelData
+	WlrLayershell.exclusionMode: ExclusionMode.Ignore
+	// 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
+	name: "Bar"
 
-		Exclusions {
+	contentItem.Keys.onEscapePressed: {
-			bar: bar
+		if (Config.barConfig.autoHide)
-			screen: scope.modelData
+			visibilities.bar = false;
+		visibilities.sidebar = false;
+		visibilities.dashboard = false;
+		visibilities.osd = false;
+		visibilities.settings = false;
+		visibilities.resources = false;
+	}
+	onHasFullscreenChanged: {
+		visibilities.launcher = false;
+		visibilities.dashboard = false;
+		visibilities.osd = false;
+		visibilities.settings = false;
+		visibilities.resources = false;
+	}
+
+	Region {
+		id: region
+
+		height: root.height - bar.implicitHeight - Config.barConfig.border
+		intersection: Intersection.Xor
+		regions: popoutRegions.instances
+		width: root.width - Config.barConfig.border * 2
+		x: Config.barConfig.border
+		y: bar.implicitHeight
+	}
+
+	anchors {
+		bottom: true
+		left: true
+		right: true
+		top: true
+	}
+
+	Variants {
+		id: popoutRegions
+
+		model: panels.children
+
+		Region {
+			required property Item modelData
+
+			height: modelData.height
+			intersection: Intersection.Subtract
+			width: modelData.width
+			x: modelData.x + Config.barConfig.border
+			y: modelData.y + bar.implicitHeight
+		}
+	}
+
+	HyprlandFocusGrab {
+		id: focusGrab
+
+		active: visibilities.dock || visibilities.resources || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu"))
+		windows: [root]
+
+		onCleared: {
+			visibilities.launcher = false;
+			visibilities.sidebar = false;
+			visibilities.dashboard = false;
+			visibilities.osd = false;
+			visibilities.settings = false;
+			visibilities.resources = false;
+			visibilities.dock = false;
+			panels.popouts.hasCurrent = false;
+		}
+	}
+
+	PersistentProperties {
+		id: visibilities
+
+		property bool bar
+		property bool dashboard
+		property bool dock
+		property bool isDrawing
+		property bool launcher
+		property bool notif: NotifServer.popups.length > 0
+		property bool osd
+		property bool resources
+		property bool settings
+		property bool sidebar
+
+		Component.onCompleted: Visibilities.load(root.screen, this)
+	}
+
+	IpcHandler {
+		function toggleLauncher(fix: string): void {
+			visibilities.launcher = !visibilities.launcher;
 		}
 
-		CustomWindow {
+		target: "visibilities"
-			id: win
+	}
 
-			readonly property bool hasFullscreen: Hypr.monitorFor(screen)?.activeWorkspace?.toplevels.values.some(t => t.lastIpcObject.fullscreen === 2)
+	Binding {
-			property var root: Quickshell.shellDir
+		property: "bar"
+		target: visibilities
+		value: visibilities.sidebar || visibilities.dashboard || visibilities.osd || (!Config.barConfig.hideWhenNotif && visibilities.notif) || visibilities.resources || visibilities.settings || bar.isHovered
+		when: Config.barConfig.autoHide
+	}
 
-			WlrLayershell.exclusionMode: ExclusionMode.Ignore
+	Item {
-			// WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+		anchors.fill: parent
-			color: "transparent"
+		layer.enabled: true
-			contentItem.focus: true
+		opacity: Appearance.transparency.enabled ? DynamicColors.transparency.base : 1
-			mask: visibilities.isDrawing ? null : region
-			name: "Bar"
-			screen: scope.modelData
 
-			contentItem.Keys.onEscapePressed: {
+		layer.effect: MultiEffect {
-				if (Config.barConfig.autoHide)
+			blurMax: 32
-					visibilities.bar = false;
+			shadowColor: Qt.alpha(DynamicColors.palette.m3shadow, 1)
-				visibilities.sidebar = false;
+			shadowEnabled: true
-				visibilities.dashboard = false;
+		}
-				visibilities.osd = false;
-				visibilities.settings = false;
-				visibilities.resources = false;
-			}
-			onHasFullscreenChanged: {
-				visibilities.launcher = false;
-				visibilities.dashboard = false;
-				visibilities.osd = false;
-				visibilities.settings = false;
-				visibilities.resources = false;
-			}
 
-			Region {
+		BlobGroup {
-				id: region
+			id: blobGroup
 
-				height: win.height - bar.implicitHeight - Config.barConfig.border
+			color: DynamicColors.palette.m3surface
-				intersection: Intersection.Xor
+			smoothing: Config.barConfig.smoothing
-				regions: popoutRegions.instances
-				width: win.width - Config.barConfig.border * 2
-				x: Config.barConfig.border
-				y: bar.implicitHeight
-			}
 
-			anchors {
+			Behavior on color {
-				bottom: true
+				CAnim {
-				left: true
-				right: true
-				top: true
-			}
-
-			Variants {
-				id: popoutRegions
-
-				model: panels.children
-
-				Region {
-					required property Item modelData
-
-					height: modelData.height
-					intersection: Intersection.Subtract
-					width: modelData.width
-					x: modelData.x + Config.barConfig.border
-					y: modelData.y + bar.implicitHeight
 				}
 			}
+		}
 
-			HyprlandFocusGrab {
+		BlobInvertedRect {
-				id: focusGrab
+			anchors.fill: parent
+			anchors.margins: -50
+			borderBottom: Config.barConfig.border - anchors.margins
+			borderLeft: Config.barConfig.border - anchors.margins
+			borderRight: Config.barConfig.border - anchors.margins
+			borderTop: bar.implicitHeight - anchors.margins
+			group: blobGroup
+			radius: Config.barConfig.rounding
+		}
 
-				active: visibilities.dock || visibilities.resources || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || (panels.popouts.hasCurrent && panels.popouts.currentName.startsWith("traymenu"))
+		PanelBg {
-				windows: [win]
+			id: dashBg
 
-				onCleared: {
+			property real extraHeight: 0.2
-					visibilities.launcher = false;
+
-					visibilities.sidebar = false;
+			deformAmount: 0.06
-					visibilities.dashboard = false;
+			implicitHeight: panels.dashboard.height * (1 + extraHeight)
-					visibilities.osd = false;
+			implicitWidth: panels.dashboard.width
-					visibilities.settings = false;
+			panel: panels.dashboardWrapper
-					visibilities.resources = false;
+			radius: Appearance.rounding.normal
-					visibilities.dock = false;
+			x: panels.dashboardWrapper.x + panels.dashboard.x + Config.barConfig.border
-					panels.popouts.hasCurrent = false;
+			y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight - panels.dashboard.height * extraHeight
+		}
+
+		PanelBg {
+			id: launcherBg
+
+			property real extraHeight: 0.2
+
+			deformAmount: 0.06
+			implicitHeight: panels.launcher.height * (1 + extraHeight)
+			panel: panels.launcher
+			radius: Appearance.rounding.smallest + 5
+			y: panels.launcher.y + bar.implicitHeight
+		}
+
+		PanelBg {
+			id: sidebarBg
+
+			bottomLeftRadius: 0
+			deformAmount: 0.04
+			exclude: panels.sidebar.offsetScale > 0.08 ? [] : [utilsBg]
+			implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2
+			panel: panels.sidebar
+		}
+
+		PanelBg {
+			id: osdBg
+
+			deformAmount: 0.1
+			implicitHeight: panels.osd.height
+			implicitWidth: panels.osd.width
+			panel: panels.osdWrapper
+			radius: 20
+			x: panels.osdWrapper.x + panels.osd.x + Config.barConfig.border
+			y: panels.osdWrapper.y + panels.osd.y + bar.implicitHeight
+		}
+
+		PanelBg {
+			id: notifsBg
+
+			panel: panels.notifications
+			radius: Appearance.rounding.normal
+		}
+
+		PanelBg {
+			id: utilsBg
+
+			deformAmount: panels.sidebar.visible ? (0.1) : (0.1)
+			exclude: panels.sidebar.offsetScale > 0.08 ? [] : [sidebarBg]
+			panel: panels.utilities
+			topLeftRadius: 0
+		}
+
+		PanelBg {
+			id: popoutBg
+
+			property real extraHeight: panels.popouts.isDetached ? 0 : 0.2
+
+			deformAmount: panels.popouts.isDetached ? 0.05 : panels.popouts.hasCurrent ? 0.15 : 0.1
+			implicitHeight: panels.popouts.height * (1 + extraHeight)
+			implicitWidth: panels.popouts.width
+			panel: panels.popoutsWrapper
+			radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : 20 * Appearance.rounding.scale
+			x: panels.popoutsWrapper.x + panels.popouts.x + Config.barConfig.border
+			y: panels.popoutsWrapper.y + panels.popouts.y + bar.implicitHeight - panels.popouts.height * extraHeight
+
+			Behavior on extraHeight {
+				Anim {
 				}
 			}
+		}
 
-			PersistentProperties {
+		PanelBg {
-				id: visibilities
+			id: resourcesBg
 
-				property bool bar
+			deformAmount: 0.05
-				property bool dashboard
+			implicitHeight: panels.resources.height
-				property bool dock
+			implicitWidth: panels.resources.width
-				property bool isDrawing
+			panel: panels.resourcesWrapper
-				property bool launcher
+			radius: Appearance.rounding.normal
-				property bool notif: NotifServer.popups.length > 0
+			x: panels.resourcesWrapper.x + panels.resources.x + Config.barConfig.border
-				property bool osd
+			y: panels.resourcesWrapper.y + panels.resources.y + bar.implicitHeight
-				property bool resources
+		}
-				property bool settings
-				property bool sidebar
 
-				Component.onCompleted: Visibilities.load(scope.modelData, this)
+		PanelBg {
+			id: settingsBg
+
+			property real extraHeight: 0.2
+
+			deformAmount: 0.03
+			implicitHeight: panels.settings.height * (1 + extraHeight)
+			implicitWidth: panels.settings.width
+			panel: panels.settings
+			radius: Appearance.rounding.large
+			topLeftRadius: Appearance.rounding.large + Appearance.padding.smaller
+			topRightRadius: Appearance.rounding.large + Appearance.padding.smaller
+			x: panels.settingsWrapper.x + panels.settings.x + Config.barConfig.border
+			y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight - panels.settings.height * extraHeight
+		}
+
+		PanelBg {
+			id: dockBg
+
+			deformAmount: 0.08
+			panel: panels.dock
+			radius: Appearance.rounding.normal
+		}
+
+		PanelBg {
+			id: drawingBg
+
+			deformAmount: 0.08
+			panel: panels.drawing
+			radius: Appearance.rounding.normal
+		}
+	}
+
+	Loader {
+		id: drawingLoader
+
+		active: visibilities.isDrawing
+		anchors.fill: parent
+		z: 2
+
+		sourceComponent: Drawing {
+			id: drawing
+		}
+	}
+
+	Loader {
+		id: inputLoader
+
+		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 {
+		id: interactions
+
+		anchors.fill: parent
+		bar: bar
+		drawing: drawingLoader.item
+		enabled: true
+		input: inputLoader.item
+		panels: panels
+		popouts: panels.popouts
+		screen: root.screen
+		visibilities: visibilities
+		z: 1
+
+		Panels {
+			id: panels
+
+			bar: bar
+			drawingItem: drawingLoader.item
+			screen: root.screen
+			visibilities: visibilities
+
+			dashboard.transform: Matrix4x4 {
+				matrix: dashBg.deformMatrix
 			}
-
+			dock.transform: Matrix4x4 {
-			IpcHandler {
+				matrix: dockBg.deformMatrix
-				function toggleLauncher(fix: string): void {
-					visibilities.launcher = !visibilities.launcher;
-				}
-
-				target: "visibilities"
 			}
-
+			launcher.transform: Matrix4x4 {
-			Binding {
+				matrix: launcherBg.deformMatrix
-				property: "bar"
-				target: visibilities
-				value: visibilities.sidebar || visibilities.dashboard || visibilities.osd || (!Config.barConfig.hideWhenNotif && visibilities.notif) || visibilities.resources || visibilities.settings || bar.isHovered
-				when: Config.barConfig.autoHide
 			}
-
+			notifications.transform: Matrix4x4 {
-			Item {
+				matrix: notifsBg.deformMatrix
-				anchors.fill: parent
-				layer.enabled: true
-				opacity: Appearance.transparency.enabled ? DynamicColors.transparency.base : 1
-
-				layer.effect: MultiEffect {
-					blurMax: 32
-					shadowColor: Qt.alpha(DynamicColors.palette.m3shadow, 1)
-					shadowEnabled: true
-				}
-
-				BlobGroup {
-					id: blobGroup
-
-					color: DynamicColors.palette.m3surface
-					smoothing: Config.barConfig.smoothing
-
-					Behavior on color {
-						CAnim {
-						}
-					}
-				}
-
-				BlobInvertedRect {
-					anchors.fill: parent
-					anchors.margins: -50
-					borderBottom: Config.barConfig.border - anchors.margins
-					borderLeft: Config.barConfig.border - anchors.margins
-					borderRight: Config.barConfig.border - anchors.margins
-					borderTop: bar.implicitHeight - anchors.margins
-					group: blobGroup
-					radius: Config.barConfig.rounding
-				}
-
-				PanelBg {
-					id: dashBg
-
-					property real extraHeight: 0.2
-
-					deformAmount: 0.06
-					implicitHeight: panels.dashboard.height * (1 + extraHeight)
-					implicitWidth: panels.dashboard.width
-					panel: panels.dashboardWrapper
-					radius: Appearance.rounding.normal
-					x: panels.dashboardWrapper.x + panels.dashboard.x + Config.barConfig.border
-					y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight - panels.dashboard.height * extraHeight
-				}
-
-				PanelBg {
-					id: launcherBg
-
-					property real extraHeight: 0.2
-
-					deformAmount: 0.06
-					implicitHeight: panels.launcher.height * (1 + extraHeight)
-					panel: panels.launcher
-					radius: Appearance.rounding.smallest + 5
-					y: panels.launcher.y + bar.implicitHeight
-				}
-
-				PanelBg {
-					id: sidebarBg
-
-					bottomLeftRadius: 0
-					deformAmount: 0.04
-					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [utilsBg]
-					implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2
-					panel: panels.sidebar
-				}
-
-				PanelBg {
-					id: osdBg
-
-					deformAmount: 0.1
-					implicitHeight: panels.osd.height
-					implicitWidth: panels.osd.width
-					panel: panels.osdWrapper
-					radius: 20
-					x: panels.osdWrapper.x + panels.osd.x + Config.barConfig.border
-					y: panels.osdWrapper.y + panels.osd.y + bar.implicitHeight
-				}
-
-				PanelBg {
-					id: notifsBg
-
-					panel: panels.notifications
-					radius: Appearance.rounding.normal
-				}
-
-				PanelBg {
-					id: utilsBg
-
-					deformAmount: panels.sidebar.visible ? (0.1) : (0.1)
-					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [sidebarBg]
-					panel: panels.utilities
-					topLeftRadius: 0
-				}
-
-				PanelBg {
-					id: popoutBg
-
-					property real extraHeight: panels.popouts.isDetached ? 0 : 0.2
-
-					deformAmount: panels.popouts.isDetached ? 0.05 : panels.popouts.hasCurrent ? 0.15 : 0.1
-					implicitHeight: panels.popouts.height * (1 + extraHeight)
-					implicitWidth: panels.popouts.width
-					panel: panels.popoutsWrapper
-					radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : 20 * Appearance.rounding.scale
-					x: panels.popoutsWrapper.x + panels.popouts.x + Config.barConfig.border
-					y: panels.popoutsWrapper.y + panels.popouts.y + bar.implicitHeight - panels.popouts.height * extraHeight
-
-					Behavior on extraHeight {
-						Anim {
-						}
-					}
-				}
-
-				PanelBg {
-					id: resourcesBg
-
-					deformAmount: 0.05
-					implicitHeight: panels.resources.height
-					implicitWidth: panels.resources.width
-					panel: panels.resourcesWrapper
-					radius: Appearance.rounding.normal
-					x: panels.resourcesWrapper.x + panels.resources.x + Config.barConfig.border
-					y: panels.resourcesWrapper.y + panels.resources.y + bar.implicitHeight
-				}
-
-				PanelBg {
-					id: settingsBg
-
-					property real extraHeight: 0.2
-
-					deformAmount: 0.03
-					implicitHeight: panels.settings.height * (1 + extraHeight)
-					implicitWidth: panels.settings.width
-					panel: panels.settings
-					radius: Appearance.rounding.large
-					topLeftRadius: Appearance.rounding.large + Appearance.padding.smaller
-					topRightRadius: Appearance.rounding.large + Appearance.padding.smaller
-					x: panels.settingsWrapper.x + panels.settings.x + Config.barConfig.border
-					y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight - panels.settings.height * extraHeight
-				}
-
-				PanelBg {
-					id: dockBg
-
-					deformAmount: 0.08
-					panel: panels.dock
-					radius: Appearance.rounding.normal
-				}
-
-				PanelBg {
-					id: drawingBg
-
-					deformAmount: 0.08
-					panel: panels.drawing
-					radius: Appearance.rounding.normal
-				}
 			}
-
+			osd.transform: Matrix4x4 {
-			Loader {
+				matrix: osdBg.deformMatrix
-				id: drawingLoader
-
-				active: visibilities.isDrawing
-				anchors.fill: parent
-				z: 2
-
-				sourceComponent: Drawing {
-					id: drawing
-				}
 			}
-
+			popouts.transform: Matrix4x4 {
-			Loader {
+				matrix: popoutBg.deformMatrix
-				id: inputLoader
-
-				active: visibilities.isDrawing
-				anchors.fill: parent
-				z: 2
-
-				sourceComponent: DrawingInput {
-					id: input
-
-					bar: bar
-					drawing: drawingLoader.item
-					panels: panels
-					popout: panels.drawing
-					visibilities: visibilities
-				}
 			}
-
+			resources.transform: Matrix4x4 {
-			Interactions {
+				matrix: resourcesBg.deformMatrix
-				id: mouseArea
-
-				anchors.fill: parent
-				bar: bar
-				drawing: drawingLoader.item
-				enabled: true
-				input: inputLoader.item
-				panels: panels
-				popouts: panels.popouts
-				screen: scope.modelData
-				visibilities: visibilities
-				z: 1
-
-				Panels {
-					id: panels
-
-					bar: bar
-					drawingItem: drawingLoader.item
-					screen: scope.modelData
-					visibilities: visibilities
-
-					dashboard.transform: Matrix4x4 {
-						matrix: dashBg.deformMatrix
-					}
-					dock.transform: Matrix4x4 {
-						matrix: dockBg.deformMatrix
-					}
-					launcher.transform: Matrix4x4 {
-						matrix: launcherBg.deformMatrix
-					}
-					notifications.transform: Matrix4x4 {
-						matrix: notifsBg.deformMatrix
-					}
-					osd.transform: Matrix4x4 {
-						matrix: osdBg.deformMatrix
-					}
-					popouts.transform: Matrix4x4 {
-						matrix: popoutBg.deformMatrix
-					}
-					resources.transform: Matrix4x4 {
-						matrix: resourcesBg.deformMatrix
-					}
-					settings.transform: Matrix4x4 {
-						matrix: settingsBg.deformMatrix
-					}
-					sidebar.transform: Matrix4x4 {
-						matrix: sidebarBg.deformMatrix
-					}
-					utilities.transform: Matrix4x4 {
-						matrix: utilsBg.deformMatrix
-					}
-				}
-
-				BarLoader {
-					id: bar
-
-					anchors.left: parent.left
-					anchors.right: parent.right
-					popouts: panels.popouts
-					popoutsWrapper: panels.popoutsWrapper
-					screen: scope.modelData
-					visibilities: visibilities
-				}
 			}
+			settings.transform: Matrix4x4 {
+				matrix: settingsBg.deformMatrix
+			}
+			sidebar.transform: Matrix4x4 {
+				matrix: sidebarBg.deformMatrix
+			}
+			utilities.transform: Matrix4x4 {
+				matrix: utilsBg.deformMatrix
+			}
+		}
+
+		BarLoader {
+			id: bar
+
+			anchors.left: parent.left
+			anchors.right: parent.right
+			popouts: panels.popouts
+			popoutsWrapper: panels.popoutsWrapper
+			screen: root.screen
+			visibilities: visibilities
 		}
 	}
 

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

@@ -62,6 +62,7 @@ SettingsPage {
 
 	SettingsSection {
 		sectionId: "Color"
+		z: 1
 
 		SettingsHeader {
 			name: "Color"
@@ -105,7 +106,6 @@ SettingsPage {
 			active: root.schemeTypeItem(menuItems, Config.colors.schemeType)
 			enabled: Config.general.color.schemeGeneration
 			label: qsTr("Scheme type")
-			z: 2
 
 			menuItems: [
 				MenuItem {
@@ -250,7 +250,6 @@ SettingsPage {
 
 	SettingsSection {
 		sectionId: "Default Apps"
-		z: -1
 
 		SettingsHeader {
 			name: "Default Apps"

Modules/Settings/Controls/WallpaperCropper.qml

@@ -141,14 +141,14 @@ Item {
 						id: zoomSlider
 
 						Layout.fillWidth: true
-						Layout.preferredHeight: 30
+						Layout.preferredHeight: Appearance.padding.larger * 3
 						from: 1.0
-						implicitHeight: 30
+						implicitHeight: Appearance.padding.larger * 3
 						to: 5.0
 						value: cropRectLoader.item ? cropRectLoader.item.zoom : 1.0
 
-						onMoved: {
+						onInteraction: value => {
-							delegate.zoomClipRect(value);
+							delegate.zoomClipRect(1 + (value * 4));
 							wrapper.changesMade = true;
 						}
 					}

Modules/SysTray/Popouts/AudioPopup.qml

@@ -19,7 +19,7 @@ Item {
 	required property var wrapper
 
 	implicitHeight: vol.implicitHeight + Appearance.padding.small * 2
-	implicitWidth: 400 + Appearance.padding.small * 2
+	implicitWidth: 600 + Appearance.padding.small * 2
 
 	CustomRect {
 		anchors.left: parent.left
@@ -52,7 +52,7 @@ Item {
 
 		CustomRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 50 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 65 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
@@ -62,15 +62,15 @@ Item {
 
 				anchors.bottom: parent.bottom
 				anchors.left: parent.left
-				anchors.leftMargin: Appearance.padding.normal
+				anchors.leftMargin: Appearance.padding.larger
 				anchors.top: parent.top
 				implicitWidth: childrenRect.width
 
 				CustomRect {
 					anchors.centerIn: parent
 					color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-					implicitHeight: 40
+					implicitHeight: 54
-					implicitWidth: 40
+					implicitWidth: 54
 					radius: Appearance.rounding.full
 
 					MaterialIcon {
@@ -78,7 +78,7 @@ Item {
 						anchors.centerIn: parent
 						animate: true
 						color: Audio.muted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-						font.pointSize: 22
+						font.pointSize: Appearance.font.size.extraLarge
 						text: Audio.muted ? "volume_off" : "volume_up"
 					}
 
@@ -98,7 +98,7 @@ Item {
 				anchors.bottom: parent.bottom
 				anchors.bottomMargin: Appearance.padding.smallest
 				anchors.left: sinkIcon.right
-				anchors.leftMargin: Appearance.spacing.normal
+				anchors.leftMargin: Appearance.spacing.larger
 				anchors.right: parent.right
 				anchors.rightMargin: Appearance.padding.large
 				anchors.top: parent.top
@@ -122,14 +122,14 @@ Item {
 				}
 
 				CustomMouseArea {
-					Layout.bottomMargin: 5
+					Layout.bottomMargin: Appearance.padding.normal
-					Layout.fillHeight: true
 					Layout.fillWidth: true
+					Layout.preferredHeight: Appearance.padding.larger * 3
 
 					CustomSlider {
 						anchors.left: parent.left
 						anchors.right: parent.right
-						color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+						fgColor: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
 						implicitHeight: parent.height
 						value: Audio.volume
 
@@ -138,7 +138,7 @@ Item {
 							}
 						}
 
-						onMoved: Audio.setVolume(value)
+						onInteraction: value => Audio.setVolume(value)
 					}
 				}
 			}
@@ -146,7 +146,7 @@ Item {
 
 		CustomClippingRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 50 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 65 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
@@ -178,15 +178,15 @@ Item {
 
 				anchors.bottom: parent.bottom
 				anchors.left: parent.left
-				anchors.leftMargin: Appearance.padding.normal
+				anchors.leftMargin: Appearance.padding.larger
 				anchors.top: parent.top
 				implicitWidth: childrenRect.width
 
 				CustomRect {
 					anchors.centerIn: parent
 					color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-					implicitHeight: 40
+					implicitHeight: 54
-					implicitWidth: 40
+					implicitWidth: 54
 					radius: Appearance.rounding.full
 
 					MaterialIcon {
@@ -194,7 +194,7 @@ Item {
 						anchors.centerIn: parent
 						animate: true
 						color: Audio.sourceMuted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-						font.pointSize: 22
+						font.pointSize: Appearance.font.size.extraLarge
 						text: Audio.sourceMuted ? "mic_off" : "mic"
 					}
 
@@ -214,7 +214,7 @@ Item {
 				anchors.bottom: parent.bottom
 				anchors.bottomMargin: Appearance.padding.smallest
 				anchors.left: sourceIcon.right
-				anchors.leftMargin: Appearance.spacing.normal
+				anchors.leftMargin: Appearance.spacing.larger
 				anchors.right: parent.right
 				anchors.rightMargin: Appearance.padding.large
 				anchors.top: parent.top
@@ -238,14 +238,14 @@ Item {
 				}
 
 				CustomMouseArea {
-					Layout.bottomMargin: 5
+					Layout.bottomMargin: Appearance.padding.normal
-					Layout.fillHeight: true
 					Layout.fillWidth: true
+					Layout.preferredHeight: Appearance.padding.larger * 3
 
 					CustomSlider {
 						anchors.left: parent.left
 						anchors.right: parent.right
-						color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+						fgColor: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
 						implicitHeight: parent.height
 						value: Audio.sourceVolume
 
@@ -254,7 +254,7 @@ Item {
 							}
 						}
 
-						onMoved: Audio.setSourceVolume(value)
+						onInteraction: value => Audio.setSourceVolume(value)
 					}
 				}
 			}
@@ -280,7 +280,7 @@ Item {
 				required property var modelData
 
 				Layout.fillWidth: true
-				Layout.preferredHeight: 50 + Appearance.spacing.smaller * 2
+				Layout.preferredHeight: 65 + Appearance.spacing.smaller * 2
 				Layout.topMargin: root.topMargin
 				color: DynamicColors.tPalette.m3surfaceContainer
 				radius: root.rounding
@@ -312,15 +312,15 @@ Item {
 
 					anchors.bottom: parent.bottom
 					anchors.left: parent.left
-					anchors.leftMargin: Appearance.padding.normal
+					anchors.leftMargin: Appearance.padding.larger
 					anchors.top: parent.top
 					implicitWidth: childrenRect.width
 
 					CustomRect {
 						anchors.centerIn: parent
 						color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-						implicitHeight: 40
+						implicitHeight: 54
-						implicitWidth: 40
+						implicitWidth: 54
 						radius: Appearance.rounding.full
 
 						MaterialIcon {
@@ -329,7 +329,7 @@ Item {
 							anchors.centerIn: parent
 							animate: true
 							color: appBox.modelData.audio.muted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-							font.pointSize: 22
+							font.pointSize: Appearance.font.size.extraLarge
 							text: appBox.modelData.audio.muted ? "volume_off" : "volume_up"
 						}
 
@@ -356,7 +356,7 @@ Item {
 					anchors.bottom: parent.bottom
 					anchors.bottomMargin: Appearance.padding.smallest
 					anchors.left: appBoxIcon.right
-					anchors.leftMargin: Appearance.spacing.normal
+					anchors.leftMargin: Appearance.spacing.larger
 					anchors.right: parent.right
 					anchors.rightMargin: Appearance.padding.large
 					anchors.top: parent.top
@@ -381,18 +381,18 @@ Item {
 					}
 
 					CustomMouseArea {
-						Layout.bottomMargin: 5
+						Layout.bottomMargin: Appearance.padding.normal
-						Layout.fillHeight: true
 						Layout.fillWidth: true
+						Layout.preferredHeight: Appearance.padding.larger * 3
 
 						CustomSlider {
 							anchors.left: parent.left
 							anchors.right: parent.right
-							color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+							fgColor: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
 							implicitHeight: parent.height
 							value: appBox.modelData.audio.volume
 
-							onMoved: {
+							onInteraction: value => {
 								Audio.setStreamVolume(appBox.modelData, value);
 							}
 						}

Modules/SysTray/Widgets/UPowerWidget.qml

@@ -28,8 +28,6 @@ Item {
 
 			spacing: 1
 
-			Component.onCompleted: console.log(Battery.isLaptop)
-
 			CustomRect {
 				id: track
 

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;
+[[nodiscard]] QSGMaterialType* type() const override;
-QSGMaterialShader* createShader(QSGRendererInterface::RenderMode) const override;
+[[nodiscard]] QSGMaterialShader* createShader(QSGRendererInterface::RenderMode) const override;
 int compare(const QSGMaterial* other) const override;
 
 float m_paddedX = 0;

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.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_pendingDy = 0;
-	float m_pendingDw = 0;
+float m_pendingDw = 0;
-	float m_pendingDh = 0;
+float m_pendingDh = 0;
-	bool m_cachedHasInverted = false;
+bool m_cachedHasInverted = false;
 float m_cachedInvertedRadius = 0;
 float m_cachedInvertedOuter[4] = {};
 float m_cachedInvertedInner[4] = {};

Plugins/ZShell/CMakeLists.txt

@@ -45,6 +45,7 @@ qml_module(ZShell
 		requests.hpp requests.cpp
 		toaster.hpp toaster.cpp
 		qalculator.hpp qalculator.cpp
+		zutils.hpp zutils.cpp
     LIBRARIES
         Qt::Gui
         Qt::Quick

Plugins/ZShell/Components/CMakeLists.txt

@@ -2,6 +2,7 @@ qml_module(ZShell-components
 	URI ZShell.Components
     SOURCES
         lazylistview.hpp lazylistview.cpp
+		wavyline.hpp wavyline.cpp
     LIBRARIES
         Qt::Quick
 )

Plugins/ZShell/Components/wavyline.cpp

@@ -0,0 +1,255 @@
+#include "wavyline.hpp"
+
+#include <qpainter.h>
+#include <qpainterpath.h>
+
+namespace ZShell::controls {
+
+WavyLine::WavyLine(QQuickItem* parent)
+	: QQuickPaintedItem(parent)
+	, m_lineWidth(4)
+	, m_amplitudeMultiplier(0.5)
+	, m_frequency(6)
+	, m_startX(0)
+	, m_fullLength(0)
+	, m_color(Qt::white)
+	, m_waveProgress(0)
+	, m_pathType(Linear)
+	, m_startAngle(0)
+	, m_fullAngle(360)
+	, m_radius(-1)
+	, m_value(1)
+	, m_startAngleRad(0)
+	, m_fullAngleRad(2 * M_PI) {
+	setAntialiasing(true);
+}
+
+int WavyLine::lineWidth() const {
+	return m_lineWidth;
+}
+
+void WavyLine::setLineWidth(int lineWidth) {
+	if (m_lineWidth != lineWidth) {
+		m_lineWidth = lineWidth;
+		emit lineWidthChanged();
+		update();
+	}
+}
+
+qreal WavyLine::amplitudeMultiplier() const {
+	return m_amplitudeMultiplier;
+}
+
+void WavyLine::setAmplitudeMultiplier(qreal amplitudeMultiplier) {
+	if (!qFuzzyCompare(m_amplitudeMultiplier + 1.0, amplitudeMultiplier + 1.0)) {
+		m_amplitudeMultiplier = amplitudeMultiplier;
+		emit amplitudeMultiplierChanged();
+		update();
+	}
+}
+
+int WavyLine::frequency() const {
+	return m_frequency;
+}
+
+void WavyLine::setFrequency(int frequency) {
+	if (m_frequency != frequency) {
+		m_frequency = frequency;
+		emit frequencyChanged();
+		update();
+	}
+}
+
+qreal WavyLine::startX() const {
+	return m_startX;
+}
+
+void WavyLine::setStartX(qreal startX) {
+	if (!qFuzzyCompare(m_startX + 1.0, startX + 1.0)) {
+		m_startX = startX;
+		emit startXChanged();
+		update();
+	}
+}
+
+qreal WavyLine::fullLength() const {
+	return m_fullLength;
+}
+
+void WavyLine::setFullLength(qreal fullLength) {
+	if (!qFuzzyCompare(m_fullLength + 1.0, fullLength + 1.0)) {
+		m_fullLength = fullLength;
+		emit fullLengthChanged();
+		update();
+	}
+}
+
+QColor WavyLine::color() const {
+	return m_color;
+}
+
+void WavyLine::setColor(const QColor& color) {
+	if (m_color != color) {
+		m_color = color;
+		emit colorChanged();
+		update();
+	}
+}
+
+qreal WavyLine::waveProgress() const {
+	return m_waveProgress;
+}
+
+void WavyLine::setWaveProgress(qreal progress) {
+	if (!qFuzzyCompare(m_waveProgress + 1.0, progress + 1.0)) {
+		m_waveProgress = progress;
+		emit waveProgressChanged();
+		update();
+	}
+}
+
+WavyLine::PathType WavyLine::pathType() const {
+	return m_pathType;
+}
+
+void WavyLine::setPathType(PathType pathType) {
+	if (m_pathType != pathType) {
+		m_pathType = pathType;
+		emit pathTypeChanged();
+		update();
+	}
+}
+
+qreal WavyLine::startAngle() const {
+	return m_startAngle;
+}
+
+void WavyLine::setStartAngle(qreal startAngle) {
+	if (!qFuzzyCompare(m_startAngle + 1.0, startAngle + 1.0)) {
+		m_startAngle = startAngle;
+		m_startAngleRad = startAngle * M_PI / 180.0;
+		emit startAngleChanged();
+		update();
+	}
+}
+
+qreal WavyLine::fullAngle() const {
+	return m_fullAngle;
+}
+
+void WavyLine::setFullAngle(qreal fullAngle) {
+	if (!qFuzzyCompare(m_fullAngle + 1.0, fullAngle + 1.0)) {
+		m_fullAngle = fullAngle;
+		m_fullAngleRad = fullAngle * M_PI / 180.0;
+		emit fullAngleChanged();
+		update();
+	}
+}
+
+qreal WavyLine::radius() const {
+	return m_radius;
+}
+
+void WavyLine::setRadius(qreal radius) {
+	if (!qFuzzyCompare(m_radius + 1.0, radius + 1.0)) {
+		m_radius = radius;
+		emit radiusChanged();
+		update();
+	}
+}
+
+qreal WavyLine::value() const {
+	return m_value;
+}
+
+void WavyLine::setValue(qreal value) {
+	if (!qFuzzyCompare(m_value + 1.0, value + 1.0)) {
+		m_value = value;
+		emit valueChanged();
+		update();
+	}
+}
+
+void WavyLine::paint(QPainter* painter) {
+	painter->setRenderHint(QPainter::Antialiasing);
+	painter->setPen(QPen(m_color, m_lineWidth, Qt::SolidLine, Qt::RoundCap));
+
+	if (m_pathType == Arc) {
+		paintArc(painter);
+	} else {
+		paintLinear(painter);
+	}
+}
+
+void WavyLine::paintLinear(QPainter* painter) {
+	const auto amplitude = m_lineWidth * m_amplitudeMultiplier;
+	const auto phase = m_waveProgress * 2 * M_PI;
+	const auto centerY = height() / 2;
+	const auto len = m_fullLength > 0 ? m_fullLength : 1;
+	const auto start = m_lineWidth / 2.0;
+	const auto fullEnd = width() - m_lineWidth / 2.0;
+	const auto drawEnd = start + (fullEnd - start) * m_value;
+
+	QPainterPath path;
+	bool first = true;
+
+	for (int x = m_lineWidth / 2; x <= drawEnd; ++x) {
+		const auto theta = m_frequency * 2 * M_PI * (x + m_startX) / len + phase;
+		const auto waveY = centerY + amplitude * qSin(theta);
+		if (first) {
+			path.moveTo(x, waveY);
+			first = false;
+		} else {
+			path.lineTo(x, waveY);
+		}
+	}
+
+	painter->drawPath(path);
+}
+
+void WavyLine::paintArc(QPainter* painter) {
+	if (m_fullAngleRad <= 0) {
+		return;
+	}
+
+	const auto amplitude = m_lineWidth * m_amplitudeMultiplier;
+	const auto cx = width() / 2.0;
+	const auto cy = height() / 2.0;
+	const auto radius = m_radius > 0 ? m_radius : (qMin(width(), height()) - m_lineWidth - 2 * amplitude) / 2.0;
+
+	if (radius <= 0) {
+		return;
+	}
+
+	const auto phase = m_waveProgress * 2 * M_PI;
+	const auto arcLen = radius * m_fullAngleRad;
+	const auto len = m_fullLength > 0 ? m_fullLength : arcLen;
+	const auto drawAngleRad = m_fullAngleRad * m_value;
+
+	if (drawAngleRad <= 0) {
+		return;
+	}
+
+	const auto N = qMax(64, qCeil(radius * drawAngleRad));
+	const auto dTheta = drawAngleRad / N;
+
+	QPainterPath path;
+
+	for (int i = 0; i <= N; ++i) {
+		const auto theta = m_startAngleRad + i * dTheta;
+		const auto s = i * dTheta * radius;
+		const auto phi = m_frequency * 2 * M_PI * (s + m_startX) / len + phase;
+		const auto r = radius + amplitude * qSin(phi);
+		const auto px = cx + r * qCos(theta);
+		const auto py = cy + r * qSin(theta);
+		if (i == 0) {
+			path.moveTo(px, py);
+		} else {
+			path.lineTo(px, py);
+		}
+	}
+
+	painter->drawPath(path);
+}
+
+} // namespace ZShell::controls

Plugins/ZShell/Components/wavyline.hpp

@@ -0,0 +1,107 @@
+#pragma once
+
+#include <qqmlintegration.h>
+#include <qquickpainteditem.h>
+
+namespace ZShell::controls {
+
+class WavyLine : public QQuickPaintedItem {
+Q_OBJECT
+QML_ELEMENT
+
+Q_PROPERTY(int lineWidth READ lineWidth WRITE setLineWidth NOTIFY lineWidthChanged FINAL)
+Q_PROPERTY(qreal amplitudeMultiplier READ amplitudeMultiplier WRITE setAmplitudeMultiplier NOTIFY
+           amplitudeMultiplierChanged FINAL)
+Q_PROPERTY(int frequency READ frequency WRITE setFrequency NOTIFY frequencyChanged FINAL)
+Q_PROPERTY(qreal startX READ startX WRITE setStartX NOTIFY startXChanged FINAL)
+Q_PROPERTY(qreal fullLength READ fullLength WRITE setFullLength NOTIFY fullLengthChanged FINAL)
+Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL)
+Q_PROPERTY(qreal waveProgress READ waveProgress WRITE setWaveProgress NOTIFY waveProgressChanged FINAL)
+Q_PROPERTY(PathType pathType READ pathType WRITE setPathType NOTIFY pathTypeChanged FINAL)
+Q_PROPERTY(qreal startAngle READ startAngle WRITE setStartAngle NOTIFY startAngleChanged FINAL)
+Q_PROPERTY(qreal fullAngle READ fullAngle WRITE setFullAngle NOTIFY fullAngleChanged FINAL)
+Q_PROPERTY(qreal radius READ radius WRITE setRadius NOTIFY radiusChanged FINAL)
+Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged FINAL)
+
+public:
+enum PathType {
+	Linear,
+	Arc
+};
+Q_ENUM(PathType)
+
+explicit WavyLine(QQuickItem* parent = nullptr);
+
+[[nodiscard]] int lineWidth() const;
+void setLineWidth(int lineWidth);
+
+[[nodiscard]] qreal amplitudeMultiplier() const;
+void setAmplitudeMultiplier(qreal amplitudeMultiplier);
+
+[[nodiscard]] int frequency() const;
+void setFrequency(int frequency);
+
+[[nodiscard]] qreal startX() const;
+void setStartX(qreal startX);
+
+[[nodiscard]] qreal fullLength() const;
+void setFullLength(qreal fullLength);
+
+[[nodiscard]] QColor color() const;
+void setColor(const QColor& color);
+
+[[nodiscard]] qreal waveProgress() const;
+void setWaveProgress(qreal progress);
+
+[[nodiscard]] PathType pathType() const;
+void setPathType(PathType pathType);
+
+[[nodiscard]] qreal startAngle() const;
+void setStartAngle(qreal startAngle);
+
+[[nodiscard]] qreal fullAngle() const;
+void setFullAngle(qreal fullAngle);
+
+[[nodiscard]] qreal radius() const;
+void setRadius(qreal radius);
+
+[[nodiscard]] qreal value() const;
+void setValue(qreal value);
+
+void paint(QPainter* painter) override;
+
+signals:
+void lineWidthChanged();
+void amplitudeMultiplierChanged();
+void frequencyChanged();
+void startXChanged();
+void fullLengthChanged();
+void colorChanged();
+void waveProgressChanged();
+void pathTypeChanged();
+void startAngleChanged();
+void fullAngleChanged();
+void radiusChanged();
+void valueChanged();
+
+private:
+void paintLinear(QPainter* painter);
+void paintArc(QPainter* painter);
+
+int m_lineWidth;
+qreal m_amplitudeMultiplier;
+int m_frequency;
+qreal m_startX;
+qreal m_fullLength;
+QColor m_color;
+qreal m_waveProgress;
+PathType m_pathType;
+qreal m_startAngle;
+qreal m_fullAngle;
+qreal m_radius;
+qreal m_value;
+qreal m_startAngleRad;
+qreal m_fullAngleRad;
+};
+
+} // namespace ZShell::controls

Plugins/ZShell/Internal/arcgauge.hpp

@@ -58,4 +58,4 @@ qreal m_sweepAngle = 1.5 * M_PI;
 qreal m_lineWidth = 10.0;
 };
 
-} // namespace ZShell::internal
+} // namespace ZShell::Internal

Plugins/ZShell/Internal/cachingimagemanager.hpp

@@ -7,59 +7,60 @@
 namespace ZShell::internal {
 
 class CachingImageManager : public QObject {
-    Q_OBJECT
+Q_OBJECT
-    QML_ELEMENT
+QML_ELEMENT
 
-    Q_PROPERTY(QQuickItem* item READ item WRITE setItem NOTIFY itemChanged 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(QUrl cacheDir READ cacheDir WRITE setCacheDir NOTIFY cacheDirChanged REQUIRED)
 
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
+Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
-    Q_PROPERTY(QUrl cachePath READ cachePath NOTIFY cachePathChanged)
+Q_PROPERTY(QUrl cachePath READ cachePath NOTIFY cachePathChanged)
 
 public:
-    explicit CachingImageManager(QObject* parent = nullptr)
+explicit CachingImageManager(QObject* parent = nullptr)
-        : QObject(parent)
+	: QObject(parent)
-        , m_item(nullptr) {}
+	, m_item(nullptr) {
+}
 
-    [[nodiscard]] QQuickItem* item() const;
+[[nodiscard]] QQuickItem* item() const;
-    void setItem(QQuickItem* item);
+void setItem(QQuickItem* item);
 
-    [[nodiscard]] QUrl cacheDir() const;
+[[nodiscard]] QUrl cacheDir() const;
-    void setCacheDir(const QUrl& cacheDir);
+void setCacheDir(const QUrl& cacheDir);
 
-    [[nodiscard]] QString path() const;
+[[nodiscard]] QString path() const;
-    void setPath(const QString& path);
+void setPath(const QString& path);
 
-    [[nodiscard]] QUrl cachePath() const;
+[[nodiscard]] QUrl cachePath() const;
 
-    Q_INVOKABLE void updateSource();
+Q_INVOKABLE void updateSource();
-    Q_INVOKABLE void updateSource(const QString& path);
+Q_INVOKABLE void updateSource(const QString& path);
 
 signals:
-    void itemChanged();
+void itemChanged();
-    void cacheDirChanged();
+void cacheDirChanged();
 
-    void pathChanged();
+void pathChanged();
-    void cachePathChanged();
+void cachePathChanged();
-    void usingCacheChanged();
+void usingCacheChanged();
 
 private:
-    QString m_shaPath;
+QString m_shaPath;
 
-    QQuickItem* m_item;
+QQuickItem* m_item;
-    QUrl m_cacheDir;
+QUrl m_cacheDir;
 
-    QString m_path;
+QString m_path;
-    QUrl m_cachePath;
+QUrl m_cachePath;
 
-    QMetaObject::Connection m_widthConn;
+QMetaObject::Connection m_widthConn;
-    QMetaObject::Connection m_heightConn;
+QMetaObject::Connection m_heightConn;
 
-    [[nodiscard]] qreal effectiveScale() const;
+[[nodiscard]] qreal effectiveScale() const;
-    [[nodiscard]] QSize effectiveSize() const;
+[[nodiscard]] QSize effectiveSize() const;
 
-    void createCache(const QString& path, const QString& cache, const QString& fillMode, const QSize& size) const;
+void createCache(const QString& path, const QString& cache, const QString& fillMode, const QSize& size) const;
-    [[nodiscard]] static QString sha256sum(const QString& path);
+[[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
+Q_OBJECT
-    QML_ELEMENT
+QML_ELEMENT
-    QML_UNCREATABLE("HyprKeyboard instances can only be retrieved from a HyprDevices")
+        QML_UNCREATABLE("HyprKeyboard instances can only be retrieved from a HyprDevices")
 
-    Q_PROPERTY(QVariantHash lastIpcObject READ lastIpcObject NOTIFY lastIpcObjectChanged)
+Q_PROPERTY(QVariantHash lastIpcObject READ lastIpcObject NOTIFY lastIpcObjectChanged)
-    Q_PROPERTY(QString address READ address NOTIFY addressChanged)
+Q_PROPERTY(QString address READ address NOTIFY addressChanged)
-    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QString layout READ layout NOTIFY layoutChanged)
+Q_PROPERTY(QString layout READ layout NOTIFY layoutChanged)
-    Q_PROPERTY(QString activeKeymap READ activeKeymap NOTIFY activeKeymapChanged)
+Q_PROPERTY(QString activeKeymap READ activeKeymap NOTIFY activeKeymapChanged)
-    Q_PROPERTY(bool capsLock READ capsLock NOTIFY capsLockChanged)
+Q_PROPERTY(bool capsLock READ capsLock NOTIFY capsLockChanged)
-    Q_PROPERTY(bool numLock READ numLock NOTIFY numLockChanged)
+Q_PROPERTY(bool numLock READ numLock NOTIFY numLockChanged)
-    Q_PROPERTY(bool main READ main NOTIFY mainChanged)
+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]] QVariantHash lastIpcObject() const;
-    [[nodiscard]] QString address() const;
+[[nodiscard]] QString address() const;
-    [[nodiscard]] QString name() const;
+[[nodiscard]] QString name() const;
-    [[nodiscard]] QString layout() const;
+[[nodiscard]] QString layout() const;
-    [[nodiscard]] QString activeKeymap() const;
+[[nodiscard]] QString activeKeymap() const;
-    [[nodiscard]] bool capsLock() const;
+[[nodiscard]] bool capsLock() const;
-    [[nodiscard]] bool numLock() const;
+[[nodiscard]] bool numLock() const;
-    [[nodiscard]] bool main() const;
+[[nodiscard]] bool main() const;
 
-    bool updateLastIpcObject(QJsonObject object);
+bool updateLastIpcObject(QJsonObject object);
 
 signals:
-    void lastIpcObjectChanged();
+void lastIpcObjectChanged();
-    void addressChanged();
+void addressChanged();
-    void nameChanged();
+void nameChanged();
-    void layoutChanged();
+void layoutChanged();
-    void activeKeymapChanged();
+void activeKeymapChanged();
-    void capsLockChanged();
+void capsLockChanged();
-    void numLockChanged();
+void numLockChanged();
-    void mainChanged();
+void mainChanged();
 
 private:
-    QJsonObject m_lastIpcObject;
+QJsonObject m_lastIpcObject;
 };
 
 class HyprDevices : public QObject {
-    Q_OBJECT
+Q_OBJECT
-    QML_ELEMENT
+QML_ELEMENT
-    QML_UNCREATABLE("HyprDevices instances can only be retrieved from a HyprExtras")
+        QML_UNCREATABLE("HyprDevices instances can only be retrieved from a HyprExtras")
 
-    Q_PROPERTY(
+Q_PROPERTY(
-        QQmlListProperty<ZShell::internal::hypr::HyprKeyboard> keyboards READ keyboards NOTIFY keyboardsChanged)
+	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/lidwatcher.cpp

@@ -6,7 +6,7 @@
 #include <QtDBus/qdbusreply.h>
 #include <qloggingcategory.h>
 
-Q_LOGGING_CATEGORY(lcLidWatcher, "caelestia.internal.logindmanager", QtInfoMsg)
+Q_LOGGING_CATEGORY(lcLidWatcher, "ZShell.internal.logindmanager", QtInfoMsg)
 
 namespace ZShell::internal {
 
@@ -14,27 +14,27 @@ LidWatcher::LidWatcher(QObject* parent) : QObject(parent) {
 	auto bus = QDBusConnection::systemBus();
 	if (!bus.isConnected()) {
 		qCWarning(lcLidWatcher)
-			<< "Failed to connect to system bus:" << bus.lastError().message();
+		        << "Failed to connect to system bus:" << bus.lastError().message();
 		return;
 	}
 
 	bool ok = bus.connect("org.freedesktop.login1",
-						  "/org/freedesktop/login1",
+	                      "/org/freedesktop/login1",
-						  "org.freedesktop.login1.Manager",
+	                      "org.freedesktop.login1.Manager",
-						  "PrepareForSleep",
+	                      "PrepareForSleep",
-						  this,
+	                      this,
-						  SLOT(handlePrepareForSleep(bool)));
+	                      SLOT(handlePrepareForSleep(bool)));
 
 	if (!ok) {
 		qCWarning(lcLidWatcher)
-			<< "Failed to connect to PrepareForSleep signal:"
+		        << "Failed to connect to PrepareForSleep signal:"
-			<< bus.lastError().message();
+		        << bus.lastError().message();
 	}
 
 	QDBusInterface login1("org.freedesktop.login1",
-						  "/org/freedesktop/login1",
+	                      "/org/freedesktop/login1",
-						  "org.freedesktop.login1.Manager",
+	                      "org.freedesktop.login1.Manager",
-						  bus);
+	                      bus);
 	const QDBusReply<QDBusObjectPath> reply = login1.call("GetSession", "auto");
 	if (!reply.isValid()) {
 		qCWarning(lcLidWatcher) << "Failed to get session path";
@@ -43,27 +43,27 @@ LidWatcher::LidWatcher(QObject* parent) : QObject(parent) {
 	const auto sessionPath = reply.value().path();
 
 	ok = bus.connect("org.freedesktop.login1",
-					 sessionPath,
+	                 sessionPath,
-					 "org.freedesktop.login1.Session",
+	                 "org.freedesktop.login1.Session",
-					 "Lock",
+	                 "Lock",
-					 this,
+	                 this,
-					 SLOT(handleLockRequested()));
+	                 SLOT(handleLockRequested()));
 
 	if (!ok) {
 		qCWarning(lcLidWatcher)
-			<< "Failed to connect to Lock signal:" << bus.lastError().message();
+		        << "Failed to connect to Lock signal:" << bus.lastError().message();
 	}
 
 	ok = bus.connect("org.freedesktop.login1",
-					 sessionPath,
+	                 sessionPath,
-					 "org.freedesktop.login1.Session",
+	                 "org.freedesktop.login1.Session",
-					 "Unlock",
+	                 "Unlock",
-					 this,
+	                 this,
-					 SLOT(handleUnlockRequested()));
+	                 SLOT(handleUnlockRequested()));
 
 	if (!ok) {
 		qCWarning(lcLidWatcher) << "Failed to connect to Unlock signal:"
-								<< bus.lastError().message();
+		                        << bus.lastError().message();
 	}
 }
 

Plugins/ZShell/Internal/lidwatcher.hpp

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

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;
+[[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+[[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-QHash<int, QByteArray> roleNames() 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

@@ -104,10 +104,12 @@ void HyprsunsetManager::toggle() {
 }
 
 void HyprsunsetManager::start() {
-	if (m_enabled)
+	if (m_enabled && m_initialized)
 		return;
 
+	m_initialized = true;
 	m_enabled = true;
+
 	emit enabledChanged();
 
 	m_process.setProgram("hyprctl");
@@ -116,10 +118,12 @@ void HyprsunsetManager::start() {
 }
 
 void HyprsunsetManager::end() {
-	if (!m_enabled)
+	if (!m_enabled && m_initialized)
 		return;
 
+	m_initialized = true;
 	m_enabled = false;
+
 	emit enabledChanged();
 
 	m_process.setProgram("hyprctl");

Plugins/ZShell/Services/hyprsunsetmanager.hpp

@@ -22,12 +22,13 @@ Q_PROPERTY(bool manualToggle READ manualToggle WRITE setManualToggle NOTIFY manu
 public:
 explicit HyprsunsetManager(QObject* parent = nullptr);
 
-int startTime() const;
+[[nodiscard]] int startTime() const;
-int endTime() const;
+[[nodiscard]] int endTime() const;
-bool enabled() const;
+[[nodiscard]] bool enabled() const;
-int temp() const;
+[[nodiscard]] int temp() const;
-bool activeAuto() const;
+[[nodiscard]] bool activeAuto() const;
-bool manualToggle() const;
+[[nodiscard]] bool manualToggle() const;
+
 Q_INVOKABLE void toggle();
 Q_INVOKABLE void apply();
 
@@ -48,10 +49,11 @@ void manualToggleChanged();
 private:
 int m_startTime;
 int m_endTime;
-bool m_enabled;
+bool m_enabled = false;
 bool m_manualToggle = false;
 bool m_activeAuto;
-bool m_startAllowed;
+bool m_startAllowed = false;
+bool m_initialized = false;
 QTimer m_startCooldown;
 int m_temp;
 QProcess m_process;

Plugins/ZShell/appdb.hpp

@@ -9,98 +9,98 @@
 namespace ZShell {
 
 class AppEntry : public QObject {
-    Q_OBJECT
+Q_OBJECT
-    QML_ELEMENT
+QML_ELEMENT
-    QML_UNCREATABLE("AppEntry instances can only be retrieved from an AppDb")
+        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
+// 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(QObject* entry READ entry CONSTANT)
 
-    Q_PROPERTY(quint32 frequency READ frequency NOTIFY frequencyChanged)
+Q_PROPERTY(quint32 frequency READ frequency NOTIFY frequencyChanged)
-    Q_PROPERTY(QString id READ id CONSTANT)
+Q_PROPERTY(QString id READ id CONSTANT)
-    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QString comment READ comment NOTIFY commentChanged)
+Q_PROPERTY(QString comment READ comment NOTIFY commentChanged)
-    Q_PROPERTY(QString execString READ execString NOTIFY execStringChanged)
+Q_PROPERTY(QString execString READ execString NOTIFY execStringChanged)
-    Q_PROPERTY(QString startupClass READ startupClass NOTIFY startupClassChanged)
+Q_PROPERTY(QString startupClass READ startupClass NOTIFY startupClassChanged)
-    Q_PROPERTY(QString genericName READ genericName NOTIFY genericNameChanged)
+Q_PROPERTY(QString genericName READ genericName NOTIFY genericNameChanged)
-    Q_PROPERTY(QString categories READ categories NOTIFY categoriesChanged)
+Q_PROPERTY(QString categories READ categories NOTIFY categoriesChanged)
-    Q_PROPERTY(QString keywords READ keywords NOTIFY keywordsChanged)
+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;
+[[nodiscard]] quint32 frequency() const;
-    void setFrequency(quint32 frequency);
+void setFrequency(quint32 frequency);
-    void incrementFrequency();
+void incrementFrequency();
 
-    [[nodiscard]] QString id() const;
+[[nodiscard]] QString id() const;
-    [[nodiscard]] QString name() const;
+[[nodiscard]] QString name() const;
-    [[nodiscard]] QString comment() const;
+[[nodiscard]] QString comment() const;
-    [[nodiscard]] QString execString() const;
+[[nodiscard]] QString execString() const;
-    [[nodiscard]] QString startupClass() const;
+[[nodiscard]] QString startupClass() const;
-    [[nodiscard]] QString genericName() const;
+[[nodiscard]] QString genericName() const;
-    [[nodiscard]] QString categories() const;
+[[nodiscard]] QString categories() const;
-    [[nodiscard]] QString keywords() const;
+[[nodiscard]] QString keywords() const;
 
 signals:
-    void frequencyChanged();
+void frequencyChanged();
-    void nameChanged();
+void nameChanged();
-    void commentChanged();
+void commentChanged();
-    void execStringChanged();
+void execStringChanged();
-    void startupClassChanged();
+void startupClassChanged();
-    void genericNameChanged();
+void genericNameChanged();
-    void categoriesChanged();
+void categoriesChanged();
-    void keywordsChanged();
+void keywordsChanged();
 
 private:
-    QObject* m_entry;
+QObject* m_entry;
-    quint32 m_frequency;
+quint32 m_frequency;
 };
 
 class AppDb : public QObject {
-    Q_OBJECT
+Q_OBJECT
-    QML_ELEMENT
+QML_ELEMENT
 
-    Q_PROPERTY(QString uuid READ uuid CONSTANT)
+Q_PROPERTY(QString uuid READ uuid CONSTANT)
-    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged REQUIRED)
+Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged REQUIRED)
-    Q_PROPERTY(QObjectList entries READ entries WRITE setEntries NOTIFY entriesChanged REQUIRED)
+Q_PROPERTY(QObjectList entries READ entries WRITE setEntries NOTIFY entriesChanged REQUIRED)
-    Q_PROPERTY(QQmlListProperty<ZShell::AppEntry> apps READ apps NOTIFY appsChanged)
+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;
+[[nodiscard]] QString path() const;
-    void setPath(const QString& path);
+void setPath(const QString& path);
 
-    [[nodiscard]] QObjectList entries() const;
+[[nodiscard]] QObjectList entries() const;
-    void setEntries(const QObjectList& entries);
+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 pathChanged();
-    void entriesChanged();
+void entriesChanged();
-    void appsChanged();
+void appsChanged();
 
 private:
-    QTimer* m_timer;
+QTimer* m_timer;
 
-    const QString m_uuid;
+const QString m_uuid;
-    QString m_path;
+QString m_path;
-    QObjectList m_entries;
+QObjectList m_entries;
-    QHash<QString, AppEntry*> m_apps;
+QHash<QString, AppEntry*> m_apps;
-    mutable QList<AppEntry*> m_sortedApps;
+mutable QList<AppEntry*> m_sortedApps;
 
-    QList<AppEntry*>& getSortedApps() const;
+QList<AppEntry*>& getSortedApps() const;
-    quint32 getFrequency(const QString& id) const;
+quint32 getFrequency(const QString& id) const;
-    void updateAppFrequencies();
+void updateAppFrequencies();
-    void updateApps();
+void updateApps();
 };
 
 } // namespace ZShell

Plugins/ZShell/imageanalyser.hpp

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

Plugins/ZShell/qalculator.hpp

@@ -13,7 +13,7 @@ QML_SINGLETON
 public:
 explicit Qalculator(QObject* parent = nullptr);
 
-Q_INVOKABLE QString eval(const QString& expr, bool printExpr = true) const;
+Q_INVOKABLE [[nodiscard]] QString eval(const QString& expr, bool printExpr = true) const;
 };
 
 } // namespace ZShell

Plugins/ZShell/writefile.hpp

@@ -29,9 +29,9 @@ Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir, QJSValu
 Q_INVOKABLE void cacheImage(const QUrl& source, const QString& cacheDir, QJSValue onSaved, QJSValue onFailed);
 // clang-format on
 
-Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target, bool overwrite = true) const;
+Q_INVOKABLE [[nodiscard]] bool copyFile(const QUrl& source, const QUrl& target, bool overwrite = true) const;
-Q_INVOKABLE bool deleteFile(const QUrl& path) const;
+Q_INVOKABLE [[nodiscard]] bool deleteFile(const QUrl& path) const;
-Q_INVOKABLE QString toLocalFile(const QUrl& url) const;
+Q_INVOKABLE [[nodiscard]] QString toLocalFile(const QUrl& url) const;
 
 private:
 bool loadSourceImage(const QUrl& source, QImage& image) const;

Plugins/ZShell/zutils.cpp

@@ -0,0 +1,145 @@
+#include "zutils.hpp"
+
+#include <QtConcurrent/qtconcurrentrun.h>
+#include <QtQuick/qquickitemgrabresult.h>
+#include <QtQuick/qquickwindow.h>
+#include <qdir.h>
+#include <qfileinfo.h>
+#include <qfuturewatcher.h>
+#include <qloggingcategory.h>
+#include <qqmlengine.h>
+
+Q_LOGGING_CATEGORY(lcZUtils, "ZShell.cutils", QtInfoMsg)
+
+namespace ZShell {
+
+void ZUtils::saveItem(QQuickItem* target, const QUrl& path) {
+	this->saveItem(target, path, QRect(), QJSValue(), QJSValue());
+}
+
+void ZUtils::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect) {
+	this->saveItem(target, path, rect, QJSValue(), QJSValue());
+}
+
+void ZUtils::saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved) {
+	this->saveItem(target, path, QRect(), onSaved, QJSValue());
+}
+
+void ZUtils::saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved, QJSValue onFailed) {
+	this->saveItem(target, path, QRect(), onSaved, onFailed);
+}
+
+void ZUtils::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved) {
+	this->saveItem(target, path, rect, onSaved, QJSValue());
+}
+
+void ZUtils::saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed) {
+	if (!target) {
+		qCWarning(lcZUtils) << "saveItem: a target is required";
+		return;
+	}
+
+	if (!path.isLocalFile()) {
+		qCWarning(lcZUtils) << "saveItem:" << path << "is not a local file";
+		return;
+	}
+
+	if (!target->window()) {
+		qCWarning(lcZUtils) << "saveItem: unable to save target" << target << "without a window";
+		return;
+	}
+
+	auto scaledRect = rect;
+	const qreal scale = target->window()->devicePixelRatio();
+	if (rect.isValid() && !qFuzzyCompare(scale + 1.0, 2.0)) {
+		scaledRect =
+			QRectF(rect.left() * scale, rect.top() * scale, rect.width() * scale, rect.height() * scale).toRect();
+	}
+
+	const QSharedPointer<const QQuickItemGrabResult> grabResult = target->grabToImage();
+
+	QObject::connect(grabResult.data(), &QQuickItemGrabResult::ready, this,
+	                 [grabResult, scaledRect, path, onSaved, onFailed, this]() {
+			const auto future = QtConcurrent::run([=]() {
+				QImage image = grabResult->image();
+
+				if (scaledRect.isValid()) {
+					image = image.copy(scaledRect);
+				}
+
+				const QString file = path.toLocalFile();
+				const QString parent = QFileInfo(file).absolutePath();
+				return QDir().mkpath(parent) && image.save(file);
+			});
+
+			auto* watcher = new QFutureWatcher<bool>(this);
+			auto* engine = qmlEngine(this);
+
+			QObject::connect(watcher, &QFutureWatcher<bool>::finished, this, [=]() {
+				if (watcher->result()) {
+					if (onSaved.isCallable()) {
+						QJSValueList args = { QJSValue(path.toLocalFile()) };
+						if (engine) {
+							args << engine->toScriptValue(QVariant::fromValue(path));
+						}
+						onSaved.call(args);
+					}
+				} else {
+					qCWarning(lcZUtils) << "saveItem: failed to save" << path;
+					if (onFailed.isCallable()) {
+						if (engine) {
+							onFailed.call({ engine->toScriptValue(QVariant::fromValue(path)) });
+						} else {
+							onFailed.call();
+						}
+					}
+				}
+				watcher->deleteLater();
+			});
+			watcher->setFuture(future);
+		});
+}
+
+bool ZUtils::copyFile(const QUrl& source, const QUrl& target, bool overwrite) {
+	if (!source.isLocalFile()) {
+		qCWarning(lcZUtils) << "copyFile: source" << source << "is not a local file";
+		return false;
+	}
+	if (!target.isLocalFile()) {
+		qCWarning(lcZUtils) << "copyFile: target" << target << "is not a local file";
+		return false;
+	}
+
+	if (overwrite && QFile::exists(target.toLocalFile())) {
+		if (!QFile::remove(target.toLocalFile())) {
+			qCWarning(lcZUtils) << "copyFile: overwrite was specified but failed to remove" << target.toLocalFile();
+			return false;
+		}
+	}
+
+	return QFile::copy(source.toLocalFile(), target.toLocalFile());
+}
+
+bool ZUtils::deleteFile(const QUrl& path) {
+	if (!path.isLocalFile()) {
+		qCWarning(lcZUtils) << "deleteFile: path" << path << "is not a local file";
+		return false;
+	}
+
+	return QFile::remove(path.toLocalFile());
+}
+
+QString ZUtils::toLocalFile(const QUrl& url) {
+	if (!url.isLocalFile()) {
+		qCWarning(lcZUtils) << "toLocalFile: given url is not a local file" << url;
+		return QString();
+	}
+
+	return url.toLocalFile();
+}
+
+qreal ZUtils::clamp(qreal value, qreal min, qreal max) {
+	return qBound(min, value, max);
+}
+
+} // namespace ZShell

Plugins/ZShell/zutils.hpp

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <QtQuick/qquickitem.h>
+#include <qobject.h>
+#include <qqmlintegration.h>
+
+namespace ZShell {
+
+class ZUtils : public QObject {
+Q_OBJECT
+QML_ELEMENT
+QML_SINGLETON
+
+public:
+// clang-format off
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved, QJSValue onFailed);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved);
+Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed);
+// clang-format on
+
+Q_INVOKABLE static bool copyFile(const QUrl& source, const QUrl& target, bool overwrite = true);
+Q_INVOKABLE static bool deleteFile(const QUrl& path);
+Q_INVOKABLE static QString toLocalFile(const QUrl& url);
+
+Q_INVOKABLE static qreal clamp(qreal value, qreal min, qreal max);
+};
+
+} // namespace ZShell

shell.qml

@@ -4,6 +4,7 @@
 //@ pragma Env QSG_NO_VSYNC=1
 //@ pragma Env QS_NO_RELOAD_POPUP=1
 //@ pragma Env QT_SCALE_FACTOR_ROUNDING_POLICY=Round
+//@ pragma DefaultEnv QT_QUICK_FLICKABLE_WHEEL_DECELERATION=10000
 //@ pragma DropExpensiveFonts
 import Quickshell
 import Quickshell.Services.UPower
@@ -22,7 +23,7 @@ ShellRoot {
 
 	settings.watchFiles: true
 
-	Windows {
+	Drawers {
 	}
 
 	Wallpaper {