initial commit, primitive loading of QML code outside of shell directory

.clang-format

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

.clang-tidy

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

.gitea/workflows/lint-rust.yml

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

.gitignore

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

CMakeLists.txt

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

Components/Anim.qml

@@ -2,62 +2,7 @@ import QtQuick
 import qs.Config
 
 NumberAnimation {
-	enum Type {
+	duration: Appearance.anim.durations.normal
-		StandardSmall = 0,
+	easing.bezierCurve: Appearance.anim.curves.standard
-		Standard,
+	easing.type: Easing.BezierSpline
-		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,174 +1,47 @@
-pragma ComponentBehavior: Bound
-
 import QtQuick
 import QtQuick.Templates
-import ZShell.Components
-import ZShell
-import qs.Components
 import qs.Config
 
 Slider {
 	id: root
 
-	property bool animateWave
+	property color color: DynamicColors.palette.m3primary
-	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 {
-			id: remaining
+			anchors.bottom: parent.bottom
-
-			anchors.left: handle.right
-			anchors.leftMargin: Appearance.spacing.extraSmall
-			anchors.right: parent.right
-			anchors.verticalCenter: parent.verticalCenter
-			bottomLeftRadius: Appearance.rounding.extraSmall / 2
-			color: root.bgColor
-			implicitHeight: parent.height * (parent.height <= 12 ? opacity : Math.min(opacity * 2, 1))
-			opacity: Math.min(width, 12) / 12
-			radius: Appearance.rounding.small
-			topLeftRadius: Appearance.rounding.extraSmall / 2
-		}
-
-		CustomRect {
-			anchors.right: parent.right
-			anchors.rightMargin: 4 * remaining.opacity
-			anchors.verticalCenter: parent.verticalCenter
-			color: root.fgColor
-			implicitHeight: 4 * remaining.opacity
-			implicitWidth: implicitHeight
-			opacity: remaining.opacity
-			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
+			anchors.top: parent.top
-			asynchronous: true
+			bottomRightRadius: root.implicitHeight / 6
-			sourceComponent: root.wavy ? waveComp : lineComp
+			color: root.color
+			implicitWidth: root.handle.x - root.implicitHeight / 2
+			radius: Appearance.rounding.full
+			topRightRadius: root.implicitHeight / 6
 		}
 
-		Component {
-			id: lineComp
-
 		CustomRect {
-				bottomRightRadius: Appearance.rounding.extraSmall / 2
+			anchors.bottom: parent.bottom
-				color: root.fgColor
+			anchors.right: parent.right
-				implicitHeight: root.height
+			anchors.top: parent.top
-				implicitWidth: root.filledWidth
+			bottomLeftRadius: root.implicitHeight / 6
-				radius: Appearance.rounding.small
+			color: DynamicColors.tPalette.m3surfaceContainer
-				topRightRadius: Appearance.rounding.extraSmall / 2
+			implicitWidth: parent.width - root.handle.x - root.handle.implicitWidth - root.implicitHeight / 2
+			radius: Appearance.rounding.full
+			topLeftRadius: root.implicitHeight / 6
 		}
 	}
-
+	handle: CustomRect {
-		Component {
+		anchors.verticalCenter: parent.verticalCenter
-			id: waveComp
+		color: root.color
-
+		implicitHeight: 15
-			WavyLine {
+		implicitWidth: 5
-				color: root.fgColor
+		radius: Appearance.rounding.full
-				frequency: root.waveFrequency
+		x: root.visualPosition * root.availableWidth - implicitWidth / 2
-				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
-				}
-			}
-		}
-	}
-	Behavior on filledWidth {
-		id: widthBehavior
-
-		Anim {
-		}
-	}
-
-	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
+			acceptedButtons: Qt.NoButton
-
+			anchors.fill: parent
-		property real dragMovement
+			cursorShape: Qt.PointingHandCursor
-		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/CustomSpinBox.qml

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

Components/CustomSplitButton.qml

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

Components/CustomSplitButtonRow.qml

@@ -9,6 +9,7 @@ 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
@@ -24,7 +25,7 @@ Item {
 	implicitHeight: row.implicitHeight + Appearance.padding.smaller * 2
 	opacity: shouldBeActive ? 1 : 0
 	scale: shouldBeActive ? 1 : 0.8
-	z: splitButton.menu.implicitHeight > 0 ? expandedZ : 1
+	z: root.expanded ? expandedZ : -1
 
 	Behavior on opacity {
 		Anim {
@@ -49,6 +50,7 @@ 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 {
@@ -56,16 +58,14 @@ Item {
 
 			enabled: root.enabled
 			type: CustomSplitButton.Filled
-			z: 2
+			z: root.expanded ? root.expandedZ : -1
 
 			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.Shapes
 import QtQuick.Templates
+import QtQuick.Shapes
 import qs.Config
 
 Switch {
@@ -12,41 +12,38 @@ Switch {
 	implicitWidth: implicitIndicatorWidth
 
 	indicator: CustomRect {
-		color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
+		color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, root.cLayer)
-		implicitHeight: Appearance.font.size.medium + Appearance.padding.normal * 2
+		implicitHeight: 13 + 7 * 2
 		implicitWidth: implicitHeight * 1.7
 		radius: Appearance.rounding.full
 
 		CustomRect {
-			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.2 : implicitHeight
+			readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight
 
 			anchors.verticalCenter: parent.verticalCenter
-			color: root.checked && root.enabled ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
+			color: root.checked ? DynamicColors.palette.m3onPrimary : DynamicColors.layer(DynamicColors.palette.m3outline, root.cLayer + 1)
-			implicitHeight: parent.implicitHeight - Appearance.padding.extraSmall
+			implicitHeight: parent.implicitHeight - 10
 			implicitWidth: nonAnimWidth
 			radius: Appearance.rounding.full
-			x: root.checked ? parent.implicitWidth - nonAnimWidth - Appearance.padding.extraSmall / 2 : Appearance.padding.extraSmall / 2
+			x: root.checked ? parent.implicitWidth - nonAnimWidth - 10 / 2 : 10 / 2
 
 			Behavior on implicitWidth {
 				Anim {
-					type: Anim.FastSpatial
 				}
 			}
 			Behavior on x {
 				Anim {
-					type: Anim.FastSpatial
 				}
 			}
 
 			CustomRect {
 				anchors.fill: parent
-				color: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
+				color: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3onSurface
 				opacity: root.pressed ? 0.1 : root.hovered ? 0.08 : 0
 				radius: parent.radius
 
 				Behavior on opacity {
 					Anim {
-						type: Anim.DefaultEffects
 					}
 				}
 			}
@@ -66,14 +63,14 @@ Switch {
 				}
 				property point end2: {
 					if (root.pressed)
-						return Qt.point(width * 0.8, height / 2);
+						return Qt.point(width, 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.2, height / 2);
+						return Qt.point(width * 0.1, height / 2);
 					if (root.checked)
 						return Qt.point(width * 0.15, height / 2);
 					return Qt.point(width * 0.15, height * 0.15);
@@ -91,7 +88,7 @@ Switch {
 
 				anchors.centerIn: parent
 				asynchronous: true
-				height: parent.implicitHeight - Appearance.padding.larger
+				height: parent.implicitHeight - Appearance.padding.small * 2
 				preferredRendererType: Shape.CurveRenderer
 				width: height
 
@@ -113,11 +110,11 @@ Switch {
 				}
 
 				ShapePath {
-					capStyle: ShapePath.RoundCap
+					capStyle: Appearance.rounding.scale === 0 ? ShapePath.SquareCap : ShapePath.RoundCap
 					fillColor: "transparent"
 					startX: icon.start1.x
 					startY: icon.start1.y
-					strokeColor: root.checked && root.enabled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3surfaceContainerHighest
+					strokeColor: root.checked ? DynamicColors.palette.m3primary : DynamicColors.palette.m3surfaceContainerHighest
 					strokeWidth: Appearance.font.size.larger * 0.15
 
 					Behavior on strokeColor {
@@ -151,7 +148,8 @@ Switch {
 	}
 
 	component PropAnim: PropertyAnimation {
-		duration: Appearance.anim.durations.expressiveFastSpatial
+		duration: MaterialEasing.expressiveEffectsTime
-		easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
+		easing.bezierCurve: MaterialEasing.expressiveEffects
+		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,7 +13,6 @@ RectangularShadow {
 
 	Behavior on dp {
 		Anim {
-			type: Anim.SlowEffects
 		}
 	}
 }

Components/Menu.qml

@@ -2,107 +2,49 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import QtQuick.Layouts
-import Quickshell
 import qs.Config
-import qs.Drawers
 
-MouseArea {
+Elevation {
 	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)
 
-	anchors.fill: parent
+	implicitHeight: root.expanded ? column.implicitHeight + Appearance.padding.small * 2 : 0
-	enabled: expanded
+	implicitWidth: Math.max(200, column.implicitWidth)
-	layer.enabled: opacity < 1
+	level: 2
-	opacity: expanded ? 1 : 0
+	opacity: root.expanded ? 1 : 0
-	parent: {
+	radius: Appearance.rounding.normal
-		const win = QsWindow.window;
-		const contentWin = win as Windows;
-		return contentWin ? contentWin.interactionWrapper : (win as QsWindow).contentItem;
-	}
 
+	Behavior on implicitHeight {
+		Anim {
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+		}
+	}
 	Behavior on opacity {
 		Anim {
-			type: Anim.DefaultEffects
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
 		}
 	}
 
-	onClicked: expanded = false
+	CustomClippingRect {
-
-	TransformWatcher {
-		id: watcher
-
-		a: root.parent
-		b: root.attachTo
-	}
-
-	Elevation {
-		id: menu
-
-		implicitHeight: column.implicitHeight + column.anchors.margins * 2
-		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;
-		}
-
-		transform: Scale {
-			origin.y: root.thisSideY === Menu.Bottom ? menu.height : 0
-			yScale: root.expanded ? 1 : 0.1
-
-			Behavior on yScale {
-				Anim {
-				}
-			}
-		}
-
-		CustomRect {
 		anchors.fill: parent
-			color: DynamicColors.palette.m3surfaceContainerLow
+		color: DynamicColors.palette.m3surfaceContainer
 		radius: parent.radius
 
 		ColumnLayout {
 			id: column
 
-				anchors.fill: parent
+			anchors.left: parent.left
-				anchors.margins: Appearance.padding.extraSmall
+			anchors.right: parent.right
-				spacing: Appearance.spacing.extraSmall
+			anchors.verticalCenter: parent.verticalCenter
+			spacing: 5
 
 			Repeater {
-					id: repeater
-
 				model: root.items
 
 				CustomRect {
@@ -113,56 +55,55 @@ MouseArea {
 					required property MenuItem modelData
 
 					Layout.fillWidth: true
-						color: Qt.alpha(DynamicColors.palette.m3tertiaryContainer, active ? 1 : 0)
+					implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.normal * 2
-						implicitHeight: menuOptionRow.implicitHeight + Appearance.padding.larger * 2
+					implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.normal * 2
-						implicitWidth: menuOptionRow.implicitWidth + Appearance.padding.larger * 2
-						radius: Appearance.rounding.small
 
-						Behavior on radius {
+					CustomRect {
-							Anim {
+						anchors.fill: parent
-							}
+						anchors.leftMargin: Appearance.padding.small
-						}
+						anchors.rightMargin: Appearance.padding.small
+						color: Qt.alpha(DynamicColors.palette.m3secondaryContainer, active ? 1 : 0)
+						radius: Appearance.rounding.normal - Appearance.padding.small
 
 						StateLayer {
-							color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
+							function onClicked(): void {
-							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.larger
+						anchors.margins: Appearance.padding.normal
 						spacing: Appearance.spacing.small
 
 						MaterialIcon {
 							Layout.alignment: Qt.AlignVCenter
-								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurfaceVariant
+							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurfaceVariant
 							text: item.modelData.icon
 						}
 
 						CustomText {
 							Layout.alignment: Qt.AlignVCenter
 							Layout.fillWidth: true
-								color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
+							color: item.active ? DynamicColors.palette.m3onSecondaryContainer : 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
+								color: item.active ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
 								text: item.modelData.trailingIcon
 							}
 						}
@@ -172,4 +113,3 @@ MouseArea {
 		}
 	}
 }
-}

Components/StateLayer.qml

@@ -1,53 +1,15 @@
-import QtQuick
-import QtQuick.Shapes
-import ZShell
-import ZShell.Components
-import qs.Helpers
 import qs.Config
+import QtQuick
 
 MouseArea {
 	id: root
 
-	property alias bottomLeftRadius: base.bottomLeftRadius
+	property color color: DynamicColors.palette.m3onSurface
-	property alias bottomRightRadius: base.bottomRightRadius
-	property real circleRadius
-	property alias color: base.color
 	property bool disabled
-	readonly property real endRadius: {
+	property real radius: parent?.radius ?? 0
-		const d1 = distSq(0, 0);
+	property alias rect: hoverLayer
-		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 clamp(r: real): real {
+	function onClicked(): void {
-		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
@@ -55,146 +17,79 @@ MouseArea {
 	enabled: !disabled
 	hoverEnabled: true
 
-	Behavior on stateOpacity {
-		Anim {
-			type: Anim.DefaultEffects
-		}
-	}
-
-	onCircleRadiusChanged: {
-		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
-			fadeAnim.start();
-	}
 	onClicked: event => !disabled && onClicked(event)
-	onManualPressOverrideChanged: {
+	onPressed: event => {
-		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
+		if (disabled)
-			fadeAnim.start();
+			return;
-	}
+
-	onPressed: e => press(e.x, e.y)
+		rippleAnim.x = event.x;
-	onPressedChanged: {
+		rippleAnim.y = event.y;
-		if (!(pressed || manualPressOverride) && !rippleAnim.running && circle.opacity > 0)
+
-			fadeAnim.start();
+		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();
 	}
 
-	Anim {
+	SequentialAnimation {
 		id: rippleAnim
 
-		alwaysRunToEnd: true
+		property real radius
-		duration: Appearance.anim.durations.expressiveSlowEffects * 2
+		property real x
-		easing.bezierCurve: Appearance.anim.curves.standard
+		property real y
-		property: "circleRadius"
+
-		target: root
+		PropertyAction {
-		to: root.endRadius
+			property: "x"
+			target: ripple
+			value: rippleAnim.x
+		}
+
+		PropertyAction {
+			property: "y"
+			target: ripple
+			value: rippleAnim.y
+		}
+
+		PropertyAction {
+			property: "opacity"
+			target: ripple
+			value: 0.08
 		}
 
 		Anim {
-		id: fadeAnim
+			easing.bezierCurve: MaterialEasing.standardDecel
-
+			from: 0
-		property: "opacity"
+			properties: "implicitWidth,implicitHeight"
-		target: circle
+			target: ripple
-		to: 0
+			to: rippleAnim.radius * 2
-		type: Anim.SlowEffects
 		}
 
+		Anim {
+			property: "opacity"
+			target: ripple
+			to: 0
+		}
+	}
+
+	CustomClippingRect {
+		id: hoverLayer
+
+		anchors.fill: parent
+		border.pixelAligned: false
+		color: Qt.alpha(root.color, root.disabled ? 0 : root.pressed ? 0.1 : root.containsMouse ? 0.08 : 0)
+		radius: root.radius
+
 		CustomRect {
-		id: base
+			id: ripple
 
-		anchors.fill: parent
+			border.pixelAligned: false
-		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
+			color: root.color
-		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
-		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
-	}
-
-	Shape {
-		id: circle
-
-		anchors.fill: parent
 			opacity: 0
-		preferredRendererType: Shape.CurveRenderer
+			radius: Appearance.rounding.full
 
-		ShapePath {
+			transform: Translate {
-			fillColor: base.color
+				x: -ripple.width / 2
-			startX: root.clamp(base.topLeftRadius)
+				y: -ripple.height / 2
-			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,6 +7,8 @@ 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,13 +28,9 @@ 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]
@@ -42,9 +38,7 @@ 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
@@ -63,8 +57,7 @@ JsonObject {
 	component FontSize: JsonObject {
 		property int extraLarge: 28 * scale
 		property int large: 18 * scale
-		property int larger: 16 * scale
+		property int larger: 15 * scale
-		property int medium: 14 * scale
 		property int normal: 13 * scale
 		property real scale: 1
 		property int small: 11 * scale
@@ -77,28 +70,23 @@ JsonObject {
 		}
 	}
 	component Padding: JsonObject {
-		property int extraLargeIncreased: 32 * scale
+		property int large: 15 * scale
-		property int extraSmall: 4 * scale
+		property int larger: 13 * scale
-		property int large: 16 * scale
+		property int normal: 9 * 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

Config/BarConfig.qml

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

Config/Config.qml

@@ -22,6 +22,7 @@ Singleton {
 	property alias notifs: adapter.notifs
 	property alias osd: adapter.osd
 	property alias overview: adapter.overview
+	property alias plugins: adapter.plugins
 	property bool recentlySaved: false
 	property alias screenshot: adapter.screenshot
 	property alias services: adapter.services
@@ -100,9 +101,6 @@ Singleton {
 			border: barConfig.border,
 			smoothing: barConfig.smoothing,
 			height: barConfig.height,
-			tray: {
-				trayIconSize: barConfig.tray.trayIconSize
-			},
 			popouts: {
 				tray: barConfig.popouts.tray,
 				audio: barConfig.popouts.audio,
@@ -143,7 +141,8 @@ Singleton {
 			launcher: serializeLauncher(),
 			colors: serializeColors(),
 			dock: serializeDock(),
-			screenshot: serializeScreenshot()
+			screenshot: serializeScreenshot(),
+			plugins: serializePlugins()
 		};
 	}
 
@@ -217,10 +216,6 @@ Singleton {
 			},
 			idle: {
 				timeouts: general.idle.timeouts
-			},
-			battery: {
-				popupThresholds: general.battery.popupThresholds,
-				critPerc: general.battery.critPerc
 			}
 		};
 	}
@@ -296,14 +291,21 @@ Singleton {
 		};
 	}
 
+	function serializePlugins(): var {
+		return {
+			enabled: plugins.enabled,
+			entries: plugins.entries
+		};
+	}
+
 	function serializeScreenshot(): var {
 		return {
 			enable_pp: screenshot.enable_pp,
 			mode: screenshot.mode,
-			radius: screenshot.radius,
+			corner_radius: screenshot.corner_radius,
-			shadow: screenshot.shadow,
+			drop_shadow: screenshot.drop_shadow,
-			rounding: screenshot.rounding,
+			rounded_corners: screenshot.rounded_corners,
-			shadow_blur: screenshot.shadow_blur,
+			shadow_blur_radius: screenshot.shadow_blur_radius,
 			shadow_color: screenshot.shadow_color,
 			shadow_offset_x: screenshot.shadow_offset_x,
 			shadow_offset_y: screenshot.shadow_offset_y
@@ -465,6 +467,8 @@ Singleton {
 			}
 			property Overview overview: Overview {
 			}
+			property PluginConfig plugins: PluginConfig {
+			}
 			property Screenshot screenshot: Screenshot {
 			}
 			property Services services: Services {

Config/DynamicColors.qml

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

Config/General.qml

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

Config/PluginConfig.qml

@@ -0,0 +1,11 @@
+import Quickshell.Io
+
+JsonObject {
+	property bool enabled: false
+	property list<var> entries: [
+		{
+			id: "Plugin",
+			enabled: false
+		},
+	]
+}

Config/Screenshot.qml

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

Daemons/BatteryService.qml

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

Daemons/NotifServer.qml

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

Drawers/Backgrounds.qml

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

Drawers/Drawers.qml

@@ -1,25 +0,0 @@
-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/Drawing.qml

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

Drawers/DrawingInput.qml

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

Drawers/Interactions.qml

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

Drawers/Windows.qml

@@ -9,25 +9,38 @@ 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
 
-CustomWindow {
+Variants {
-	id: root
+	model: Quickshell.screens
+
+	Scope {
+		id: scope
+
+		required property var modelData
+
+		Exclusions {
+			bar: bar
+			screen: scope.modelData
+		}
+
+		CustomWindow {
+			id: win
 
-	readonly property alias bar: bar
 			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
 
 			WlrLayershell.exclusionMode: ExclusionMode.Ignore
-	// WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
+			WlrLayershell.keyboardFocus: visibilities.dock || visibilities.launcher || visibilities.sidebar || visibilities.dashboard || visibilities.settings || visibilities.resources ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 			color: "transparent"
 			contentItem.focus: true
 			mask: visibilities.isDrawing ? null : region
 			name: "Bar"
+			screen: scope.modelData
 
 			contentItem.Keys.onEscapePressed: {
 				if (Config.barConfig.autoHide)
@@ -49,10 +62,10 @@ CustomWindow {
 			Region {
 				id: region
 
-		height: root.height - bar.implicitHeight - Config.barConfig.border
+				height: win.height - bar.implicitHeight - Config.barConfig.border
 				intersection: Intersection.Xor
 				regions: popoutRegions.instances
-		width: root.width - Config.barConfig.border * 2
+				width: win.width - Config.barConfig.border * 2
 				x: Config.barConfig.border
 				y: bar.implicitHeight
 			}
@@ -84,7 +97,7 @@ CustomWindow {
 				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]
+				windows: [win]
 
 				onCleared: {
 					visibilities.launcher = false;
@@ -112,7 +125,7 @@ CustomWindow {
 				property bool settings
 				property bool sidebar
 
-		Component.onCompleted: Visibilities.load(root.screen, this)
+				Component.onCompleted: Visibilities.load(scope.modelData, this)
 			}
 
 			IpcHandler {
@@ -216,7 +229,6 @@ CustomWindow {
 					id: notifsBg
 
 					panel: panels.notifications
-			radius: Appearance.rounding.normal
 				}
 
 				PanelBg {
@@ -292,47 +304,34 @@ CustomWindow {
 				}
 			}
 
-	Loader {
+			Drawing {
-		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 {
+			DrawingInput {
 				id: input
 
 				bar: bar
-			drawing: drawingLoader.item
+				drawing: drawing
 				panels: panels
 				popout: panels.drawing
 				visibilities: visibilities
-		}
+				z: 2
 			}
 
 			Interactions {
-		id: interactions
+				id: mouseArea
 
 				anchors.fill: parent
 				bar: bar
-		drawing: drawingLoader.item
+				drawing: drawing
-		enabled: true
+				input: input
-		input: inputLoader.item
 				panels: panels
 				popouts: panels.popouts
-		screen: root.screen
+				screen: scope.modelData
 				visibilities: visibilities
 				z: 1
 
@@ -340,8 +339,8 @@ CustomWindow {
 					id: panels
 
 					bar: bar
-			drawingItem: drawingLoader.item
+					drawingItem: drawing
-			screen: root.screen
+					screen: scope.modelData
 					visibilities: visibilities
 
 					dashboard.transform: Matrix4x4 {
@@ -383,10 +382,12 @@ CustomWindow {
 					anchors.right: parent.right
 					popouts: panels.popouts
 					popoutsWrapper: panels.popoutsWrapper
-			screen: root.screen
+					screen: scope.modelData
 					visibilities: visibilities
 				}
 			}
+		}
+	}
 
 	component PanelBg: BlobRect {
 		property real deformAmount: 0.15

Extensions/FetchPlugins.qml

@@ -0,0 +1,18 @@
+pragma Singleton
+
+import Quickshell
+import ZShell.Models
+
+Singleton {
+	id: root
+
+	property alias plugins: plugins.entries
+
+	FileSystemModel {
+		id: plugins
+
+		nameFilters: ["*.qml"]
+		path: Quickshell.env("HOME") + "/.config/zshell"
+		recursive: false
+	}
+}

Extensions/LoadExtensions.qml

@@ -0,0 +1,17 @@
+import Quickshell
+import QtQuick
+import ZShell.Models
+import qs.Config
+
+Repeater {
+	model: FetchPlugins.plugins
+
+	LazyLoader {
+		required property FileSystemEntry modelData
+
+		activeAsync: Config.plugins.entries.some(p => {
+			return p.id === modelData.baseName && p.enabled;
+		})
+		source: modelData.path
+	}
+}

Helpers/Battery.qml

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

Helpers/GameMode.qml

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

Helpers/Hypr.qml

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

Helpers/Hyprsunset.qml

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

Helpers/Picker.qml

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

Helpers/SystemUsage.qml

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

Helpers/UPower.qml

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

Helpers/Wallpapers.qml

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

Modules/Background.qml

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

Modules/Clock.qml

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

Modules/Dashboard/Background.qml

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

Modules/Dashboard/Wrapper.qml

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

Modules/Dock/Background.qml

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

Modules/Dock/Wrapper.qml

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

Modules/Drawing/Background.qml

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

Modules/Drawing/Wrapper.qml

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

Modules/Launcher/Background.qml

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

Modules/Launcher/Wrapper.qml

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

Modules/Lock/IdleMonitors.qml

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

Modules/Notifications/Background.qml

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

Modules/Notifications/Content.qml

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

Modules/Notifications/Sidebar/Background.qml

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

Modules/Osd/Background.qml

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

Modules/Resources/Background.qml

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

Modules/Resources/Wrapper.qml

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

Modules/Settings/Background.qml

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

Modules/Settings/Categories.qml

@@ -116,6 +116,12 @@ Item {
 			key: "updates"
 			name: "Updates"
 		}
+
+		ListElement {
+			icon: "extension"
+			key: "plugins"
+			name: "Extensions"
+		}
 	}
 
 	CustomClippingRect {

Modules/Settings/Categories/Bar.qml

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

Modules/Settings/Categories/General.qml

@@ -62,7 +62,6 @@ SettingsPage {
 
 	SettingsSection {
 		sectionId: "Color"
-		z: 1
 
 		SettingsHeader {
 			name: "Color"
@@ -70,7 +69,7 @@ SettingsPage {
 
 		CustomSplitButtonRow {
 			active: Config.general.color.mode === "light" ? menuItems[0] : menuItems[1]
-			enabled: Config.general.color.schemeGeneration
+			buttonAlias.disabled: !Config.general.color.schemeGeneration
 			label: qsTr("Scheme mode")
 
 			menuItems: [
@@ -104,8 +103,9 @@ SettingsPage {
 			id: schemeType
 
 			active: root.schemeTypeItem(menuItems, Config.colors.schemeType)
-			enabled: Config.general.color.schemeGeneration
+			buttonAlias.disabled: !Config.general.color.schemeGeneration
 			label: qsTr("Scheme type")
+			z: 2
 
 			menuItems: [
 				MenuItem {
@@ -250,6 +250,7 @@ SettingsPage {
 
 	SettingsSection {
 		sectionId: "Default Apps"
+		z: -1
 
 		SettingsHeader {
 			name: "Default Apps"

Modules/Settings/Categories/Lockscreen.qml

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

Modules/Settings/Categories/Plugins.qml

@@ -0,0 +1,18 @@
+import qs.Modules.Settings.Controls
+import qs.Config
+
+SettingsPage {
+	SettingsSection {
+		sectionId: "Plugins"
+
+		SettingsHeader {
+			name: "Plugins"
+		}
+
+		SettingBarEntryList {
+			name: "Enable or disable plugins"
+			object: Config.plugins
+			setting: "entries"
+		}
+	}
+}

Modules/Settings/Categories/Screenshot.qml

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

Modules/Settings/Content.qml

@@ -79,6 +79,8 @@ Item {
 				stack.push(screenshot);
 			else if (currentCategory === "updates")
 				stack.push(updates);
+			else if (currentCategory === "plugins")
+				stack.push(plugins);
 		}
 
 		target: root
@@ -134,7 +136,7 @@ Item {
 			anchors.right: parent.right
 			anchors.top: searchBar.bottom
 			anchors.topMargin: Appearance.spacing.smaller
-			color: DynamicColors.tPalette.m3surfaceContainer
+			color: DynamicColors.tPalette.m3surfaceContainerLowest
 			radius: Appearance.rounding.normal
 
 			StackView {
@@ -245,4 +247,11 @@ Item {
 		Cat.SystemUpdates {
 		}
 	}
+
+	Component {
+		id: plugins
+
+		Cat.Plugins {
+		}
+	}
 }

Modules/Settings/Controls/WallpaperCropper.qml

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

Modules/Settings/Wrapper.qml

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

Modules/SysTray/Popouts/AudioPopup.qml

@@ -19,7 +19,7 @@ Item {
 	required property var wrapper
 
 	implicitHeight: vol.implicitHeight + Appearance.padding.small * 2
-	implicitWidth: 600 + Appearance.padding.small * 2
+	implicitWidth: 400 + Appearance.padding.small * 2
 
 	CustomRect {
 		anchors.left: parent.left
@@ -52,25 +52,25 @@ Item {
 
 		CustomRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 65 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
 
-			Item {
+			RowLayout {
-				id: sinkIcon
+				id: outputVolume
 
-				anchors.bottom: parent.bottom
 				anchors.left: parent.left
-				anchors.leftMargin: Appearance.padding.larger
+				anchors.margins: Appearance.spacing.smaller
-				anchors.top: parent.top
+				anchors.right: parent.right
-				implicitWidth: childrenRect.width
+				anchors.verticalCenter: parent.verticalCenter
+				spacing: 15
 
 				CustomRect {
-					anchors.centerIn: parent
+					Layout.alignment: Qt.AlignVCenter
+					Layout.preferredHeight: 40
+					Layout.preferredWidth: 40
 					color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-					implicitHeight: 54
-					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: Appearance.font.size.extraLarge
+						font.pointSize: 22
 						text: Audio.muted ? "volume_off" : "volume_up"
 					}
 
@@ -92,20 +92,11 @@ Item {
 						}
 					}
 				}
-			}
 
 				ColumnLayout {
-				anchors.bottom: parent.bottom
+					Layout.fillWidth: true
-				anchors.bottomMargin: Appearance.padding.smallest
-				anchors.left: sinkIcon.right
-				anchors.leftMargin: Appearance.spacing.larger
-				anchors.right: parent.right
-				anchors.rightMargin: Appearance.padding.large
-				anchors.top: parent.top
-				anchors.topMargin: Appearance.padding.smaller
 
 					RowLayout {
-					Layout.fillHeight: true
 						Layout.fillWidth: true
 
 						CustomText {
@@ -122,15 +113,15 @@ Item {
 					}
 
 					CustomMouseArea {
-					Layout.bottomMargin: Appearance.padding.normal
+						Layout.bottomMargin: 5
 						Layout.fillWidth: true
-					Layout.preferredHeight: Appearance.padding.larger * 3
+						Layout.preferredHeight: 10
 
 						CustomSlider {
 							anchors.left: parent.left
 							anchors.right: parent.right
-						fgColor: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+							color: Audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-						implicitHeight: parent.height
+							implicitHeight: 10
 							value: Audio.volume
 
 							Behavior on value {
@@ -138,7 +129,8 @@ Item {
 								}
 							}
 
-						onInteraction: value => Audio.setVolume(value)
+							onMoved: Audio.setVolume(value)
+						}
 					}
 				}
 			}
@@ -146,7 +138,7 @@ Item {
 
 		CustomClippingRect {
 			Layout.fillWidth: true
-			Layout.preferredHeight: 65 + Appearance.spacing.smaller * 2
+			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
@@ -173,20 +165,20 @@ Item {
 				}
 			}
 
-			Item {
+			RowLayout {
-				id: sourceIcon
+				id: inputVolume
 
-				anchors.bottom: parent.bottom
 				anchors.left: parent.left
-				anchors.leftMargin: Appearance.padding.larger
+				anchors.margins: Appearance.spacing.smaller
-				anchors.top: parent.top
+				anchors.right: parent.right
-				implicitWidth: childrenRect.width
+				anchors.verticalCenter: parent.verticalCenter
+				spacing: 15
 
 				CustomRect {
-					anchors.centerIn: parent
+					Layout.alignment: Qt.AlignVCenter
+					Layout.preferredHeight: 40
+					Layout.preferredWidth: 40
 					color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-					implicitHeight: 54
-					implicitWidth: 54
 					radius: Appearance.rounding.full
 
 					MaterialIcon {
@@ -194,7 +186,7 @@ Item {
 						anchors.centerIn: parent
 						animate: true
 						color: Audio.sourceMuted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-						font.pointSize: Appearance.font.size.extraLarge
+						font.pointSize: 22
 						text: Audio.sourceMuted ? "mic_off" : "mic"
 					}
 
@@ -208,17 +200,9 @@ Item {
 						}
 					}
 				}
-			}
 
 				ColumnLayout {
-				anchors.bottom: parent.bottom
+					Layout.fillWidth: true
-				anchors.bottomMargin: Appearance.padding.smallest
-				anchors.left: sourceIcon.right
-				anchors.leftMargin: Appearance.spacing.larger
-				anchors.right: parent.right
-				anchors.rightMargin: Appearance.padding.large
-				anchors.top: parent.top
-				anchors.topMargin: Appearance.padding.smaller
 
 					RowLayout {
 						Layout.fillHeight: true
@@ -238,15 +222,15 @@ Item {
 					}
 
 					CustomMouseArea {
-					Layout.bottomMargin: Appearance.padding.normal
+						Layout.bottomMargin: 5
 						Layout.fillWidth: true
-					Layout.preferredHeight: Appearance.padding.larger * 3
+						implicitHeight: 10
 
 						CustomSlider {
 							anchors.left: parent.left
 							anchors.right: parent.right
-						fgColor: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+							color: Audio.sourceMuted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-						implicitHeight: parent.height
+							implicitHeight: 10
 							value: Audio.sourceVolume
 
 							Behavior on value {
@@ -254,7 +238,8 @@ Item {
 								}
 							}
 
-						onInteraction: value => Audio.setSourceVolume(value)
+							onMoved: Audio.setSourceVolume(value)
+						}
 					}
 				}
 			}
@@ -280,7 +265,7 @@ Item {
 				required property var modelData
 
 				Layout.fillWidth: true
-				Layout.preferredHeight: 65 + Appearance.spacing.smaller * 2
+				Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
 				Layout.topMargin: root.topMargin
 				color: DynamicColors.tPalette.m3surfaceContainer
 				radius: root.rounding
@@ -307,20 +292,18 @@ Item {
 					}
 				}
 
-				Item {
+				RowLayout {
-					id: appBoxIcon
+					id: layoutVolume
 
-					anchors.bottom: parent.bottom
+					anchors.fill: parent
-					anchors.left: parent.left
+					anchors.margins: Appearance.spacing.smaller
-					anchors.leftMargin: Appearance.padding.larger
+					spacing: 15
-					anchors.top: parent.top
-					implicitWidth: childrenRect.width
 
 					CustomRect {
-						anchors.centerIn: parent
+						Layout.alignment: Qt.AlignVCenter
+						Layout.preferredHeight: 40
+						Layout.preferredWidth: 40
 						color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-						implicitHeight: 54
-						implicitWidth: 54
 						radius: Appearance.rounding.full
 
 						MaterialIcon {
@@ -329,7 +312,7 @@ Item {
 							anchors.centerIn: parent
 							animate: true
 							color: appBox.modelData.audio.muted ? DynamicColors.palette.m3onError : DynamicColors.palette.m3onPrimary
-							font.pointSize: Appearance.font.size.extraLarge
+							font.pointSize: 22
 							text: appBox.modelData.audio.muted ? "volume_off" : "volume_up"
 						}
 
@@ -342,7 +325,10 @@ Item {
 							}
 						}
 					}
-				}
+
+					ColumnLayout {
+						Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+						Layout.fillHeight: true
 
 						TextMetrics {
 							id: metrics
@@ -352,22 +338,13 @@ Item {
 							text: Audio.getStreamName(appBox.modelData)
 						}
 
-				ColumnLayout {
-					anchors.bottom: parent.bottom
-					anchors.bottomMargin: Appearance.padding.smallest
-					anchors.left: appBoxIcon.right
-					anchors.leftMargin: Appearance.spacing.larger
-					anchors.right: parent.right
-					anchors.rightMargin: Appearance.padding.large
-					anchors.top: parent.top
-					anchors.topMargin: Appearance.padding.smaller
-
 						RowLayout {
 							Layout.fillHeight: true
 							Layout.fillWidth: true
 
 							CustomText {
 								Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+								Layout.fillHeight: true
 								Layout.fillWidth: true
 								elide: Text.ElideRight
 								text: metrics.elidedText
@@ -375,24 +352,26 @@ Item {
 
 							CustomText {
 								Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+								Layout.fillHeight: true
 								font.bold: true
 								text: qsTr("%1").arg(appBox.modelData.audio.muted ? qsTr("Muted") : `${Math.round(appBox.modelData.audio.volume * 100)}%`)
 							}
 						}
 
 						CustomMouseArea {
-						Layout.bottomMargin: Appearance.padding.normal
+							Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+							Layout.fillHeight: true
 							Layout.fillWidth: true
-						Layout.preferredHeight: Appearance.padding.larger * 3
+							implicitHeight: 10
 
 							CustomSlider {
 								anchors.left: parent.left
 								anchors.right: parent.right
-							fgColor: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
+								color: appBox.modelData.audio.muted ? DynamicColors.palette.m3error : DynamicColors.palette.m3primary
-							implicitHeight: parent.height
+								implicitHeight: 10
 								value: appBox.modelData.audio.volume
 
-							onInteraction: value => {
+								onMoved: {
 									Audio.setStreamVolume(appBox.modelData, value);
 								}
 							}
@@ -402,3 +381,4 @@ Item {
 			}
 		}
 	}
+}

Modules/SysTray/TrayItem.qml

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

Modules/SysTray/TrayWidget.qml

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

Modules/SysTray/Widgets/UPowerWidget.qml

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

Modules/Updates/UpdatesPopout.qml

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

Modules/Wallpaper/WallBackground-old.qml

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

Modules/Wallpaper/WallBackground.qml

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

Modules/Wallpaper/Wallpaper.qml

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

Modules/Wrapper.qml

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

Plugins/ZShell/Blobs/blobgroup.hpp

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

Plugins/ZShell/Blobs/blobinvertedrect.hpp

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

Plugins/ZShell/Blobs/blobmaterial.hpp

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

Plugins/ZShell/Blobs/blobrect.cpp

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

Plugins/ZShell/Blobs/blobrect.hpp

@@ -24,7 +24,7 @@ public:
 explicit BlobRect(QQuickItem* parent = nullptr);
 ~BlobRect() override;
 
-[[nodiscard]] qreal stiffness() const {
+qreal stiffness() const {
 	return m_stiffness;
 }
 
@@ -35,7 +35,7 @@ void setStiffness(qreal s) {
 	}
 }
 
-[[nodiscard]] qreal damping() const {
+qreal damping() const {
 	return m_damping;
 }
 
@@ -46,7 +46,7 @@ void setDamping(qreal d) {
 	}
 }
 
-[[nodiscard]] qreal deformScale() const {
+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;
 
-[[nodiscard]] qreal topLeftRadius() const {
+qreal topLeftRadius() const {
 	return m_topLeftRadius;
 }
 
 void setTopLeftRadius(qreal r);
 
-[[nodiscard]] qreal topRightRadius() const {
+qreal topRightRadius() const {
 	return m_topRightRadius;
 }
 
 void setTopRightRadius(qreal r);
 
-[[nodiscard]] qreal bottomLeftRadius() const {
+qreal bottomLeftRadius() const {
 	return m_bottomLeftRadius;
 }
 
 void setBottomLeftRadius(qreal r);
 
-[[nodiscard]] qreal bottomRightRadius() const {
+qreal bottomRightRadius() const {
 	return m_bottomRightRadius;
 }
 

Plugins/ZShell/Blobs/blobshape.cpp

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

Plugins/ZShell/Blobs/blobshape.hpp

@@ -21,23 +21,23 @@ public:
 explicit BlobShape(QQuickItem* parent = nullptr);
 ~BlobShape() override = default;
 
-[[nodiscard]] BlobGroup* group() const {
+BlobGroup* group() const {
 	return m_group;
 }
 
 void setGroup(BlobGroup* g);
 
-[[nodiscard]] qreal radius() const {
+qreal radius() const {
 	return m_radius;
 }
 
 void setRadius(qreal r);
 
-[[nodiscard]] QMatrix4x4 deformMatrix() const {
+QMatrix4x4 deformMatrix() const {
 	return m_centeredDeformMatrix;
 }
 
-[[nodiscard]] QMatrix4x4 rawDeformMatrix() const {
+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;
 
-[[nodiscard]] virtual bool isInvertedRect() const {
+virtual bool isInvertedRect() const {
 	return false;
 }
 
@@ -72,9 +72,10 @@ void updateCenteredDeformMatrix();
 
 BlobGroup* m_group = nullptr;
 qreal m_radius = 0;
-QMatrix4x4 m_deformMatrix;
+QMatrix4x4 m_deformMatrix;     // identity by default
 QMatrix4x4 m_centeredDeformMatrix;
 
+// Cached data from updatePolish
 float m_cachedPaddedX = 0;
 float m_cachedPaddedY = 0;
 float m_cachedPaddedW = 0;

Plugins/ZShell/CMakeLists.txt

@@ -45,13 +45,11 @@ qml_module(ZShell
 		requests.hpp requests.cpp
 		toaster.hpp toaster.cpp
 		qalculator.hpp qalculator.cpp
-		zutils.hpp zutils.cpp
     LIBRARIES
         Qt::Gui
         Qt::Quick
         Qt::Concurrent
         Qt::Sql
-		Qt::DBus
 		PkgConfig::Qalculate
 )
 

Plugins/ZShell/Components/CMakeLists.txt

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

Plugins/ZShell/Components/wavyline.cpp

@@ -1,255 +0,0 @@
-#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

@@ -1,107 +0,0 @@
-#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/CMakeLists.txt

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

Plugins/ZShell/Internal/arcgauge.cpp

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

Plugins/ZShell/Internal/arcgauge.hpp

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

Plugins/ZShell/Internal/cachingimagemanager.hpp

@@ -19,8 +19,7 @@ Q_PROPERTY(QUrl cachePath READ cachePath NOTIFY cachePathChanged)
 public:
     explicit CachingImageManager(QObject* parent = nullptr)
         : QObject(parent)
-	, m_item(nullptr) {
+        , m_item(nullptr) {}
-}
 
     [[nodiscard]] QQuickItem* item() const;
     void setItem(QQuickItem* item);

Plugins/ZShell/Internal/circularbuffer.cpp

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

Plugins/ZShell/Internal/circularbuffer.hpp

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

Plugins/ZShell/Internal/circularindicatormanager.hpp

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

Plugins/ZShell/Internal/hyprextras.cpp

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

Plugins/ZShell/Internal/hyprextras.hpp

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

Plugins/ZShell/Internal/lidwatcher.cpp

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

Plugins/ZShell/Internal/lidwatcher.hpp

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

Plugins/ZShell/Internal/sparklineitem.cpp

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

Plugins/ZShell/Internal/sparklineitem.hpp

@@ -7,7 +7,7 @@
 
 #include "circularbuffer.hpp"
 
-namespace ZShell::internal {
+namespace caelestia::internal {
 
 class SparklineItem : public QQuickPaintedItem {
 Q_OBJECT
@@ -87,4 +87,4 @@ int m_historyLength = 30;
 qreal m_lineWidth = 2.0;
 };
 
-} // namespace ZShell::internal
+} // namespace caelestia::internal