Initial commit for submenu popouts, unfinished

Reviewed-on: #90

.gitea/workflows/lint-js.yml

@@ -0,0 +1,42 @@
+name: Lint & Format (JS/TS)
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-alpine
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git
+
+            - name: Prettier
+              continue-on-error: true
+              run: |
+                  if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then
+                    npx --yes prettier --check "**/*.{js,jsx,ts,tsx,mjs,cjs}" --ignore-path .prettierignore
+                  else
+                    echo "No JS/TS files found"
+                  fi
+
+            - name: ESLint
+              run: |
+                  if [ -n "$(find . \( -iname "*.js" -o -iname "*.jsx" -o -iname "*.ts" -o -iname "*.tsx" -o -iname "*.mjs" -o -iname "*.cjs" \) -print -quit)" ]; then
+                    if [ -f package.json ]; then
+                      npm install --no-audit --no-fund
+                    fi
+                    if [ -f eslint.config.js ] || [ -f eslint.config.mjs ] || [ -f eslint.config.cjs ] || [ -f .eslintrc ] || [ -f .eslintrc.js ] || [ -f .eslintrc.cjs ] || [ -f .eslintrc.json ] || [ -f .eslintrc.yaml ] || [ -f .eslintrc.yml ]; then
+                      npx --yes eslint . && echo "ESLint passed" || echo "ESLint failed"
+                    else
+                      echo "No eslint config found"
+                    fi
+                  else
+                    echo "No JS/TS files found"
+                  fi

.gitea/workflows/lint-python.yml

@@ -0,0 +1,34 @@
+name: Lint & Format (Python)
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-alpine
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git \
+                    python3 \
+                    py3-pip
+                  python3 -m venv .venv
+                  . .venv/bin/activate
+                  pip install --no-cache-dir ruff
+
+            - name: Format check
+              continue-on-error: true
+              run: |
+                  . .venv/bin/activate
+                  ruff format --check .
+
+            - name: Lint
+              run: |
+                  . .venv/bin/activate
+                  ruff check .

.gitea/workflows/lint-rust.yml

@@ -0,0 +1,72 @@
+name: Lint & Format (Rust)
+
+on:
+    pull_request:
+
+jobs:
+    lint-format:
+        runs-on: alpine
+        container: node:26-alpine
+        env:
+            CARGO_HOME: ${{ github.workspace }}/.cargo
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Cache cargo packages
+              uses: actions/cache@v4
+              env:
+                  cache-name: cache-cargo-packages
+              with:
+                  path: |
+                      .cargo/registry
+                      .cargo/git
+                      target
+                  key: rust-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
+                  restore-keys: |
+                      rust-${{ runner.os }}-build-${{ env.cache-name }}-
+                      rust-${{ runner.os }}-build-
+                      rust-
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git \
+                    cargo \
+                    rust \
+                    rustfmt \
+                    rust-clippy
+
+            - name: Format check
+              continue-on-error: true
+              run: |
+                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
+                    for manifest in $(find . -name "Cargo.toml"); do
+                      cargo fmt --manifest-path "$manifest" --check && \
+                        echo "$manifest: formatting OK" || \
+                        echo "$manifest: needs formatting"
+                    done
+                  elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
+                    echo "Rust files found but no Cargo.toml"
+                    exit 1
+                  else
+                    echo "No Rust project found"
+                  fi
+
+            - name: Clippy
+              run: |
+                  if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
+                    status=0
+                    for manifest in $(find . -name "Cargo.toml"); do
+                      cargo clippy --manifest-path "$manifest" --all-targets --all-features -- -D warnings && \
+                        echo "$manifest: Clippy passed" || \
+                        { echo "$manifest: Clippy failed"; status=1; }
+                    done
+                    exit $status
+                  elif [ -n "$(find . -name "*.rs" -print -quit)" ]; then
+                    echo "Rust files found but no Cargo.toml"
+                    exit 1
+                  else
+                    echo "No Rust project found"
+                  fi

.gitignore

@@ -1,3 +1,4 @@
+**/__pycache__/
 ./result/
 .pyre/
 .cache/
@@ -11,3 +12,4 @@ pkg/
 uv.lock
 .qtcreator/
 dist/
+**/target/

.prettierignore

@@ -0,0 +1,3 @@
+.venv/
+scripts/fzf.js
+scripts/fuzzysort.js

.prettierrc.json

@@ -0,0 +1,13 @@
+{
+    "semi": true,
+    "singleQuote": false,
+    "jsxSingleQuote": false,
+    "tabWidth": 4,
+    "printWidth": 80,
+    "trailingComma": "es5",
+    "bracketSpacing": true,
+    "bracketSameLine": false,
+    "arrowParens": "always",
+    "endOfLine": "lf",
+    "proseWrap": "preserve"
+}

Components/Anim.qml

@@ -2,7 +2,7 @@ import QtQuick
 import qs.Config
 
 NumberAnimation {
-	duration: MaterialEasing.standardTime
+	duration: Appearance.anim.durations.normal
-	easing.bezierCurve: MaterialEasing.standard
+	easing.bezierCurve: Appearance.anim.curves.standard
 	easing.type: Easing.BezierSpline
 }

Components/HoverIconButton.qml

@@ -0,0 +1,33 @@
+import QtQuick
+import QtQuick.Controls
+import qs.Config
+
+IconButton {
+	id: root
+
+	required property bool shouldBeVisible
+
+	opacity: 0
+	scale: 0
+	visible: root.scale > 0
+
+	Behavior on opacity {
+		Anim {
+			duration: Appearance.anim.durations.small
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+
+	onShouldBeVisibleChanged: {
+		if (root.shouldBeVisible) {
+			root.opacity = 1;
+			root.scale = 1;
+		} else {
+			root.opacity = 0;
+			root.scale = 0;
+		}
+	}
+}

Components/IconButton.qml

@@ -41,12 +41,11 @@ CustomRect {
 	color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour
 	implicitHeight: label.implicitHeight + padding * 2
 	implicitWidth: implicitHeight
-	radius: internalChecked ? 6 : implicitHeight / 2 * Math.min(1, 1)
+	radius: internalChecked ? 6 : (implicitHeight / 2 * Math.min(1, 1)) * Appearance.rounding.scale
 
 	Behavior on radius {
 		Anim {
 			id: radiusAnim
-
 		}
 	}
 

Config/Appearance.qml

@@ -4,6 +4,7 @@ import Quickshell
 
 Singleton {
 	readonly property AppearanceConf.Anim anim: Config.appearance.anim
+	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:

Config/AppearanceConf.qml

@@ -3,6 +3,8 @@ import Quickshell.Io
 JsonObject {
 	property Anim anim: Anim {
 	}
+	property Deform deform: Deform {
+	}
 	property FontStuff font: FontStuff {
 	}
 	property Padding padding: Padding {
@@ -43,6 +45,9 @@ JsonObject {
 		property real scale: 1
 		property int small: 200 * scale
 	}
+	component Deform: JsonObject {
+		property real scale: 1
+	}
 	component FontFamily: JsonObject {
 		property string clock: "Rubik"
 		property string material: "Material Symbols Rounded"

Config/BackgroundConfig.qml

@@ -7,4 +7,8 @@ JsonObject {
 	property real alignX: 0.5
 	property real alignY: 0.5
 	property real zoom: 1.0
+	property real sourceClipX: 0
+	property real sourceClipY: 0
+	property real sourceClipW: 0
+	property real sourceClipH: 0
 }

Config/BarConfig.qml

@@ -8,10 +8,6 @@ JsonObject {
 			id: "workspaces",
 			enabled: true
 		},
-		{
-			id: "audio",
-			enabled: true
-		},
 		{
 			id: "media",
 			enabled: true
@@ -24,10 +20,6 @@ JsonObject {
 			id: "updates",
 			enabled: true
 		},
-		{
-			id: "dash",
-			enabled: true
-		},
 		{
 			id: "spacer",
 			enabled: true
@@ -48,10 +40,6 @@ JsonObject {
 			id: "tray",
 			enabled: true
 		},
-		{
-			id: "upower",
-			enabled: false
-		},
 		{
 			id: "network",
 			enabled: false
@@ -70,6 +58,7 @@ JsonObject {
 	property Popouts popouts: Popouts {
 	}
 	property int rounding: 8
+	property int smoothing: 32
 
 	component Popouts: JsonObject {
 		property bool activeWindow: true

Config/Config.qml

@@ -23,6 +23,7 @@ Singleton {
 	property alias osd: adapter.osd
 	property alias overview: adapter.overview
 	property bool recentlySaved: false
+	property alias screenshot: adapter.screenshot
 	property alias services: adapter.services
 	property alias sidebar: adapter.sidebar
 	property alias utilities: adapter.utilities
@@ -48,6 +49,9 @@ Singleton {
 			padding: {
 				scale: appearance.padding.scale
 			},
+			deform: {
+				scale: appearance.deform.scale
+			},
 			font: {
 				family: {
 					sans: appearance.font.family.sans,
@@ -79,6 +83,10 @@ Singleton {
 			wallFadeDuration: background.wallFadeDuration,
 			enabled: background.enabled,
 			alignX: background.alignX,
+			sourceClipX: background.sourceClipX,
+			sourceClipY: background.sourceClipY,
+			sourceClipW: background.sourceClipW,
+			sourceClipH: background.sourceClipH,
 			alignY: background.alignY,
 			zoom: background.zoom
 		};
@@ -90,6 +98,7 @@ Singleton {
 			hideWhenNotif: barConfig.hideWhenNotif,
 			rounding: barConfig.rounding,
 			border: barConfig.border,
+			smoothing: barConfig.smoothing,
 			height: barConfig.height,
 			popouts: {
 				tray: barConfig.popouts.tray,
@@ -125,7 +134,8 @@ Singleton {
 			background: serializeBackground(),
 			launcher: serializeLauncher(),
 			colors: serializeColors(),
-			dock: serializeDock()
+			dock: serializeDock(),
+			screenshot: serializeScreenshot()
 		};
 	}
 
@@ -177,6 +187,7 @@ Singleton {
 			logo: general.logo,
 			wallpaperPath: general.wallpaperPath,
 			desktopIcons: general.desktopIcons,
+			dateFormat: general.dateFormat,
 			color: {
 				mode: general.color.mode,
 				smart: general.color.smart,
@@ -206,6 +217,7 @@ Singleton {
 		return {
 			maxAppsShown: launcher.maxAppsShown,
 			maxWallpapers: launcher.maxWallpapers,
+			uwsm: launcher.uwsm,
 			actionPrefix: launcher.actionPrefix,
 			specialPrefix: launcher.specialPrefix,
 			useFuzzy: {
@@ -229,6 +241,7 @@ Singleton {
 		return {
 			recolorLogo: lock.recolorLogo,
 			enableFprint: lock.enableFprint,
+			showNotifContent: lock.showNotifContent,
 			maxFprintTries: lock.maxFprintTries,
 			blurAmount: lock.blurAmount,
 			sizes: {
@@ -270,6 +283,20 @@ Singleton {
 		};
 	}
 
+	function serializeScreenshot(): var {
+		return {
+			enable_pp: screenshot.enable_pp,
+			mode: screenshot.mode,
+			corner_radius: screenshot.corner_radius,
+			drop_shadow: screenshot.drop_shadow,
+			rounded_corners: screenshot.rounded_corners,
+			shadow_blur_radius: screenshot.shadow_blur_radius,
+			shadow_color: screenshot.shadow_color,
+			shadow_offset_x: screenshot.shadow_offset_x,
+			shadow_offset_y: screenshot.shadow_offset_y
+		};
+	}
+
 	function serializeServices(): var {
 		return {
 			weatherLocation: services.weatherLocation,
@@ -425,6 +452,8 @@ Singleton {
 			}
 			property Overview overview: Overview {
 			}
+			property Screenshot screenshot: Screenshot {
+			}
 			property Services services: Services {
 			}
 			property SidebarConfig sidebar: SidebarConfig {

Config/DynamicColors.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import Quickshell.Io
+import Quickshell.Hyprland
 import QtQuick
 import ZShell
 import qs.Helpers
@@ -79,10 +80,32 @@ Singleton {
 	}
 
 	function reloadHyprRules(): void {
-		const barStr = "keyword layerrule %1 %2, match:namespace ZShell-Bar";
+		const blur = transparency.enabled ? 1 : 0;
-		const authStr = "keyword layerrule %1 %2, match:namespace ZShell-Auth";
+		const alpha = transparency.base - 0.03;
-		Hypr.extras.batchMessage([barStr.arg("blur").arg(transparency.enabled ? 1 : 0), barStr.arg("ignore_alpha").arg(transparency.base - 0.03)]);
+
-		Hypr.extras.batchMessage([authStr.arg("blur").arg(transparency.enabled ? 1 : 0), authStr.arg("ignore_alpha").arg(transparency.base - 0.03)]);
+		const rules = `
+			hl.layer_rule({
+				match = { namespace = "ZShell-Bar" },
+				blur = ${blur}
+			})
+
+			hl.layer_rule({
+				match = { namespace = "ZShell-Bar" },
+				ignore_alpha = ${alpha}
+			})
+
+			hl.layer_rule({
+				match = { namespace = "ZShell-Auth" },
+				blur = ${blur}
+			})
+
+			hl.layer_rule({
+				match = { namespace = "ZShell-Auth" },
+				ignore_alpha = ${alpha}
+			})
+		`;
+
+		Hypr.extras.message(`eval ${rules}`);
 	}
 
 	function setMode(mode: string): void {
@@ -93,6 +116,14 @@ Singleton {
 
 	Component.onCompleted: debounceTimer.triggered()
 
+	Connections {
+		function onUsingLuaChanged(): void {
+			root.reloadHyprRules();
+		}
+
+		target: Hyprland
+	}
+
 	Connections {
 		function onConfigReloaded(): void {
 			root.reloadHyprRules();

Config/General.qml

@@ -6,6 +6,7 @@ JsonObject {
 	}
 	property Color color: Color {
 	}
+	property string dateFormat: "ddd d MMM - hh:mm:ss"
 	property bool desktopIcons: false
 	property Idle idle: Idle {
 	}

Config/Launcher.qml

@@ -91,6 +91,7 @@ JsonObject {
 	property string specialPrefix: "@"
 	property UseFuzzy useFuzzy: UseFuzzy {
 	}
+	property bool uwsm: true
 
 	component Sizes: JsonObject {
 		property int itemHeight: 50

Config/LockConf.qml

@@ -5,6 +5,7 @@ JsonObject {
 	property bool enableFprint: true
 	property int maxFprintTries: 3
 	property bool recolorLogo: false
+	property bool showNotifContent: false
 	property Sizes sizes: Sizes {
 	}
 

Config/Screenshot.qml

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

Drawers/Drawing.qml

@@ -3,184 +3,33 @@ import QtQuick
 Canvas {
 	id: root
 
-	property rect dirtyRect: Qt.rect(0, 0, 0, 0)
-	property bool frameQueued: false
-	property bool fullRepaintPending: true
-	property point lastPoint: Qt.point(0, 0)
-	property real minPointDistance: 2.0
 	property color penColor: "white"
 	property real penWidth: 4
-	property var pendingSegments: []
+	property var points: []
-	property bool strokeActive: false
-	property var strokes: []
 
-	function appendPoint(x, y) {
+	function clear(): void {
-		if (!strokeActive || strokes.length === 0)
+		var ctx = getContext('2d');
+		root.points = [];
+		ctx.reset();
+		root.requestPaint();
+	}
+
+	renderStrategy: Canvas.Cooperative
+
+	onPaint: {
+		if (points.length < 2)
 			return;
-		const dx = x - lastPoint.x;
+		var ctx = root.getContext('2d');
-		const dy = y - lastPoint.y;
+		ctx.save();
-
+		ctx.lineWidth = root.penWidth;
-		if ((dx * dx + dy * dy) < (minPointDistance * minPointDistance))
+		ctx.strokeStyle = root.penColor;
-			return;
-		const x1 = lastPoint.x;
-		const y1 = lastPoint.y;
-		const x2 = x;
-		const y2 = y;
-
-		strokes[strokes.length - 1].push(Qt.point(x2, y2));
-
-		pendingSegments.push({
-			dot: false,
-			x1: x1,
-			y1: y1,
-			x2: x2,
-			y2: y2
-		});
-
-		lastPoint = Qt.point(x2, y2);
-		queueDirty(segmentDirtyRect(x1, y1, x2, y2));
-	}
-
-	function beginStroke(x, y) {
-		const p = Qt.point(x, y);
-		strokes.push([p]);
-		lastPoint = p;
-		strokeActive = true;
-
-		pendingSegments.push({
-			dot: true,
-			x: x,
-			y: y
-		});
-
-		queueDirty(pointDirtyRect(x, y));
-	}
-
-	function clear() {
-		strokes = [];
-		pendingSegments = [];
-		dirtyRect = Qt.rect(0, 0, 0, 0);
-		fullRepaintPending = true;
-		markDirty(Qt.rect(0, 0, width, height));
-	}
-
-	function drawDot(ctx, x, y) {
-		ctx.beginPath();
-		ctx.arc(x, y, penWidth / 2, 0, Math.PI * 2);
-		ctx.fill();
-	}
-
-	function drawSegment(ctx, x1, y1, x2, y2) {
-		ctx.beginPath();
-		ctx.moveTo(x1, y1);
-		ctx.lineTo(x2, y2);
-		ctx.stroke();
-	}
-
-	function endStroke() {
-		strokeActive = false;
-	}
-
-	function pointDirtyRect(x, y) {
-		const pad = penWidth + 2;
-		return Qt.rect(x - pad, y - pad, pad * 2, pad * 2);
-	}
-
-	function queueDirty(r) {
-		dirtyRect = unionRects(dirtyRect, r);
-
-		if (frameQueued)
-			return;
-		frameQueued = true;
-
-		requestAnimationFrame(function () {
-			frameQueued = false;
-
-			if (dirtyRect.width > 0 && dirtyRect.height > 0) {
-				markDirty(dirtyRect);
-				dirtyRect = Qt.rect(0, 0, 0, 0);
-			}
-		});
-	}
-
-	function replayAll(ctx) {
-		ctx.clearRect(0, 0, width, height);
-
-		for (const stroke of strokes) {
-			if (!stroke || stroke.length === 0)
-				continue;
-			if (stroke.length === 1) {
-				const p = stroke[0];
-				drawDot(ctx, p.x, p.y);
-				continue;
-			}
-
-			ctx.beginPath();
-			ctx.moveTo(stroke[0].x, stroke[0].y);
-			for (let i = 1; i < stroke.length; ++i)
-				ctx.lineTo(stroke[i].x, stroke[i].y);
-			ctx.stroke();
-		}
-	}
-
-	function requestFullRepaint() {
-		fullRepaintPending = true;
-		markDirty(Qt.rect(0, 0, width, height));
-	}
-
-	function segmentDirtyRect(x1, y1, x2, y2) {
-		const pad = penWidth + 2;
-		const left = Math.min(x1, x2) - pad;
-		const top = Math.min(y1, y2) - pad;
-		const right = Math.max(x1, x2) + pad;
-		const bottom = Math.max(y1, y2) + pad;
-		return Qt.rect(left, top, right - left, bottom - top);
-	}
-
-	function unionRects(a, b) {
-		if (a.width <= 0 || a.height <= 0)
-			return b;
-		if (b.width <= 0 || b.height <= 0)
-			return a;
-
-		const left = Math.min(a.x, b.x);
-		const top = Math.min(a.y, b.y);
-		const right = Math.max(a.x + a.width, b.x + b.width);
-		const bottom = Math.max(a.y + a.height, b.y + b.height);
-
-		return Qt.rect(left, top, right - left, bottom - top);
-	}
-
-	anchors.fill: parent
-	contextType: "2d"
-	renderStrategy: Canvas.Threaded
-	renderTarget: Canvas.Image
-
-	onHeightChanged: requestFullRepaint()
-	onPaint: region => {
-		const ctx = getContext("2d");
-
 		ctx.lineCap = "round";
-		ctx.lineJoin = "round";
+		ctx.beginPath();
-		ctx.lineWidth = penWidth;
+		ctx.moveTo(points[0].x, points[0].y);
-		ctx.strokeStyle = penColor;
+		for (var i = 1; i < points.length; i++)
-		ctx.fillStyle = penColor;
+			ctx.lineTo(points[i].x, points[i].y);
-
+		ctx.stroke();
-		if (fullRepaintPending) {
+		points = points.slice(points.length - 2);
-			fullRepaintPending = false;
+		ctx.restore();
-			replayAll(ctx);
-			pendingSegments = [];
-			return;
-		}
-
-		for (const seg of pendingSegments) {
-			if (seg.dot)
-				drawDot(ctx, seg.x, seg.y);
-			else
-				drawSegment(ctx, seg.x1, seg.y1, seg.x2, seg.y2);
-		}
-
-		pendingSegments = [];
 	}
-	onWidthChanged: requestFullRepaint()
 }

Drawers/DrawingInput.qml

@@ -30,8 +30,10 @@ CustomMouseArea {
 		const x = event.x;
 		const y = event.y;
 
-		if (event.buttons & Qt.LeftButton)
+		if (root.visibilities.isDrawing && (event.buttons & Qt.LeftButton)) {
-			root.drawing.appendPoint(x, y);
+			root.drawing.points.push(Qt.point(x, y));
+			root.drawing.requestPaint();
+		}
 
 		if (root.inLeftPanel(root.popout, x, y)) {
 			root.z = -2;
@@ -44,7 +46,8 @@ CustomMouseArea {
 
 		if (root.visibilities.isDrawing && (event.buttons & Qt.LeftButton)) {
 			root.panels.drawing.expanded = false;
-			root.drawing.beginStroke(x, y);
+			root.drawing.points.push(Qt.point(x, y));
+			root.drawing.requestPaint();
 			return;
 		}
 
@@ -52,7 +55,6 @@ CustomMouseArea {
 			root.drawing.clear();
 	}
 	onReleased: {
-		if (root.visibilities.isDrawing)
+		root.drawing.points = [];
-			root.drawing.endStroke();
 	}
 }

Drawers/Exclusions.qml

@@ -12,22 +12,37 @@ Scope {
 	required property ShellScreen screen
 
 	ExclusionZone {
+		id: top
+
 		anchors.top: true
 		exclusiveZone: root.bar.exclusiveZone
 	}
 
 	ExclusionZone {
+		id: left
+
 		anchors.left: true
 	}
 
 	ExclusionZone {
+		id: right
+
 		anchors.right: true
 	}
 
 	ExclusionZone {
+		id: bottom
+
 		anchors.bottom: true
 	}
 
+	Timer {
+		interval: 5000
+		running: true
+
+		onTriggered: console.log("top height:", top.exclusiveZone, "left width:", left.exclusiveZone, "right width:", right.exclusiveZone, "bottom height:", bottom.exclusiveZone)
+	}
+
 	component ExclusionZone: CustomWindow {
 		exclusiveZone: Config.barConfig.border
 		implicitHeight: 1

Drawers/Interactions.qml

@@ -78,7 +78,7 @@ CustomMouseArea {
 		const dragY = y - dragStart.y;
 
 		if (root.visibilities.isDrawing && !root.inLeftPanel(root.panels.drawing, x, y)) {
-			root.input.z = 2;
+			// root.input.z = 2;
 			root.panels.drawing.expanded = false;
 		}
 
@@ -97,7 +97,7 @@ CustomMouseArea {
 				visibilities.dock = true;
 
 		if (panels.sidebar.width === 0) {
-			const showOsd = inRightPanel(panels.osd, x, y);
+			const showOsd = inRightPanel(panels.osdWrapper, x, y);
 
 			if (showOsd) {
 				osdShortcutActive = false;
@@ -105,7 +105,7 @@ CustomMouseArea {
 			}
 		} else {
 			const outOfSidebar = x < width - panels.sidebar.width;
-			const showOsd = outOfSidebar && inRightPanel(panels.osd, x, y);
+			const showOsd = outOfSidebar && inRightPanel(panels.osdWrapper, x, y);
 
 			if (!osdShortcutActive) {
 				visibilities.osd = showOsd;

Drawers/Panels.qml

@@ -13,6 +13,7 @@ import qs.Modules.Resources as Resources
 import qs.Modules.Settings as Settings
 import qs.Modules.Drawing as Drawing
 import qs.Modules.Dock as Dock
+import qs.Modules.SysTray.Popouts as SysPopouts
 import qs.Config
 
 Item {
@@ -20,19 +21,24 @@ Item {
 
 	required property Item bar
 	readonly property alias dashboard: dashboard
+	readonly property alias dashboardWrapper: dashboardWrapper
 	readonly property alias dock: dock
 	readonly property alias drawing: drawing
 	required property Canvas drawingItem
 	readonly property alias launcher: launcher
 	readonly property alias notifications: notifications
 	readonly property alias osd: osd
+	readonly property alias osdWrapper: osdWrapper
 	readonly property alias popouts: popouts.content
 	readonly property alias popoutsWrapper: popouts
 	readonly property alias resources: resources
+	readonly property alias resourcesWrapper: resourcesWrapper
 	required property ShellScreen screen
 	readonly property alias settings: settings
+	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
+	readonly property alias traySubmenus: traySubmenus
 	readonly property alias utilities: utilities
 	required property PersistentProperties visibilities
 
@@ -40,12 +46,43 @@ Item {
 	anchors.margins: Config.barConfig.border
 	anchors.topMargin: bar.implicitHeight
 
-	Resources.Wrapper {
+	Item {
-		id: resources
+		id: resourcesWrapper
 
 		anchors.left: parent.left
 		anchors.top: parent.top
-		visibilities: root.visibilities
+		clip: true
+		implicitHeight: resources.implicitHeight * (1 - resources.offsetScale)
+		implicitWidth: resources.implicitWidth
+
+		Resources.Wrapper {
+			id: resources
+
+			anchors.left: parent.left
+			anchors.top: parent.top
+			visibilities: root.visibilities
+		}
+	}
+
+	Item {
+		id: osdWrapper
+
+		anchors.right: parent.right
+		anchors.rightMargin: sidebar.width * (1 - sidebar.offsetScale)
+		anchors.verticalCenter: parent.verticalCenter
+		clip: sidebar.visible
+		implicitHeight: osd.implicitHeight
+		implicitWidth: osd.implicitWidth * (1 - osd.offsetScale)
+
+		Osd.Wrapper {
+			id: osd
+
+			anchors.right: parent.right
+			anchors.verticalCenter: parent.verticalCenter
+			screen: root.screen
+			sidebarOrSessionVisible: sidebar.visible
+			visibilities: root.visibilities
+		}
 	}
 
 	Drawing.Wrapper {
@@ -58,15 +95,77 @@ Item {
 		visibilities: root.visibilities
 	}
 
-	Osd.Wrapper {
+	Item {
-		id: osd
+		id: traySubmenus
 
-		anchors.right: parent.right
+		Repeater {
-		anchors.rightMargin: sidebar.width
+			model: popouts.content.state.submenus
-		anchors.verticalCenter: parent.verticalCenter
+
-		clip: sidebar.width > 0
+			CustomClippingRect {
-		screen: root.screen
+				id: subMenuWrapper
-		visibilities: root.visibilities
+
+				required property int index
+				required property var modelData
+				property real targetX: 0
+				property real targetY: 0
+
+				function updatePosition() {
+					let sourceItem = modelData.sourceItem;
+					if (!sourceItem || !sourceItem.parent)
+						return;
+
+					let mapped = sourceItem.mapToItem(root, 0, -Appearance.padding.small);
+
+					let rightX = mapped.x + modelData.sourceWidth + Config.barConfig.border;
+					let leftX = mapped.x - implicitWidth - Config.barConfig.border;
+
+					if (rightX + implicitWidth > root.width) {
+						targetX = leftX;
+					} else {
+						targetX = rightX;
+					}
+
+					targetY = mapped.y;
+
+					if (targetY + implicitHeight > root.height) {
+						targetY = root.height - implicitHeight;
+					}
+					if (targetY < 0)
+						targetY = 0;
+				}
+
+				implicitHeight: subMenuContent.implicitHeight + Appearance.padding.small * 2
+				implicitWidth: subMenuContent.implicitWidth + Appearance.padding.small * 2
+				radius: Appearance.rounding.normal
+				x: targetX
+				y: targetY
+
+				Behavior on implicitHeight {
+					Anim {
+					}
+				}
+				Behavior on implicitWidth {
+					Anim {
+					}
+				}
+
+				Component.onCompleted: {
+					updatePosition();
+				}
+				onImplicitHeightChanged: updatePosition()
+				onImplicitWidthChanged: updatePosition()
+
+				SysPopouts.SubMenu {
+					id: subMenuContent
+
+					anchors.centerIn: parent
+					handle: subMenuWrapper.modelData.handle
+					level: subMenuWrapper.index + 1
+					popouts: root.popouts.state
+					screen: root.screen
+				}
+			}
+		}
 	}
 
 	Modules.ClipWrapper {
@@ -90,6 +189,7 @@ Item {
 		anchors.right: parent.right
 		anchors.top: parent.top
 		panels: root
+		sidebarPanel: sidebar
 		visibilities: root.visibilities
 	}
 
@@ -113,12 +213,33 @@ Item {
 		visibilities: root.visibilities
 	}
 
-	Dashboard.Wrapper {
+	Item {
-		id: dashboard
+		id: dashboardWrapper
+
+		property real offsetScale: dashboard.shouldBeActive ? 0 : 1
 
 		anchors.right: parent.right
 		anchors.top: parent.top
-		visibilities: root.visibilities
+		clip: true
+		implicitHeight: dashboard.implicitHeight * (1 - offsetScale)
+		implicitWidth: dashboard.implicitWidth
+
+		Behavior on offsetScale {
+			Anim {
+				duration: Appearance.anim.durations.expressiveDefaultSpatial
+				easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+			}
+		}
+
+		Dashboard.Wrapper {
+			id: dashboard
+
+			anchors.right: parent.right
+			anchors.top: parent.top
+			anchors.topMargin: (-implicitHeight - 5) * offsetScale
+			offsetScale: dashboardWrapper.offsetScale
+			visibilities: root.visibilities
+		}
 	}
 
 	Sidebar.Wrapper {
@@ -131,13 +252,25 @@ Item {
 		visibilities: root.visibilities
 	}
 
-	Settings.Wrapper {
+	Item {
-		id: settings
+		id: settingsWrapper
 
-		anchors.centerIn: parent
+		anchors.horizontalCenter: parent.horizontalCenter
-		panels: root
+		anchors.top: parent.top
-		screen: root.screen
+		clip: true
-		visibilities: root.visibilities
+		implicitHeight: settings.implicitHeight * (1 - settings.offsetScale)
+		implicitWidth: settings.implicitWidth
+
+		Settings.Wrapper {
+			id: settings
+
+			anchors.horizontalCenter: parent.horizontalCenter
+			anchors.top: parent.top
+			// anchors.centerIn: parent
+			panels: root
+			screen: root.screen
+			visibilities: root.visibilities
+		}
 	}
 
 	Dock.Wrapper {

Drawers/Windows.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Effects
 import Quickshell
+import Quickshell.Io
 import Quickshell.Wayland
 import Quickshell.Hyprland
 import ZShell.Blobs
@@ -63,7 +64,7 @@ Variants {
 
 				height: win.height - bar.implicitHeight - Config.barConfig.border
 				intersection: Intersection.Xor
-				regions: popoutRegions.instances
+				regions: [...popoutRegions.instances, ...subMenuRegions.instances]
 				width: win.width - Config.barConfig.border * 2
 				x: Config.barConfig.border
 				y: bar.implicitHeight
@@ -92,6 +93,22 @@ Variants {
 				}
 			}
 
+			Variants {
+				id: subMenuRegions
+
+				model: panels.traySubmenus.children
+
+				Region {
+					required property Item modelData
+
+					height: modelData.height
+					intersection: Intersection.Subtract
+					width: modelData.width
+					x: modelData.x + panels.traySubmenus.x + Config.barConfig.border
+					y: modelData.y + panels.traySubmenus.y + bar.implicitHeight
+				}
+			}
+
 			HyprlandFocusGrab {
 				id: focusGrab
 
@@ -127,6 +144,14 @@ Variants {
 				Component.onCompleted: Visibilities.load(scope.modelData, this)
 			}
 
+			IpcHandler {
+				function toggleLauncher(fix: string): void {
+					visibilities.launcher = !visibilities.launcher;
+				}
+
+				target: "visibilities"
+			}
+
 			Binding {
 				property: "bar"
 				target: visibilities
@@ -149,6 +174,7 @@ Variants {
 					id: blobGroup
 
 					color: DynamicColors.palette.m3surface
+					smoothing: Config.barConfig.smoothing
 
 					Behavior on color {
 						CAnim {
@@ -170,25 +196,35 @@ Variants {
 				PanelBg {
 					id: dashBg
 
-					deformAmount: 0.1
+					property real extraHeight: 0.2
-					panel: panels.dashboard
+
+					deformAmount: 0.06
+					implicitHeight: panels.dashboard.height * (1 + extraHeight)
+					implicitWidth: panels.dashboard.width
+					panel: panels.dashboardWrapper
 					radius: Appearance.rounding.normal
+					x: panels.dashboardWrapper.x + panels.dashboard.x + Config.barConfig.border
+					y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight - panels.dashboard.height * extraHeight
 				}
 
 				PanelBg {
 					id: launcherBg
 
-					deformAmount: 0.1
+					property real extraHeight: 0.2
+
+					deformAmount: 0.06
+					implicitHeight: panels.launcher.height * (1 + extraHeight)
 					panel: panels.launcher
 					radius: Appearance.rounding.smallest + 5
+					y: panels.launcher.y + bar.implicitHeight
 				}
 
 				PanelBg {
 					id: sidebarBg
 
 					bottomLeftRadius: 0
-					deformAmount: 0.03
+					deformAmount: 0.04
-					exclude: panels.sidebar.offsetscale > 0.08 ? [] : [utilsBg]
+					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [utilsBg]
 					implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2
 					panel: panels.sidebar
 				}
@@ -196,9 +232,13 @@ Variants {
 				PanelBg {
 					id: osdBg
 
-					deformAmount: 0.25
+					deformAmount: 0.1
-					panel: panels.osd
+					implicitHeight: panels.osd.height
+					implicitWidth: panels.osd.width
+					panel: panels.osdWrapper
 					radius: 20
+					x: panels.osdWrapper.x + panels.osd.x + Config.barConfig.border
+					y: panels.osdWrapper.y + panels.osd.y + bar.implicitHeight
 				}
 
 				PanelBg {
@@ -210,7 +250,7 @@ Variants {
 				PanelBg {
 					id: utilsBg
 
-					deformAmount: panels.sidebar.visible ? 0.1 : 0.15
+					deformAmount: panels.sidebar.visible ? (0.1) : (0.1)
 					exclude: panels.sidebar.offsetScale > 0.08 ? [] : [sidebarBg]
 					panel: panels.utilities
 					topLeftRadius: 0
@@ -219,34 +259,77 @@ Variants {
 				PanelBg {
 					id: popoutBg
 
-					deformAmount: 0.15
+					property real extraHeight: panels.popouts.isDetached ? 0 : 0.2
+
+					deformAmount: panels.popouts.isDetached ? 0.05 : panels.popouts.hasCurrent ? 0.15 : 0.1
+					implicitHeight: panels.popouts.height * (1 + extraHeight)
 					implicitWidth: panels.popouts.width
 					panel: panels.popoutsWrapper
+					radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : 20 * Appearance.rounding.scale
+					x: panels.popoutsWrapper.x + panels.popouts.x + Config.barConfig.border
+					y: panels.popoutsWrapper.y + panels.popouts.y + bar.implicitHeight - panels.popouts.height * extraHeight
+
+					Behavior on extraHeight {
+						Anim {
+						}
+					}
 				}
 
 				PanelBg {
 					id: resourcesBg
 
-					deformAmount: 0.15
+					deformAmount: 0.05
-					panel: panels.resources
+					implicitHeight: panels.resources.height
+					implicitWidth: panels.resources.width
+					panel: panels.resourcesWrapper
 					radius: Appearance.rounding.normal
+					x: panels.resourcesWrapper.x + panels.resources.x + Config.barConfig.border
+					y: panels.resourcesWrapper.y + panels.resources.y + bar.implicitHeight
 				}
 
 				PanelBg {
 					id: settingsBg
 
-					deformAmount: 0.05
+					property real extraHeight: 0.2
+
+					deformAmount: 0.03
+					implicitHeight: panels.settings.height * (1 + extraHeight)
+					implicitWidth: panels.settings.width
 					panel: panels.settings
 					radius: Appearance.rounding.large
+					topLeftRadius: Appearance.rounding.large + Appearance.padding.smaller
+					topRightRadius: Appearance.rounding.large + Appearance.padding.smaller
+					x: panels.settingsWrapper.x + panels.settings.x + Config.barConfig.border
+					y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight - panels.settings.height * extraHeight
 				}
 
 				PanelBg {
 					id: dockBg
 
-					deformAmount: 0.1
+					deformAmount: 0.08
 					panel: panels.dock
 					radius: Appearance.rounding.normal
 				}
+
+				PanelBg {
+					id: drawingBg
+
+					deformAmount: 0.08
+					panel: panels.drawing
+					radius: Appearance.rounding.normal
+				}
+
+				Repeater {
+					model: panels.traySubmenus.children
+
+					PanelBg {
+						required property Item modelData
+
+						deformAmount: 0.1
+						panel: modelData
+						radius: 20 * Appearance.rounding.scale
+					}
+				}
 			}
 
 			Drawing {
@@ -338,8 +421,8 @@ Variants {
 		property real deformAmount: 0.15
 		required property Item panel
 
-		deformScale: deformAmount / 10000
+		deformScale: (deformAmount * Config.appearance.deform.scale) / 10000
-		group: panel.width > 0 && panel.height > 0 ? blobGroup : null
+		group: blobGroup
 		implicitHeight: panel.height
 		implicitWidth: panel.width
 		radius: Appearance.rounding.smallest

Greeter/Helpers/SystemUsage.qml

@@ -346,7 +346,6 @@ Singleton {
 
 		stdout: StdioCollector {
 			onStreamFinished: {
-				console.log("this is running");
 				if (root.gpuType === "GENERIC") {
 					const percs = text.trim().split("\n");
 					const sum = percs.reduce((acc, d) => acc + parseInt(d, 10), 0);

Greeter/Helpers/Users.qml

@@ -7,23 +7,30 @@ import QtQuick
 Singleton {
 	id: root
 
-	// The list of users that can log in graphically
+	readonly property string defaultUserFile: "/etc/zshell-greeter/default-user"
-	// Each user object has: username, uid, home, shell, gecos (full name), face (avatar path)
+	property int selectedIndex: 0
+	readonly property var selectedUser: selectedIndex >= 0 && selectedIndex < users.length ? users[selectedIndex] : null
+	readonly property string selectedUsername: selectedUser ? selectedUser.username : ""
 	property var users: []
 
-	// The currently selected user index
+	function saveDefaultUser(): void {
-	property int selectedIndex: 0
+		if (selectedUser) {
+			defaultUserStorage.setText(selectedUser.username);
+		}
+	}
 
-	// The currently selected user object (or null if none)
+	function selectNext(): void {
-	readonly property var selectedUser: selectedIndex >= 0 && selectedIndex < users.length ? users[selectedIndex] : null
+		if (users.length === 0)
+			return;
+		selectedIndex = (selectedIndex + 1) % users.length;
+	}
 
-	// Convenience property for the selected username
+	function selectPrevious(): void {
-	readonly property string selectedUsername: selectedUser ? selectedUser.username : ""
+		if (users.length === 0)
+			return;
+		selectedIndex = (selectedIndex - 1 + users.length) % users.length;
+	}
 
-	// Path to store the default user preference
-	readonly property string defaultUserFile: "/etc/zshell-greeter/default-user"
-
-	// Select a user by username
 	function selectUser(username: string): bool {
 		for (let i = 0; i < users.length; i++) {
 			if (users[i].username === username) {
@@ -34,28 +41,6 @@ Singleton {
 		return false;
 	}
 
-	// Select the next user in the list (wraps around)
-	function selectNext(): void {
-		if (users.length === 0)
-			return;
-		selectedIndex = (selectedIndex + 1) % users.length;
-	}
-
-	// Select the previous user in the list (wraps around)
-	function selectPrevious(): void {
-		if (users.length === 0)
-			return;
-		selectedIndex = (selectedIndex - 1 + users.length) % users.length;
-	}
-
-	// Save the current user as the default for next login
-	function saveDefaultUser(): void {
-		if (selectedUser) {
-			defaultUserStorage.setText(selectedUser.username);
-		}
-	}
-
-	// Process to fetch the list of graphical users
 	Process {
 		id: userLister
 
@@ -67,13 +52,10 @@ Singleton {
 				try {
 					root.users = JSON.parse(text);
 
-					// If we have users and no selection yet, try to select the default user
 					if (root.users.length > 0) {
-						// Try to load the default user
 						if (defaultUserStorage.loaded) {
 							const defaultUsername = defaultUserStorage.text().trim();
 							if (defaultUsername && !root.selectUser(defaultUsername)) {
-								// Default user not found, select first user
 								root.selectedIndex = 0;
 							}
 						} else {
@@ -87,15 +69,14 @@ Singleton {
 		}
 	}
 
-	// FileView for persisting the default user
 	FileView {
 		id: defaultUserStorage
 
 		path: root.defaultUserFile
 		preload: true
 
+		onLoadFailed: {}
 		onLoaded: {
-			// If users are already loaded, try to select the default user
 			if (root.users.length > 0) {
 				const defaultUsername = text().trim();
 				if (defaultUsername) {
@@ -103,10 +84,5 @@ Singleton {
 				}
 			}
 		}
-
-		onLoadFailed: {
-			// File doesn't exist yet, that's fine - we'll create it on first save
-			console.log("No default user file found, will use first user");
-		}
 	}
 }

Helpers/GameMode.qml

@@ -0,0 +1,72 @@
+pragma Singleton
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import ZShell
+import qs.Config
+
+Singleton {
+	id: root
+
+	property alias enabled: props.enabled
+
+	function setHyprConf(): void {
+		Hypr.extras.applyOptions({
+			"animations.enabled": 0,
+			"decoration.shadow.enabled": 0,
+			"decoration.blur.enabled": 0,
+			"general.border_size": 0,
+			"decoration.rounding": 0
+		});
+	}
+
+	onEnabledChanged: {
+		if (enabled) {
+			setHyprConf();
+			if (Config.utilities.toasts.gameModeChanged)
+				Toaster.toast(qsTr("Game mode enabled"), qsTr("Disabled Hyprland animations, blur, shadows and corner radius"), "gamepad");
+		} else {
+			Hypr.extras.message("reload");
+			if (Config.utilities.toasts.gameModeChanged)
+				Toaster.toast(qsTr("Game mode disabled"), qsTr("Hyprland settings restored"), "gamepad");
+		}
+	}
+
+	PersistentProperties {
+		id: props
+
+		property bool enabled: Hypr.options["animations:enabled"] === 0
+
+		reloadableId: "gamemode"
+	}
+
+	Connections {
+		function onConfigReloaded(): void {
+			if (props.enabled)
+				root.setHyprConf();
+		}
+
+		target: Hypr
+	}
+
+	IpcHandler {
+		function disable(): void {
+			props.enabled = false;
+		}
+
+		function enable(): void {
+			props.enabled = true;
+		}
+
+		function isEnabled(): bool {
+			return props.enabled;
+		}
+
+		function toggle(): void {
+			props.enabled = !props.enabled;
+		}
+
+		target: "gameMode"
+	}
+}

Helpers/Network.qml

@@ -1,11 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import Quickshell.Networking
-
-Singleton {
-	id: root
-
-	property NetworkDevice activeDevice: devices.find(d => d.connected)
-	property list<NetworkDevice> devices: Networking.devices.values
-}

Helpers/Picker.qml

@@ -66,7 +66,8 @@ MouseArea {
 
 	function save(): void {
 		const tmpfile = Qt.resolvedUrl(`/tmp/zshell-picker-${Quickshell.processId}-${Date.now()}.png`);
-		ZShellIo.saveItem(screencopy, tmpfile, Qt.rect(Math.ceil(rsx), Math.ceil(rsy), Math.floor(sw), Math.floor(sh)), path => Quickshell.execDetached(["swappy", "-f", path]));
+		const cmd = Config.screenshot.enable_pp ? ["zshell-img-tools", "--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/Recorder.qml

@@ -0,0 +1,41 @@
+// pragma Singleton
+//
+// import Quickshell
+// import QtQuick
+//
+// Singleton {
+// 	id: root
+//
+// 	function start(extraArgs = []): void {
+// 		needsStart = true;
+// 		startArgs = extraArgs;
+// 		checkProc.running = true;
+// 	}
+//
+// 	PersistentProperties {
+// 		id: props
+//
+// 		property real elapsed: 0
+// 		property bool paused: false
+// 		property bool running: false
+//
+// 		reloadableId: "recorder"
+// 	}
+//
+// 	Process {
+// 		id: checkProc
+//
+// 		command: ["pidof", "gpu-screen-recorder"]
+// 		running: true
+//
+// 		onExited: code => {
+// 			props.running = code === 0;
+//
+// 			if (code === 0) {
+// 				if (root.needsStop) {
+// 					Quickshell.execDetached(["zshell-cli"]);
+// 				}
+// 			}
+// 		}
+// 	}
+// }

Helpers/Time.qml

@@ -1,18 +1,23 @@
 pragma Singleton
 
 import Quickshell
+import QtQuick
+import qs.Config
 
 Singleton {
-	readonly property string amPmStr: timeComponents[2] ?? ""
+	id: root
+
 	readonly property date date: clock.date
+	readonly property string dateStr: format(Config.general.dateFormat)
 	property alias enabled: clock.enabled
 	readonly property string hourStr: timeComponents[0] ?? ""
 	readonly property int hours: clock.hours
 	readonly property string minuteStr: timeComponents[1] ?? ""
 	readonly property int minutes: clock.minutes
+	readonly property string secondStr: timeComponents[2] ?? ""
 	readonly property int seconds: clock.seconds
 	readonly property list<string> timeComponents: timeStr.split(":")
-	readonly property string timeStr: format("hh:mm")
+	readonly property string timeStr: format("hh:mm:ss")
 
 	function format(fmt: string): string {
 		return Qt.formatDateTime(clock.date, fmt);

Helpers/Updates.qml

@@ -11,10 +11,13 @@ Singleton {
 	id: root
 
 	property int availableUpdates: 0
+	property string cmd: ""
 	property bool commandReady
 	property bool loaded
 	property double now: Date.now()
 	property var updates: ({})
+	property bool updating
+	property string updatingPackage: ""
 
 	function formatUpdateTime(timestamp) {
 		const diffMs = root.now - timestamp;
@@ -34,6 +37,22 @@ Singleton {
 		return Qt.formatDateTime(new Date(timestamp), "dd hh:mm");
 	}
 
+	function performPackageUpdate(pkg: string): void {
+		if (root.cmd === "pacman")
+			pkgUpdateProc.command = ["pkexec", root.cmd, "--noconfirm", "-Sy", pkg];
+		else
+			pkgUpdateProc.command = [root.cmd, "--noconfirm", "--sudo", "pkexec", "-Sy", pkg];
+		pkgUpdateProc.running = true;
+	}
+
+	function performSystemUpdate(): void {
+		if (root.cmd === "pacman")
+			sysUpdateProc.command = ["pkexec", root.cmd, "--noconfirm", "-Syu"];
+		else
+			sysUpdateProc.command = [root.cmd, "--noconfirm", "--sudo", "pkexec", "-Syu"];
+		sysUpdateProc.running = true;
+	}
+
 	onUpdatesChanged: {
 		if (!root.loaded)
 			return;
@@ -92,6 +111,28 @@ Singleton {
 		}
 	}
 
+	Process {
+		id: updateCmdDetect
+
+		command: ["sh", "-c", "command -v yay || command -v paru"]
+		running: true
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				const cmd = this.text.trim();
+				let helper;
+
+				if (cmd.length > 0) {
+					helper = cmd.split("/").pop();
+				} else {
+					helper = "pacman";
+				}
+
+				root.cmd = helper;
+			}
+		}
+	}
+
 	Process {
 		id: updatesProc
 
@@ -115,6 +156,44 @@ Singleton {
 		}
 	}
 
+	Process {
+		id: sysUpdateProc
+
+		command: []
+		running: false
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				root.updating = false;
+			}
+		}
+
+		onRunningChanged: {
+			if (running)
+				root.updating = true;
+		}
+	}
+
+	Process {
+		id: pkgUpdateProc
+
+		command: []
+		running: false
+
+		stdout: StdioCollector {
+			onStreamFinished: {
+				root.updating = false;
+			}
+		}
+
+		onRunningChanged: {
+			if (running) {
+				root.updatingPackage = command[command.length - 1];
+				root.updating = true;
+			}
+		}
+	}
+
 	Timer {
 		id: saveTimer
 

Helpers/Wallpapers.qml

@@ -14,6 +14,7 @@ Searcher {
 	property string actualCurrent: WallpaperPath.currentWallpaperPath
 	readonly property string current: showPreview ? previewPath : actualCurrent
 	property string previewPath
+	property bool recentlyChanged
 	property bool showPreview: false
 
 	function preview(path: string): void {

Modules/ClipWrapper.qml

@@ -17,12 +17,16 @@ Item {
 	implicitWidth: content.implicitWidth
 	visible: width > 0 && height > 0
 	x: {
-		const off = content.currentCenter - content.nonAnimWidth / 2;
+		if (content.isDetached)
+			return (parent.width - content.nonAnimWidth) / 2;
+
+		const off = content.currentCenter - Config.barConfig.border - content.nonAnimWidth / 2;
 		const diff = parent.width - Math.floor(off + content.nonAnimWidth);
 		if (diff < 0)
 			return off + diff;
 		return Math.floor(Math.max(off, 0));
 	}
+	y: content.isDetached ? (parent.height - content.nonAnimHeight) / 2 : 0
 
 	Behavior on offsetScale {
 		Anim {

Modules/Clock.qml

@@ -3,7 +3,7 @@ import QtQuick
 import QtQuick.Layouts
 import qs.Config
 import qs.Modules
-import qs.Helpers as Helpers
+import qs.Helpers
 import qs.Components
 
 CustomRect {
@@ -23,6 +23,7 @@ CustomRect {
 
 		anchors.centerIn: parent
 		color: root.visibilities.dashboard ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+		font: Appearance.font.family.mono
 		text: Time.dateStr
 
 		Behavior on color {

Modules/Content.qml

@@ -16,6 +16,7 @@ Item {
 	readonly property Item current: currentPopout?.item ?? null
 	readonly property Popout currentPopout: content.children.find(c => c.shouldBeActive) ?? null
 	required property PopoutState popouts
+	required property ShellScreen screen
 
 	implicitHeight: (currentPopout?.implicitHeight ?? 0) + 5 * 2
 	implicitWidth: (currentPopout?.implicitWidth ?? 0) + 5 * 2
@@ -63,6 +64,7 @@ Item {
 
 					TrayMenuPopout {
 						popouts: root.popouts
+						screen: root.screen
 						trayItem: trayMenu.modelData.menu
 					}
 				}
@@ -101,6 +103,9 @@ Item {
 		readonly property bool shouldBeActive: root.popouts.currentName === name
 
 		active: false
+		// anchors.horizontalCenter: parent.horizontalCenter
+		// anchors.top: parent.top
+		// anchors.topMargin: 5
 		anchors.centerIn: parent
 		opacity: 0
 		scale: 0.8

Modules/DashWidget.qml

@@ -1,31 +0,0 @@
-import Quickshell
-import QtQuick
-import qs.Config
-import qs.Helpers
-import qs.Components
-
-CustomRect {
-	id: root
-
-	required property PersistentProperties visibilities
-
-	anchors.bottom: parent.bottom
-	anchors.bottomMargin: 6
-	anchors.top: parent.top
-	anchors.topMargin: 6
-	color: DynamicColors.tPalette.m3surfaceContainer
-	implicitWidth: 40
-	radius: Appearance.rounding.full
-
-	StateLayer {
-		onClicked: {
-			root.visibilities.dashboard = !root.visibilities.dashboard;
-		}
-	}
-
-	MaterialIcon {
-		anchors.centerIn: parent
-		color: DynamicColors.palette.m3onSurface
-		text: "widgets"
-	}
-}

Modules/Dashboard/Wrapper.qml

@@ -15,78 +15,25 @@ Item {
 		reloadableId: "dashboardState"
 	}
 	readonly property real nonAnimHeight: state === "visible" ? (content.item?.nonAnimHeight ?? 0) : 0
+	required property real offsetScale
+	readonly property bool shouldBeActive: root.visibilities.dashboard && Config.dashboard.enabled
 	required property PersistentProperties visibilities
 
-	implicitHeight: 0
+	implicitHeight: content.implicitHeight
-	implicitWidth: content.implicitWidth
+	implicitWidth: content.implicitWidth || 854 // Hard coded fallback for first open
-	visible: height > 0
+	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
-	states: State {
+	Loader {
-		name: "visible"
+		id: content
-		when: root.visibilities.dashboard && Config.dashboard.enabled
 
-		PropertyChanges {
+		active: root.shouldBeActive || root.visible
-			root.implicitHeight: content.implicitHeight
+		anchors.bottom: parent.bottom
-		}
+		anchors.horizontalCenter: parent.horizontalCenter
-	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
 
-			Anim {
+		sourceComponent: Content {
-				duration: MaterialEasing.expressiveEffectsTime
+			state: root.dashState
-				easing.bezierCurve: MaterialEasing.expressiveEffects
+			visibilities: root.visibilities
-				property: "implicitHeight"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		}
-	]
-
-	onStateChanged: {
-		if (state === "visible" && timer.running) {
-			timer.triggered();
-			timer.stop();
-		}
-	}
-
-	Timer {
-		id: timer
-
-		interval: Appearance.anim.durations.extraLarge
-		running: true
-
-		onTriggered: {
-			content.active = Qt.binding(() => (root.visibilities.dashboard && Config.dashboard.enabled) || root.visible);
-			content.visible = true;
-		}
-	}
-
-	CustomClippingRect {
-		anchors.fill: parent
-
-		Loader {
-			id: content
-
-			active: true
-			anchors.bottom: parent.bottom
-			anchors.horizontalCenter: parent.horizontalCenter
-			visible: false
-
-			sourceComponent: Content {
-				state: root.dashState
-				visibilities: root.visibilities
-			}
 		}
 	}
 }

Modules/Dock/Wrapper.qml

@@ -11,97 +11,36 @@ Item {
 	property int contentHeight
 	required property var panels
 	required property ShellScreen screen
-	readonly property bool shouldBeActive: visibilities.dock
 	required property PersistentProperties visibilities
 
-	implicitHeight: 0
+	readonly property bool shouldBeActive: visibilities.dock
-	implicitWidth: content.implicitWidth
+	property real offsetScale: shouldBeActive ? 0 : 1
-	visible: height > 0
 
-	Behavior on implicitWidth {
+	visible: offsetScale < 1
+	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
+	implicitHeight: content.implicitHeight
+	implicitWidth: content.implicitWidth || 400
+	opacity: 1 - offsetScale
+
+	Behavior on offsetScale {
 		Anim {
-			duration: Appearance.anim.durations.small
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-		}
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-	}
-
-	onShouldBeActiveChanged: {
-		if (shouldBeActive) {
-			timer.stop();
-			hideAnim.stop();
-			showAnim.start();
-		} else {
-			showAnim.stop();
-			hideAnim.start();
-		}
-	}
-
-	SequentialAnimation {
-		id: showAnim
-
-		Anim {
-			duration: Appearance.anim.durations.small
-			easing.bezierCurve: Appearance.anim.curves.expressiveEffects
-			property: "implicitHeight"
-			target: root
-			to: root.contentHeight
-		}
-
-		ScriptAction {
-			script: root.implicitHeight = Qt.binding(() => content.implicitHeight)
-		}
-	}
-
-	SequentialAnimation {
-		id: hideAnim
-
-		ScriptAction {
-			script: root.implicitHeight = root.implicitHeight
-		}
-
-		Anim {
-			easing.bezierCurve: Appearance.anim.curves.expressiveEffects
-			property: "implicitHeight"
-			target: root
-			to: 0
-		}
-	}
-
-	Timer {
-		id: timer
-
-		interval: Appearance.anim.durations.small
-
-		onRunningChanged: {
-			if (running && !root.shouldBeActive) {
-				content.visible = false;
-				content.active = true;
-			} else {
-				content.active = Qt.binding(() => root.shouldBeActive || root.visible);
-				content.visible = true;
-				if (showAnim.running) {
-					showAnim.stop();
-					showAnim.start();
-				}
-			}
 		}
 	}
 
 	Loader {
 		id: content
 
-		active: false
 		anchors.left: parent.left
 		anchors.top: parent.top
-		visible: false
+
+		active: root.shouldBeActive || root.visible
 
 		sourceComponent: Content {
 			panels: root.panels
 			screen: root.screen
 			visibilities: root.visibilities
-
-			Component.onCompleted: root.contentHeight = implicitHeight
 		}
-
-		Component.onCompleted: timer.start()
 	}
 }

Modules/Drawing/Wrapper.qml

@@ -12,90 +12,29 @@ Item {
 
 	required property Canvas drawing
 	property bool expanded: true
+	property real offsetScale: shouldBeActive ? 0 : 1
 	required property ShellScreen screen
 	readonly property bool shouldBeActive: visibilities.isDrawing
 	required property var visibilities
 
+	anchors.leftMargin: (-implicitWidth - 5) * offsetScale
 	implicitHeight: content.implicitHeight
-	implicitWidth: 0
+	implicitWidth: root.expanded ? content.implicitWidth : icon.implicitWidth
-	visible: width > 0
+	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
-	states: [
+	Behavior on implicitWidth {
-		State {
+		Anim {
-			name: "hidden"
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-			when: !root.shouldBeActive
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-
-			PropertyChanges {
-				root.implicitWidth: 0
-			}
-
-			PropertyChanges {
-				icon.opacity: 0
-			}
-
-			PropertyChanges {
-				content.opacity: 0
-			}
-		},
-		State {
-			name: "collapsed"
-			when: root.shouldBeActive && !root.expanded
-
-			PropertyChanges {
-				root.implicitWidth: icon.implicitWidth
-			}
-
-			PropertyChanges {
-				icon.opacity: 1
-			}
-
-			PropertyChanges {
-				content.opacity: 0
-			}
-		},
-		State {
-			name: "visible"
-			when: root.shouldBeActive && root.expanded
-
-			PropertyChanges {
-				root.implicitWidth: content.implicitWidth
-			}
-
-			PropertyChanges {
-				icon.opacity: 0
-			}
-
-			PropertyChanges {
-				content.opacity: 1
-			}
 		}
-	]
+	}
-	transitions: [
+	Behavior on offsetScale {
-		Transition {
+		Anim {
-			from: "*"
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-			to: "*"
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-
-			ParallelAnimation {
-				Anim {
-					easing.bezierCurve: MaterialEasing.expressiveEffects
-					property: "implicitWidth"
-					target: root
-				}
-
-				Anim {
-					duration: Appearance.anim.durations.small
-					property: "opacity"
-					target: icon
-				}
-
-				Anim {
-					duration: Appearance.anim.durations.small
-					property: "opacity"
-					target: content
-				}
-			}
 		}
-	]
+	}
 
 	onVisibleChanged: {
 		if (!visible)
@@ -109,8 +48,12 @@ Item {
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
 		height: content.contentItem.height
-		opacity: 1
+		opacity: root.expanded ? 0 : 1
 
+		Behavior on opacity {
+			Anim {
+			}
+		}
 		sourceComponent: MaterialIcon {
 			font.pointSize: Appearance.font.size.larger
 			text: "arrow_forward_ios"
@@ -122,7 +65,12 @@ Item {
 
 		anchors.right: parent.right
 		anchors.verticalCenter: parent.verticalCenter
+		opacity: root.expanded ? 1 : 0
 
+		Behavior on opacity {
+			Anim {
+			}
+		}
 		sourceComponent: Content {
 			drawing: root.drawing
 			visibilities: root.visibilities

Modules/Launcher/Services/Apps.qml

@@ -9,17 +9,19 @@ import qs.Paths
 Searcher {
 	id: root
 
+	readonly property list<string> command: Config.launcher.uwsm ? ["app2unit", "--"] : []
+
 	function launch(entry: DesktopEntry): void {
 		appDb.incrementFrequency(entry.id);
 
 		if (entry.runInTerminal)
 			Quickshell.execDetached({
-				command: ["app2unit", "--", ...Config.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command],
+				command: [...root.command, ...Config.general.apps.terminal, `${Quickshell.shellDir}/assets/wrap_term_launch.sh`, ...entry.command],
 				workingDirectory: entry.workingDirectory
 			});
 		else
 			Quickshell.execDetached({
-				command: ["app2unit", "--", ...entry.command],
+				command: [...root.command, ...entry.command],
 				workingDirectory: entry.workingDirectory
 			});
 	}

Modules/Launcher/Services/SchemeVariants.qml

@@ -26,7 +26,7 @@ Searcher {
 			description: qsTr("Pastel palette with a low chroma.")
 			icon: "android"
 			name: qsTr("Tonal Spot")
-			variant: "tonalspot"
+			variant: "tonal-spot"
 		},
 		Variant {
 			description: qsTr("Hue-shifted, artistic or playful colors.")

Modules/Launcher/Wrapper.qml

@@ -21,55 +21,33 @@ Item {
 	}
 	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
 
-	implicitHeight: 0
-	implicitWidth: content.implicitWidth
-	visible: height > 0
-
-	onMaxHeightChanged: timer.start()
 	onShouldBeActiveChanged: {
 		if (shouldBeActive) {
+			implicitHeight = Qt.binding(() => content.implicitHeight);
 			timer.stop();
-			hideAnim.stop();
-			showAnim.start();
 		} else {
-			showAnim.stop();
+			implicitHeight = implicitHeight;
-			hideAnim.start();
 		}
 	}
 
-	SequentialAnimation {
+	visible: offsetScale < 1
-		id: showAnim
+	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
+	implicitHeight: content.implicitHeight
+	implicitWidth: content.implicitWidth || 400
+	opacity: 1 - offsetScale
 
+	Behavior on offsetScale {
 		Anim {
-			duration: Appearance.anim.durations.small
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-			easing.bezierCurve: Appearance.anim.curves.expressiveEffects
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-			property: "implicitHeight"
-			target: root
-			to: root.contentHeight
-		}
-
-		ScriptAction {
-			script: root.implicitHeight = Qt.binding(() => content.implicitHeight)
 		}
 	}
 
-	SequentialAnimation {
+	onMaxHeightChanged: timer.start()
-		id: hideAnim
-
-		ScriptAction {
-			script: root.implicitHeight = root.implicitHeight
-		}
-
-		Anim {
-			easing.bezierCurve: Appearance.anim.curves.expressiveEffects
-			property: "implicitHeight"
-			target: root
-			to: 0
-		}
-	}
 
 	Connections {
 		function onEnabledChanged(): void {
@@ -105,10 +83,6 @@ Item {
 				root.contentHeight = Math.min(root.maxHeight, content.implicitHeight);
 				content.active = Qt.binding(() => root.shouldBeActive || root.visible);
 				content.visible = true;
-				if (showAnim.running) {
-					showAnim.stop();
-					showAnim.start();
-				}
 			}
 		}
 	}
@@ -119,7 +93,6 @@ Item {
 		active: false
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.top: parent.top
-		visible: false
 
 		sourceComponent: Content {
 			maxHeight: root.maxHeight

Modules/Lock/IdleMonitors.qml

@@ -8,21 +8,25 @@ import qs.Helpers
 Scope {
 	id: root
 
+	readonly property bool enabled: !Players.list.some(p => p.isPlaying)
 	required property Lock lock
-	readonly property bool enabled: !Players.list.some( p => p.isPlaying )
 
-	function handleIdleAction( action: var ): void {
+	function handleIdleAction(action: var): void {
-		if ( !action )
+		if (!action)
 			return;
 
-		if ( action === "lock" )
+		if (action === "lock")
 			lock.lock.locked = true;
-		else if ( action === "unlock" )
+		else if (action === "unlock")
 			lock.lock.locked = false;
-		else if ( typeof action === "string" )
+		else if (action === "dpms on")
-			Hypr.dispatch( action );
+			Hypr.dispatch('hl.dsp.dpms({ action = "enable" })');
+		else if (action === "dpms off")
+			Hypr.dispatch('hl.dsp.dpms({ action = "disable" })');
+		else if (typeof action === "string")
+			Hypr.dispatch(action);
 		else
-			Quickshell.execDetached( action );
+			Quickshell.execDetached(action);
 	}
 
 	Variants {
@@ -33,7 +37,8 @@ Scope {
 
 			enabled: root.enabled && modelData.timeout > 0 ? true : false
 			timeout: modelData.timeout
-			onIsIdleChanged: root.handleIdleAction( isIdle ? modelData.idleAction : modelData.activeAction )
+
+			onIsIdleChanged: root.handleIdleAction(isIdle ? modelData.idleAction : modelData.activeAction)
 		}
 	}
 }

Modules/Lock/LockSurface.qml

@@ -150,6 +150,7 @@ WlSessionLockSurface {
 		id: background
 
 		anchors.fill: parent
+		fillMode: Image.PreserveAspectCrop
 		source: WallpaperPath.lockscreenBg
 	}
 

Modules/Lock/NotifGroup.qml

@@ -284,6 +284,8 @@ CustomRect {
 		Layout.fillWidth: true
 		color: root.urgency === "critical" ? DynamicColors.palette.m3onSecondaryContainer : DynamicColors.palette.m3onSurface
 		text: {
+			if (!Config.lock.showNotifContent)
+				return "Unlock to view";
 			const summary = modelData.summary.replace(/\n/g, " ");
 			const body = modelData.body.replace(/\n/g, " ");
 			const color = root.urgency === "critical" ? DynamicColors.palette.m3secondary : DynamicColors.palette.m3outline;

Modules/Notifications/Content.qml

@@ -25,6 +25,9 @@ Item {
 			height += list.itemAtIndex(i)?.nonAnimHeight ?? 0;
 
 		if (visibilities && panels) {
+			if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x || visibilities.dashboard)
+				return 0;
+
 			if (visibilities.osd) {
 				const h = panels.osd.y - 8 * 2 - padding * 2;
 				if (height > h)
@@ -194,8 +197,7 @@ Item {
 	}
 
 	component Anim: NumberAnimation {
-		duration: MaterialEasing.expressiveEffectsTime
+		duration: Appearance.anim.durations.expressiveDefaultSpatial
-		easing.bezierCurve: MaterialEasing.expressiveEffects
+		easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		easing.type: Easing.BezierSpline
 	}
 }

Modules/Notifications/Sidebar/NotifDockList.qml

@@ -78,6 +78,10 @@ LazyListView {
 				}
 			}
 
+			onDoubleClicked: event => {
+				if (event.button === Qt.LeftButton)
+					notifInner.toggleExpand(!notifInner.expanded);
+			}
 			onPositionChanged: event => {
 				if (pressed) {
 					const diffY = event.y - startY;

Modules/Notifications/Sidebar/NotifGroupList.qml

@@ -79,6 +79,10 @@ LazyListView {
 
 			Component.onCompleted: modelData?.lock(this)
 			Component.onDestruction: modelData?.unlock(this)
+			onDoubleClicked: event => {
+				if (event.button === Qt.LeftButton)
+					root.requestToggleExpand(!root.expanded);
+			}
 			onPositionChanged: event => {
 				if (pressed && !root.expanded) {
 					const diffY = event.y - startY;

Modules/Notifications/Sidebar/Utils/Cards/Toggles.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts
 import qs.Components
 import qs.Config
 import qs.Modules
+import qs.Helpers
 import qs.Daemons
 
 CustomRect {
@@ -32,7 +33,7 @@ CustomRect {
 			Toggle {
 				checked: Network.wifiEnabled
 				icon: Network.wifiEnabled ? "wifi" : "wifi_off"
-				visible: QSNetwork.Networking.devices.values.length > 0
+				visible: QSNetwork.Networking.devices.values.some(n => n.type === QSNetwork.DeviceType.Wifi)
 
 				onClicked: Network.toggleWifi()
 			}
@@ -79,6 +80,13 @@ CustomRect {
 						adapter.enabled = !adapter.enabled;
 				}
 			}
+
+			Toggle {
+				checked: GameMode.enabled
+				icon: GameMode.enabled ? "videogame_asset" : "videogame_asset_off"
+
+				onClicked: GameMode.enabled = !GameMode.enabled
+			}
 		}
 	}
 

Modules/Notifications/Sidebar/Utils/Wrapper.qml

@@ -20,69 +20,29 @@ Item {
 	required property Item sidebar
 	required property var visibilities
 
-	implicitHeight: 0
+	property real offsetScale: shouldBeActive ? 0 : 1
-	implicitWidth: sidebar.visible ? sidebar.width : Config.utilities.sizes.width
-	visible: height > 0
 
-	states: State {
+	visible: offsetScale < 1
-		name: "visible"
+	anchors.bottomMargin: (-implicitHeight - 5) * offsetScale
-		when: root.shouldBeActive
+	implicitHeight: content.implicitHeight + 8 * 2
+	implicitWidth: sidebar.width * (1 - sidebar.offsetScale)
+	opacity: 1 - offsetScale
 
-		PropertyChanges {
+	Behavior on offsetScale {
-			root.implicitHeight: content.implicitHeight + 8 * 2
+		Anim {
-		}
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-	}
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
-
-			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		}
-	]
-
-	onStateChanged: {
-		if (state === "visible" && timer.running) {
-			timer.triggered();
-			timer.stop();
-		}
-	}
-
-	Timer {
-		id: timer
-
-		interval: 1000
-		running: true
-
-		onTriggered: {
-			content.active = Qt.binding(() => root.shouldBeActive || root.visible);
-			content.visible = true;
 		}
 	}
 
 	Loader {
 		id: content
 
-		active: true
 		anchors.left: parent.left
 		anchors.margins: 8
 		anchors.top: parent.top
-		visible: false
+
+		active: root.shouldBeActive || root.visible
 
 		sourceComponent: Content {
 			implicitWidth: root.implicitWidth - 8 * 2

Modules/Notifications/Sidebar/Wrapper.qml

@@ -7,50 +7,29 @@ import QtQuick
 Item {
 	id: root
 
+	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	readonly property Props props: Props {
 	}
+	readonly property bool shouldBeActive: root.visibilities.sidebar && Config.sidebar.enabled
 	required property var visibilities
 
-	implicitWidth: 0
+	anchors.rightMargin: (-implicitWidth - 5) * offsetScale
-	visible: width > 0
+	implicitWidth: Config.sidebar.sizes.width
+	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
-	states: State {
+	Behavior on offsetScale {
-		name: "visible"
+		Anim {
-		when: root.visibilities.sidebar
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		PropertyChanges {
-			root.implicitWidth: Config.sidebar.sizes.width
 		}
 	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
-
-			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitWidth"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitWidth"
-				target: root
-			}
-		}
-	]
 
 	Loader {
 		id: content
 
-		active: true
+		active: root.shouldBeActive || root.visible
 		anchors.bottom: parent.bottom
 		anchors.bottomMargin: 0
 		anchors.left: parent.left
@@ -58,11 +37,9 @@ Item {
 		anchors.top: parent.top
 
 		sourceComponent: Content {
-			implicitWidth: Config.sidebar.sizes.width - 8 * 2
+			implicitWidth: Config.sidebar.sizes.width - Appearance.padding.smaller * 2
 			props: root.props
 			visibilities: root.visibilities
 		}
-
-		Component.onCompleted: active = Qt.binding(() => (root.visibilities.sidebar && Config.sidebar.enabled) || root.visible)
 	}
 }

Modules/Notifications/Wrapper.qml

@@ -6,29 +6,13 @@ Item {
 	id: root
 
 	required property Item panels
+	required property Item sidebarPanel
 	required property var visibilities
 
 	implicitHeight: content.implicitHeight
-	implicitWidth: Math.max(panels.sidebar.width, content.implicitWidth)
+	implicitWidth: Math.max(sidebarPanel.width * (1 - sidebarPanel.offsetScale), content.implicitWidth)
 	visible: height > 0
 
-	states: State {
-		name: "hidden"
-		when: root.visibilities.sidebar || root.visibilities.dashboard || (root.panels.popouts.hasCurrent && root.panels.popouts.currentName.startsWith("traymenu"))
-
-		PropertyChanges {
-			root.implicitHeight: 0
-		}
-	}
-	transitions: Transition {
-		Anim {
-			duration: MaterialEasing.expressiveEffectsTime
-			easing.bezierCurve: MaterialEasing.expressiveEffects
-			property: "implicitHeight"
-			target: root
-		}
-	}
-
 	Content {
 		id: content
 

Modules/Osd/Wrapper.qml

@@ -26,40 +26,22 @@ Item {
 		timer.restart();
 	}
 
+	property real offsetScale: shouldBeActive ? 0 : 1
+	required property bool sidebarOrSessionVisible
+	property real sidebarOffset: sidebarOrSessionVisible ? 12 : 0
+
+	visible: offsetScale < 1
+	anchors.rightMargin: (-implicitWidth - 5 - sidebarOffset) * offsetScale
+	implicitWidth: content.implicitWidth
 	implicitHeight: content.implicitHeight
-	implicitWidth: 0
+	opacity: 1 - offsetScale
-	visible: width > 0
 
-	states: State {
+	Behavior on offsetScale {
-		name: "visible"
+		Anim {
-		when: root.shouldBeActive
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		PropertyChanges {
-			root.implicitWidth: content.implicitWidth
 		}
 	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitWidth"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitWidth"
-				target: root
-			}
-		}
-	]
 
 	Component.onCompleted: {
 		volume = Audio.volume;
@@ -113,26 +95,22 @@ Item {
 		}
 	}
 
-	CustomClippingRect {
+	Loader {
-		anchors.fill: parent
+		id: content
 
-		Loader {
+		anchors.left: parent.left
-			id: content
+		anchors.verticalCenter: parent.verticalCenter
 
-			anchors.left: parent.left
+		active: root.shouldBeActive || root.visible
-			anchors.verticalCenter: parent.verticalCenter
 
-			sourceComponent: Content {
+		sourceComponent: Content {
-				brightness: root.brightness
+			brightness: root.brightness
-				monitor: root.monitor
+			monitor: root.monitor
-				muted: root.muted
+			muted: root.muted
-				sourceMuted: root.sourceMuted
+			sourceMuted: root.sourceMuted
-				sourceVolume: root.sourceVolume
+			sourceVolume: root.sourceVolume
-				visibilities: root.visibilities
+			visibilities: root.visibilities
-				volume: root.volume
+			volume: root.volume
-			}
-
-			Component.onCompleted: active = Qt.binding(() => root.shouldBeActive || root.visible)
 		}
 	}
 }

Modules/PopoutState.qml

@@ -1,8 +1,36 @@
 import QtQuick
 
 QtObject {
+	id: root
+
 	property string currentName
 	property bool hasCurrent
+	property var submenus: []
 
 	signal detachRequested(mode: string)
+
+	function clearSubmenus(): void {
+		submenus = [];
+	}
+
+	function closeSubmenus(level: int): void {
+		submenus = submenus.slice(0, level);
+	}
+
+	function pushSubmenu(level: int, handle: var, sourceItem: var, sourceWidth: int): void {
+		let newSubmenus = submenus.slice(0, level);
+		newSubmenus.push({
+			"handle": handle,
+			"sourceItem": sourceItem,
+			"sourceWidth": sourceWidth
+		});
+		submenus = newSubmenus;
+	}
+
+	onCurrentNameChanged: {
+		root.clearSubmenus();
+	}
+	onHasCurrentChanged: {
+		root.clearSubmenus();
+	}
 }

Modules/Resource.qml

@@ -60,10 +60,10 @@ RowLayout {
 			color: root.mainColor
 			implicitHeight: Math.ceil(root.percentage * parent.height)
 
-			Behavior on implicitHeight {
+			// Behavior on implicitHeight {
-				Anim {
+			// 	Anim {
-				}
+			// 	}
-			}
+			// }
 		}
 	}
 }

Modules/Resources.qml

@@ -17,7 +17,7 @@ CustomRect {
 	color: visibilities.resources ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
 	implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
 	implicitWidth: rowLayout.implicitWidth + Appearance.padding.normal * 2
-	radius: height / 2
+	radius: Appearance.rounding.full
 
 	StateLayer {
 		onClicked: root.visibilities.resources = !root.visibilities.resources

Modules/Resources/Wrapper.qml

@@ -9,78 +9,34 @@ Item {
 	id: root
 
 	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
 
-	implicitHeight: 0
+	anchors.topMargin: (-implicitHeight - 5) * offsetScale
-	implicitWidth: content.implicitWidth
+	clip: true
-	visible: height > 0
+	implicitHeight: content.implicitHeight
+	implicitWidth: content.implicitWidth || 854 // Hard coded fallback for first open
+	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
-	states: State {
+	Behavior on offsetScale {
-		name: "visible"
+		Anim {
-		when: root.visibilities.resources
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		PropertyChanges {
-			root.implicitHeight: content.implicitHeight
-		}
-	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
-
-			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		}
-	]
-
-	onStateChanged: {
-		if (state === "visible" && timer.running) {
-			timer.triggered();
-			timer.stop();
 		}
 	}
 
-	Timer {
+	Loader {
-		id: timer
+		id: content
 
-		interval: Appearance.anim.durations.extraLarge
+		active: root.shouldBeActive || root.visible
-		running: true
+		anchors.bottom: parent.bottom
+		anchors.horizontalCenter: parent.horizontalCenter
 
-		onTriggered: {
+		sourceComponent: Content {
-			content.active = Qt.binding(() => (root.visibilities.resources) || root.visible);
+			padding: Appearance.padding.normal
-			content.visible = true;
+			visibilities: root.visibilities
-		}
-	}
-
-	CustomClippingRect {
-		anchors.fill: parent
-
-		Loader {
-			id: content
-
-			active: true
-			anchors.bottom: parent.bottom
-			anchors.horizontalCenter: parent.horizontalCenter
-			visible: false
-
-			sourceComponent: Content {
-				padding: Appearance.padding.normal
-				visibilities: root.visibilities
-			}
 		}
 	}
 }

Modules/Settings/Categories.qml

@@ -104,6 +104,18 @@ Item {
 			key: "launcher"
 			name: "Launcher"
 		}
+
+		ListElement {
+			icon: "screenshot_region"
+			key: "screenshot"
+			name: "Screenshot"
+		}
+
+		ListElement {
+			icon: "cached"
+			key: "updates"
+			name: "Updates"
+		}
 	}
 
 	CustomClippingRect {
@@ -153,7 +165,7 @@ Item {
 		required property string name
 
 		implicitHeight: 42
-		implicitWidth: 200
+		implicitWidth: 250
 		radius: Appearance.rounding.normal - Appearance.padding.smaller
 
 		RowLayout {
@@ -171,9 +183,15 @@ Item {
 				Layout.fillHeight: true
 				Layout.preferredWidth: icon.contentWidth
 				color: categoryItem.index === clayout.currentIndex ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+				fill: categoryItem.index === clayout.currentIndex ? 1 : 0
 				font.pointSize: Appearance.font.size.small * 2
 				text: categoryItem.icon
 				verticalAlignment: Text.AlignVCenter
+
+				Behavior on fill {
+					Anim {
+					}
+				}
 			}
 
 			CustomText {

Modules/Settings/Categories/Appearance.qml

@@ -57,6 +57,16 @@ SettingsPage {
 			setting: "scale"
 			step: 0.1
 		}
+
+		Separator {
+		}
+
+		SettingSpinBox {
+			name: "Deform animation scale"
+			object: Config.appearance.deform
+			setting: "scale"
+			step: 0.1
+		}
 	}
 
 	SettingsSection {
@@ -66,7 +76,7 @@ SettingsPage {
 			name: "Fonts"
 		}
 
-		SettingInput {
+		SettingListView {
 			name: "Sans family"
 			object: Config.appearance.font.family
 			setting: "sans"
@@ -75,29 +85,11 @@ SettingsPage {
 		Separator {
 		}
 
-		SettingInput {
+		SettingListView {
 			name: "Monospace family"
 			object: Config.appearance.font.family
 			setting: "mono"
 		}
-
-		Separator {
-		}
-
-		SettingInput {
-			name: "Material family"
-			object: Config.appearance.font.family
-			setting: "material"
-		}
-
-		Separator {
-		}
-
-		SettingInput {
-			name: "Clock family"
-			object: Config.appearance.font.family
-			setting: "clock"
-		}
 	}
 
 	SettingsSection {
@@ -118,9 +110,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Session GIF speed"
 			max: 5
 			min: 0
+			name: "Session GIF speed"
 			object: Config.appearance.anim
 			setting: "sessionGifSpeed"
 			step: 0.1
@@ -144,9 +136,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Base opacity"
 			max: 1
 			min: 0
+			name: "Base opacity"
 			object: Config.appearance.transparency
 			setting: "base"
 			step: 0.05
@@ -156,9 +148,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Layer opacity"
 			max: 1
 			min: 0
+			name: "Layer opacity"
 			object: Config.appearance.transparency
 			setting: "layers"
 			step: 0.05

Modules/Settings/Categories/Background.qml

@@ -29,13 +29,13 @@ SettingsPage {
 			step: 50
 		}
 
-		// Separator {
+		Separator {
-		// }
+		}
-		//
+
-		// WallpaperCropper {
+		WallpaperCropper {
-		// 	Layout.fillWidth: true
+			Layout.fillWidth: true
-		// 	Layout.preferredHeight: 300
+			Layout.preferredHeight: 600
-		// }
+		}
 	}
 
 	SettingsSection {

Modules/Settings/Categories/Bar.qml

@@ -19,8 +19,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Height"
 			min: 1
+			name: "Height"
 			object: Config.barConfig
 			setting: "height"
 		}
@@ -29,8 +29,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Rounding"
 			min: 0
+			name: "Rounding"
 			object: Config.barConfig
 			setting: "rounding"
 		}
@@ -39,11 +39,21 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Border"
 			min: 0
+			name: "Border"
 			object: Config.barConfig
 			setting: "border"
 		}
+
+		Separator {
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Smoothing"
+			object: Config.barConfig
+			setting: "smoothing"
+		}
 	}
 
 	SettingsSection {
@@ -145,8 +155,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Dock height"
 			min: 1
+			name: "Dock height"
 			object: Config.dock
 			setting: "height"
 		}
@@ -173,8 +183,8 @@ SettingsPage {
 		}
 
 		SettingStringList {
-			name: "Pinned apps"
 			addLabel: qsTr("Add pinned app")
+			name: "Pinned apps"
 			object: Config.dock
 			setting: "pinnedApps"
 		}
@@ -183,8 +193,8 @@ SettingsPage {
 		}
 
 		SettingStringList {
-			name: "Ignored app regexes"
 			addLabel: qsTr("Add ignored regex")
+			name: "Ignored app regexes"
 			object: Config.dock
 			setting: "ignoredAppRegexes"
 		}

Modules/Settings/Categories/General.qml

@@ -47,6 +47,15 @@ SettingsPage {
 			object: Config.general
 			setting: "desktopIcons"
 		}
+
+		Separator {
+		}
+
+		SettingInput {
+			name: "Date format"
+			object: Config.general
+			setting: "dateFormat"
+		}
 	}
 
 	SettingsSection {
@@ -118,7 +127,7 @@ SettingsPage {
 				MenuItem {
 					icon: "gradient"
 					text: qsTr("Tonal spot")
-					value: "tonalSpot"
+					value: "tonal-spot"
 				},
 				MenuItem {
 					icon: "target"
@@ -138,7 +147,7 @@ SettingsPage {
 				MenuItem {
 					icon: "nutrition"
 					text: qsTr("Fruit salad")
-					value: "fruitSalad"
+					value: "fruit-salad"
 				}
 			]
 
@@ -146,12 +155,7 @@ SettingsPage {
 				Config.colors.schemeType = item.value;
 				Config.save();
 
-				if (item.value === "tonalSpot")
+				Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--scheme", item.value]);
-					Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--scheme", "tonal-spot"]);
-				else if (item.value === "fruitSalad")
-					Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--scheme", "fruit-salad"]);
-				else
-					Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--scheme", item.value]);
 			}
 		}
 

Modules/Settings/Categories/Launcher.qml

@@ -10,8 +10,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Max apps shown"
 			min: 1
+			name: "Max apps shown"
 			object: Config.launcher
 			setting: "maxAppsShown"
 		}
@@ -20,8 +20,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Max wallpapers shown"
 			min: 1
+			name: "Max wallpapers shown"
 			object: Config.launcher
 			setting: "maxWallpapers"
 		}
@@ -43,6 +43,15 @@ SettingsPage {
 			object: Config.launcher
 			setting: "specialPrefix"
 		}
+
+		Separator {
+		}
+
+		SettingSwitch {
+			name: "Use UWSM launch command"
+			object: Config.launcher
+			setting: "uwsm"
+		}
 	}
 
 	SettingsSection {
@@ -103,8 +112,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Item width"
 			min: 1
+			name: "Item width"
 			object: Config.launcher.sizes
 			setting: "itemWidth"
 		}
@@ -113,8 +122,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Item height"
 			min: 1
+			name: "Item height"
 			object: Config.launcher.sizes
 			setting: "itemHeight"
 		}
@@ -123,8 +132,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Wallpaper width"
 			min: 1
+			name: "Wallpaper width"
 			object: Config.launcher.sizes
 			setting: "wallpaperWidth"
 		}
@@ -133,8 +142,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Wallpaper height"
 			min: 1
+			name: "Wallpaper height"
 			object: Config.launcher.sizes
 			setting: "wallpaperHeight"
 		}

Modules/Settings/Categories/Lockscreen.qml

@@ -31,8 +31,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Max fingerprint tries"
 			min: 1
+			name: "Max fingerprint tries"
 			object: Config.lock
 			setting: "maxFprintTries"
 			step: 1
@@ -41,9 +41,18 @@ SettingsPage {
 		Separator {
 		}
 
+		SettingSwitch {
+			name: "Show notification details"
+			object: Config.lock
+			setting: "showNotifContent"
+		}
+
+		Separator {
+		}
+
 		SettingSpinBox {
-			name: "Blur amount"
 			min: 0
+			name: "Blur amount"
 			object: Config.lock
 			setting: "blurAmount"
 			step: 1
@@ -53,9 +62,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Height multiplier"
 			max: 2
 			min: 0.1
+			name: "Height multiplier"
 			object: Config.lock.sizes
 			setting: "heightMult"
 			step: 0.05
@@ -65,9 +74,9 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Aspect ratio"
 			max: 4
 			min: 0.5
+			name: "Aspect ratio"
 			object: Config.lock.sizes
 			setting: "ratio"
 			step: 0.05
@@ -77,8 +86,8 @@ SettingsPage {
 		}
 
 		SettingSpinBox {
-			name: "Center width"
 			min: 100
+			name: "Center width"
 			object: Config.lock.sizes
 			setting: "centerWidth"
 			step: 10

Modules/Settings/Categories/Lockscreen/Idle.qml

@@ -22,6 +22,13 @@ ColumnLayout {
 		Config.save();
 	}
 
+	function deleteTimeoutEntry(index) {
+		let list = [...Config.general.idle.timeouts];
+		list.splice(index, 1);
+		Config.general.idle.timeouts = list;
+		Config.save();
+	}
+
 	function updateTimeoutEntry(i, key, value) {
 		const list = [...Config.general.idle.timeouts];
 		let entry = list[i];
@@ -49,6 +56,9 @@ ColumnLayout {
 			onAddActiveActionRequested: {
 				root.updateTimeoutEntry(index, "activeAction", "");
 			}
+			onDeleteRequested: function (index) {
+				root.deleteTimeoutEntry(index);
+			}
 			onFieldEdited: function (key, value) {
 				root.updateTimeoutEntry(index, key, value);
 			}

Modules/Settings/Categories/Screenshot.qml

@@ -0,0 +1,130 @@
+import qs.Modules.Settings.Controls
+import qs.Config
+import qs.Components
+
+SettingsPage {
+	SettingsSection {
+		sectionId: "Screenshot"
+
+		SettingsHeader {
+			name: "Screenshot"
+		}
+
+		SettingSwitch {
+			name: "Enable effects"
+			object: Config.screenshot
+			setting: "enable_pp"
+		}
+
+		Separator {
+		}
+
+		CustomSplitButtonRow {
+			// active: true
+			label: qsTr("Effects mode")
+
+			menuItems: [
+				MenuItem {
+					icon: "build"
+					text: qsTr("Manual")
+					value: "manual"
+				},
+				MenuItem {
+					icon: "rotate_auto"
+					text: qsTr("Auto")
+					value: "auto"
+				}
+			]
+
+			onSelected: item => {
+				Config.screenshot.mode = item.value;
+				Config.save();
+			}
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Corner radius"
+			object: Config.screenshot
+			setting: "corner_radius"
+			step: 1
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSwitch {
+			name: "Enable drop shadow"
+			object: Config.screenshot
+			setting: "drop_shadow"
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSwitch {
+			name: "Enable rounded corners"
+			object: Config.screenshot
+			setting: "rounded_corners"
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Shadow blur radius"
+			object: Config.screenshot
+			setting: "shadow_blur_radius"
+			step: 1
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSwitch {
+			name: "Shadow color broken atm"
+			object: Config.Screenshot
+			setting: "shadow_color"
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Shadow offset X"
+			object: Config.screenshot
+			setting: "shadow_offset_x"
+			step: 1
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		Separator {
+			visible: Config.screenshot.mode === "manual"
+		}
+
+		SettingSpinBox {
+			min: 0
+			name: "Shadow offset Y"
+			object: Config.screenshot
+			setting: "shadow_offset_y"
+			step: 1
+			visible: Config.screenshot.mode === "manual"
+		}
+	}
+}

Modules/Settings/Categories/SystemUpdates.qml

@@ -0,0 +1,197 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick.Layouts
+import QtQuick
+import qs.Config
+import qs.Helpers
+import qs.Components
+import qs.Modules.Settings.Controls
+
+CustomClippingRect {
+	id: root
+
+	radius: Appearance.rounding.normal - Appearance.padding.smaller
+
+	ColumnLayout {
+		anchors.fill: parent
+
+		RowLayout {
+			Layout.fillWidth: true
+			Layout.margins: Appearance.padding.large
+			spacing: Appearance.spacing.large
+
+			MaterialIcon {
+				font.pointSize: Appearance.font.size.larger * 4
+				text: "update"
+			}
+
+			ColumnLayout {
+				CustomText {
+					font.pointSize: Appearance.font.size.large * 2
+					text: "System updates"
+				}
+
+				RowLayout {
+					id: row
+
+					Layout.fillWidth: true
+
+					CustomText {
+						id: text
+
+						Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+						Layout.fillWidth: true
+						font.pointSize: Appearance.font.size.larger
+						text: `${Updates.availableUpdates} available updates`
+					}
+
+					CustomRect {
+						Layout.preferredHeight: 40
+						Layout.preferredWidth: 150
+						color: Updates.updating ? DynamicColors.layer(DynamicColors.palette.m3outline, 2) : DynamicColors.palette.m3primary
+						radius: Appearance.rounding.full
+
+						RowLayout {
+							anchors.centerIn: parent
+
+							MaterialIcon {
+								animate: true
+								color: DynamicColors.palette.m3onPrimary
+								font.pointSize: Appearance.font.size.large
+								text: Updates.updating ? "update" : "download"
+							}
+
+							CustomText {
+								color: Updates.updating ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3onPrimary
+								text: "Update all"
+							}
+						}
+
+						StateLayer {
+							color: DynamicColors.palette.m3onPrimary
+							disabled: Updates.updating
+
+							onClicked: Updates.performSystemUpdate()
+						}
+					}
+				}
+			}
+		}
+
+		CustomListView {
+			id: view
+
+			readonly property int itemHeight: 50 + Appearance.padding.smaller * 2
+
+			Layout.fillHeight: true
+			Layout.fillWidth: true
+			clip: true
+			contentHeight: height
+			spacing: Appearance.spacing.normal
+
+			delegate: CustomRect {
+				id: update
+
+				required property var modelData
+				readonly property list<string> sections: modelData.update.split(" ")
+
+				color: DynamicColors.tPalette.m3surfaceContainer
+				implicitHeight: view.itemHeight
+				implicitWidth: parent.width
+				radius: Appearance.rounding.small - Appearance.padding.small
+
+				RowLayout {
+					anchors.fill: parent
+					anchors.leftMargin: Appearance.padding.smaller
+					anchors.rightMargin: Appearance.padding.smaller
+
+					MaterialIcon {
+						font.pointSize: Appearance.font.size.large * 2
+						text: "package_2"
+					}
+
+					ColumnLayout {
+						Layout.fillWidth: true
+
+						CustomText {
+							Layout.fillWidth: true
+							Layout.preferredHeight: 25
+							elide: Text.ElideRight
+							font.pointSize: Appearance.font.size.large
+							text: update.sections[0]
+						}
+
+						CustomText {
+							Layout.fillWidth: true
+							color: DynamicColors.palette.m3onSurfaceVariant
+							text: Updates.formatUpdateTime(update.modelData.timestamp)
+						}
+					}
+
+					RowLayout {
+						Layout.fillHeight: true
+						Layout.preferredWidth: 500
+
+						MarqueeText {
+							id: versionFrom
+
+							Layout.fillHeight: true
+							Layout.preferredWidth: 225
+							animate: true
+							color: DynamicColors.palette.m3tertiary
+							font.pointSize: Appearance.font.size.large
+							horizontalAlignment: Text.AlignHCenter
+							marqueeEnabled: true
+							pauseMs: 4000
+							text: update.sections[1]
+							width: 225
+						}
+
+						MaterialIcon {
+							Layout.fillHeight: true
+							color: DynamicColors.palette.m3secondary
+							font.pointSize: Appearance.font.size.extraLarge
+							horizontalAlignment: Text.AlignHCenter
+							text: "arrow_right_alt"
+							verticalAlignment: Text.AlignVCenter
+						}
+
+						MarqueeText {
+							id: versionTo
+
+							Layout.fillHeight: true
+							Layout.preferredWidth: 225
+							animate: true
+							color: DynamicColors.palette.m3primary
+							font.pointSize: Appearance.font.size.large
+							horizontalAlignment: Text.AlignHCenter
+							marqueeEnabled: true
+							pauseMs: 4000
+							text: update.sections[3]
+							width: 225
+						}
+					}
+
+					IconButton {
+						Layout.preferredHeight: width
+						icon: "download"
+
+						onClicked: {
+							Updates.performPackageUpdate(update.sections[0]);
+						}
+					}
+				}
+			}
+			model: ScriptModel {
+				id: script
+
+				objectProp: "update"
+				values: Object.entries(Updates.updates).sort((a, b) => b[1] - a[1]).map(([update, timestamp]) => ({
+							update,
+							timestamp
+						}))
+			}
+		}
+	}
+}

Modules/Settings/Content.qml

@@ -74,6 +74,10 @@ Item {
 				stack.push(osd);
 			else if (currentCategory === "launcher")
 				stack.push(launcher);
+			else if (currentCategory === "screenshot")
+				stack.push(screenshot);
+			else if (currentCategory === "updates")
+				stack.push(updates);
 		}
 
 		target: root
@@ -225,4 +229,18 @@ Item {
 		Cat.Launcher {
 		}
 	}
+
+	Component {
+		id: screenshot
+
+		Cat.Screenshot {
+		}
+	}
+
+	Component {
+		id: updates
+
+		Cat.SystemUpdates {
+		}
+	}
 }

Modules/Settings/Controls/SettingBarEntryList.qml

@@ -28,72 +28,11 @@ Item {
 	property int uidCounter: 0
 	property var visualEntries: []
 
-	function beginVisualDrag(uid, modelData, item) {
-		const pos = item.mapToItem(root, 0, 0);
-
-		root.draggedUid = uid;
-		root.draggedModelData = modelData;
-		root.dragHeight = item.height;
-		root.dragStartX = pos.x;
-		root.dragStartY = pos.y;
-		root.dragX = pos.x;
-		root.dragY = pos.y;
-		root.dragActive = true;
-		root.dropAnimating = false;
-		root.pendingCommitEntries = [];
-	}
-
-	function commitVisualOrder(entries) {
-		const list = [];
-
-		for (let i = 0; i < entries.length; i++)
-			list.push(entries[i].entry);
-
-		root.object[root.setting] = list;
-		Config.save();
-		root.rebuildVisualEntries();
-	}
-
-	function endVisualDrag() {
-		const entries = root.visualEntries.slice();
-		const finalIndex = root.indexForUid(root.draggedUid);
-		const finalItem = listView.itemAtIndex(finalIndex);
-
-		root.dragActive = false;
-
-		if (!finalItem) {
-			root.pendingCommitEntries = entries;
-			root.finishVisualDrag();
-			return;
-		}
-
-		const pos = finalItem.mapToItem(root, 0, 0);
-
-		root.pendingCommitEntries = entries;
-		root.dropAnimating = true;
-		settleX.to = pos.x;
-		settleY.to = pos.y;
-		settleAnim.start();
-	}
-
 	function ensureVisualEntries() {
 		if (!root.dragActive && !root.dropAnimating)
 			root.rebuildVisualEntries();
 	}
 
-	function finishVisualDrag() {
-		const entries = root.pendingCommitEntries.slice();
-
-		root.dragActive = false;
-		root.dropAnimating = false;
-		root.draggedUid = "";
-		root.draggedModelData = null;
-		root.pendingCommitEntries = [];
-		root.dragHeight = 0;
-
-		root.commitVisualOrder(entries);
-	}
-
 	function iconForId(id) {
 		switch (id) {
 		case "workspaces":
@@ -153,7 +92,7 @@ Item {
 		case "spacer":
 			return qsTr("Spacer");
 		case "activeWindow":
-			return qsTr("Active window");
+			return qsTr("Title");
 		case "tray":
 			return qsTr("Tray");
 		case "upower":
@@ -163,34 +102,14 @@ Item {
 		case "clock":
 			return qsTr("Clock");
 		case "notifBell":
-			return qsTr("Notification bell");
+			return qsTr("Notifs");
+		case "hyprsunset":
+			return qsTr("Night light");
 		default:
 			return id;
 		}
 	}
 
-	function moveArrayItem(list, from, to) {
-		const next = list.slice();
-		const [item] = next.splice(from, 1);
-		next.splice(to, 0, item);
-		return next;
-	}
-
-	function previewVisualMove(from, hovered, before) {
-		let to = hovered + (before ? 0 : 1);
-
-		if (to > from)
-			to -= 1;
-
-		to = Math.max(0, Math.min(visualModel.items.count - 1, to));
-
-		if (from === to)
-			return;
-
-		visualModel.items.move(from, to);
-		root.visualEntries = root.moveArrayItem(root.visualEntries, from, to);
-	}
-
 	function rebuildVisualEntries() {
 		const entries = root.object[root.setting] ?? [];
 		const next = [];
@@ -225,7 +144,6 @@ Item {
 		list[index] = entry;
 		root.object[root.setting] = list;
 		Config.save();
-		root.ensureVisualEntries();
 	}
 
 	Layout.fillWidth: true
@@ -233,7 +151,7 @@ Item {
 
 	Component.onCompleted: root.rebuildVisualEntries()
 
-	Rectangle {
+	CustomRect {
 		anchors.fill: parent
 		anchors.margins: -Appearance.padding.smaller
 		color: DynamicColors.palette.m3primaryContainer
@@ -248,39 +166,12 @@ Item {
 		}
 	}
 
-	ParallelAnimation {
+	RowLayout {
-		id: settleAnim
-
-		onFinished: root.finishVisualDrag()
-
-		Anim {
-			id: settleX
-
-			duration: Appearance.anim.durations.normal
-			property: "dragX"
-			target: root
-		}
-
-		Anim {
-			id: settleY
-
-			duration: Appearance.anim.durations.normal
-			property: "dragY"
-			target: root
-		}
-	}
-
-	ColumnLayout {
 		id: layout
 
 		anchors.fill: parent
-		spacing: Appearance.spacing.smaller
 
-		CustomText {
+		// spacing: Appearance.spacing.smaller
-			Layout.fillWidth: true
-			font.pointSize: Appearance.font.size.larger
-			text: root.name
-		}
 
 		DelegateModel {
 			id: visualModel
@@ -293,248 +184,40 @@ Item {
 			}
 		}
 
-		ListView {
+		Repeater {
-			id: listView
+			delegate: entryDelegate
-
-			Layout.fillWidth: true
-			Layout.preferredHeight: contentHeight
-			boundsBehavior: Flickable.StopAtBounds
-			clip: false
-			implicitHeight: contentHeight
-			implicitWidth: width
-			interactive: !(root.dragActive || root.dropAnimating)
 			model: visualModel
-			spacing: Appearance.spacing.small
-
-			add: Transition {
-				Anim {
-					properties: "opacity,scale"
-					to: 1
-				}
-			}
-			addDisplaced: Transition {
-				Anim {
-					duration: Appearance.anim.durations.normal
-					property: "y"
-				}
-			}
-			displaced: Transition {
-				Anim {
-					duration: Appearance.anim.durations.normal
-					property: "y"
-				}
-			}
-			move: Transition {
-				Anim {
-					duration: Appearance.anim.durations.normal
-					property: "y"
-				}
-			}
-			removeDisplaced: Transition {
-				Anim {
-					duration: Appearance.anim.durations.normal
-					property: "y"
-				}
-			}
-		}
-	}
-
-	Loader {
-		active: root.dragActive || root.dropAnimating
-		asynchronous: false
-
-		sourceComponent: Item {
-			Drag.active: root.dragActive
-			Drag.hotSpot.x: width / 2
-			Drag.hotSpot.y: height / 2
-			height: proxyRect.implicitHeight
-			implicitHeight: proxyRect.implicitHeight
-			implicitWidth: listView.width
-			visible: root.draggedModelData !== null
-			width: listView.width
-			x: root.dragX
-			y: root.dragY
-			z: 100
-
-			Drag.source: QtObject {
-				property string uid: root.draggedUid
-				property int visualIndex: root.indexForUid(root.draggedUid)
-			}
-
-			CustomRect {
-				id: proxyRect
-
-				color: DynamicColors.tPalette.m3surface
-				implicitHeight: proxyRow.implicitHeight + Appearance.padding.small * 2
-				implicitWidth: parent.width
-				opacity: 0.95
-				radius: Appearance.rounding.normal
-				width: parent.width
-
-				RowLayout {
-					id: proxyRow
-
-					anchors.fill: parent
-					anchors.margins: Appearance.padding.small
-					spacing: Appearance.spacing.normal
-
-					CustomRect {
-						color: Qt.alpha(DynamicColors.palette.m3onSurface, 0.12)
-						implicitHeight: 32
-						implicitWidth: implicitHeight
-						radius: Appearance.rounding.small
-
-						MaterialIcon {
-							anchors.centerIn: parent
-							color: DynamicColors.palette.m3onSurfaceVariant
-							text: "drag_indicator"
-						}
-					}
-
-					MaterialIcon {
-						color: DynamicColors.palette.m3onSurfaceVariant
-						text: root.iconForId(root.draggedModelData?.entry?.id ?? "")
-					}
-
-					CustomText {
-						Layout.fillWidth: true
-						font.pointSize: Appearance.font.size.larger
-						text: root.labelForId(root.draggedModelData?.entry?.id ?? "")
-					}
-
-					CustomSwitch {
-						checked: root.draggedModelData?.entry?.enabled ?? true
-						enabled: false
-					}
-				}
-			}
 		}
 	}
 
 	Component {
 		id: entryDelegate
 
-		DropArea {
+		IconButton {
-			id: slot
+			required property int index
-
-			readonly property var entryData: modelData.entry
 			required property var modelData
-			readonly property string uid: modelData.uid
 
-			function previewReorder(drag) {
+			Layout.fillWidth: true
-				const source = drag.source;
+			Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? 18 : internalChecked ? 7 : 0)
-				if (!source || !source.uid || source.uid === slot.uid)
+			checked: modelData.entry.enabled ?? true
-					return;
+			font: Appearance.font.family.sans
+			// icon: root.iconForId(modelData.entry.id)
+			icon: root.labelForId(modelData.entry.id)
+			inactiveColour: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 2)
+			radius: stateLayer.pressed ? 6 / 2 : internalChecked ? 6 : 8
+			radiusAnim.duration: MaterialEasing.expressiveEffectsTime
+			radiusAnim.easing.bezierCurve: MaterialEasing.expressiveEffects
+			toggle: true
+			visible: !["spacer", "upower", "dash", "audio"].some(prefix => modelData.entry.id.startsWith(prefix))
 
-				const from = source.visualIndex;
+			Behavior on Layout.preferredWidth {
-				const hovered = slot.DelegateModel.itemsIndex;
+				Anim {
-
+					duration: MaterialEasing.expressiveEffectsTime
-				if (from < 0 || hovered < 0)
+					easing.bezierCurve: MaterialEasing.expressiveEffects
-					return;
-
-				root.previewVisualMove(from, hovered, drag.y < height / 2);
-			}
-
-			height: entryRow.implicitHeight
-			implicitHeight: entryRow.implicitHeight
-			implicitWidth: listView.width
-			width: ListView.view ? ListView.view.width : listView.width
-
-			onEntered: drag => previewReorder(drag)
-			onPositionChanged: drag => previewReorder(drag)
-
-			CustomRect {
-				id: entryRow
-
-				anchors.fill: parent
-				color: DynamicColors.tPalette.m3surface
-				implicitHeight: entryLayout.implicitHeight + Appearance.padding.small * 2
-				implicitWidth: parent.width
-				opacity: root.draggedUid === slot.uid ? 0 : 1
-				radius: Appearance.rounding.full
-
-				Behavior on opacity {
-					Anim {
-					}
-				}
-
-				RowLayout {
-					id: entryLayout
-
-					anchors.fill: parent
-					anchors.margins: Appearance.padding.small
-					spacing: Appearance.spacing.normal
-
-					CustomRect {
-						id: handle
-
-						color: Qt.alpha(DynamicColors.palette.m3onSurface, handleDrag.active ? 0.12 : handleHover.hovered ? 0.09 : 0.06)
-						implicitHeight: 32
-						implicitWidth: implicitHeight
-						radius: Appearance.rounding.full
-
-						Behavior on color {
-							CAnim {
-							}
-						}
-
-						MaterialIcon {
-							anchors.centerIn: parent
-							color: DynamicColors.palette.m3onSurfaceVariant
-							text: "drag_indicator"
-						}
-
-						HoverHandler {
-							id: handleHover
-
-							cursorShape: handleDrag.active ? Qt.ClosedHandCursor : Qt.OpenHandCursor
-						}
-
-						DragHandler {
-							id: handleDrag
-
-							enabled: true
-							grabPermissions: PointerHandler.CanTakeOverFromAnything
-							target: null
-							xAxis.enabled: false
-							yAxis.enabled: true
-
-							onActiveChanged: {
-								if (active) {
-									root.beginVisualDrag(slot.uid, slot.modelData, entryRow);
-								} else if (root.draggedUid === slot.uid) {
-									root.endVisualDrag();
-								}
-							}
-							onActiveTranslationChanged: {
-								if (!active || root.draggedUid !== slot.uid)
-									return;
-
-								root.dragX = root.dragStartX;
-								root.dragY = root.dragStartY + activeTranslation.y;
-							}
-						}
-					}
-
-					MaterialIcon {
-						color: DynamicColors.palette.m3onSurfaceVariant
-						text: root.iconForId(slot.entryData.id)
-					}
-
-					CustomText {
-						Layout.fillWidth: true
-						font.pointSize: Appearance.font.size.larger
-						text: root.labelForId(slot.entryData.id)
-					}
-
-					CustomSwitch {
-						Layout.rightMargin: Appearance.padding.small
-						checked: slot.entryData.enabled ?? true
-
-						onToggled: root.updateEntry(slot.DelegateModel.itemsIndex, checked)
-					}
 				}
 			}
+
+			onClicked: root.updateEntry(index, internalChecked)
 		}
 	}
 }

Modules/Settings/Controls/SettingInput.qml

@@ -59,7 +59,7 @@ Item {
 			id: rect
 
 			Layout.preferredHeight: 33
-			Layout.preferredWidth: Math.max(Math.min(textField.contentWidth + Appearance.padding.normal * 2, 550), 50)
+			Layout.preferredWidth: Math.max(Math.min(textField.contentWidth + Appearance.padding.large * 2, 550), 50)
 			color: DynamicColors.tPalette.m3surfaceContainerHigh
 			radius: Appearance.rounding.full
 
@@ -68,7 +68,7 @@ Item {
 
 				anchors.centerIn: parent
 				horizontalAlignment: Text.AlignHCenter
-				implicitWidth: Math.min(contentWidth, 550)
+				implicitWidth: Math.min(contentWidth + Appearance.padding.normal * 2, 550)
 				text: root.formattedValue()
 
 				onEditingFinished: {

Modules/Settings/Controls/SettingList.qml

@@ -10,6 +10,7 @@ Item {
 	required property var modelData
 
 	signal addActiveActionRequested
+	signal deleteRequested(int index)
 	signal fieldEdited(string key, var value)
 
 	Layout.fillWidth: true
@@ -65,42 +66,64 @@ Item {
 
 			HoverHandler {
 				id: nameHover
+			}
 
+			HoverIconButton {
+				id: editButton
+
+				anchors.left: parent.left
+				anchors.verticalCenter: parent.verticalCenter
+				font.pointSize: Appearance.font.size.large
+				icon: "edit"
+				shouldBeVisible: nameHover.hovered && !nameCell.editing
+
+				onClicked: nameCell.beginEdit()
 			}
 
 			CustomText {
 				anchors.left: parent.left
-				anchors.right: editButton.left
+				anchors.leftMargin: nameHover.hovered ? editButton.width + Appearance.spacing.smaller * 2 : 0
+				anchors.right: deleteButton.left
 				anchors.rightMargin: Appearance.spacing.small
 				anchors.verticalCenter: parent.verticalCenter
 				elide: Text.ElideRight    // enable if CustomText supports it
 				font.pointSize: Appearance.font.size.larger
 				text: root.modelData.name
 				visible: !nameCell.editing
+
+				Behavior on anchors.leftMargin {
+					Anim {
+					}
+				}
 			}
 
-			IconButton {
+			HoverIconButton {
-				id: editButton
+				id: deleteButton
 
 				anchors.right: parent.right
 				anchors.verticalCenter: parent.verticalCenter
 				font.pointSize: Appearance.font.size.large
-				icon: "edit"
+				icon: "delete"
-				visible: nameHover.hovered && !nameCell.editing
+				shouldBeVisible: nameHover.hovered && !nameCell.editing
 
-				onClicked: nameCell.beginEdit()
+				onClicked: root.deleteRequested(root.index)
 			}
 
 			CustomRect {
-				anchors.fill: parent
+				anchors.left: parent.left
+				anchors.verticalCenter: parent.verticalCenter
 				color: DynamicColors.tPalette.m3surface
+				implicitHeight: nameEditor.implicitHeight + (Appearance.padding.normal * 2)
+				implicitWidth: Math.min(nameEditor.contentWidth + (Appearance.padding.normal * 2), parent.width - Appearance.padding.normal)
 				radius: Appearance.rounding.small
 				visible: nameCell.editing
 
 				CustomTextField {
 					id: nameEditor
 
-					anchors.fill: parent
+					anchors.centerIn: parent
+					horizontalAlignment: Text.AlignHCenter
+					implicitWidth: Math.min(contentWidth + Appearance.padding.normal * 2, nameCell.width - Appearance.padding.normal)
 					text: nameCell.draftName
 
 					Keys.onEscapePressed: {

Modules/Settings/Controls/SettingListView.qml

@@ -0,0 +1,140 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import QtQuick
+import QtQuick.Layouts
+import qs.Config
+import qs.Components
+
+Item {
+	id: root
+
+	required property string name
+	required property var object
+	required property string setting
+
+	Layout.fillWidth: true
+	Layout.preferredHeight: row.height
+
+	RowLayout {
+		id: row
+
+		anchors.left: parent.left
+		anchors.margins: Appearance.padding.small
+		anchors.right: parent.right
+		anchors.verticalCenter: parent.verticalCenter
+
+		CustomText {
+			id: text
+
+			Layout.fillWidth: true
+			font.pointSize: Appearance.font.size.larger
+			text: root.name
+		}
+
+		CustomClippingRect {
+			id: fontArea
+
+			Layout.preferredHeight: 42 * 6 + Appearance.padding.normal * 2 + Appearance.spacing.small * 5
+			Layout.preferredWidth: 500
+			color: DynamicColors.tPalette.m3surfaceContainer
+			radius: (21 + Appearance.padding.normal) * Appearance.rounding.scale
+
+			CustomRect {
+				id: searchBox
+
+				anchors.left: parent.left
+				anchors.margins: Appearance.padding.normal
+				anchors.right: parent.right
+				anchors.top: parent.top
+				color: DynamicColors.tPalette.m3surfaceContainer
+				implicitHeight: 42
+				radius: Appearance.rounding.full
+
+				MaterialIcon {
+					id: searchIcon
+
+					anchors.bottom: parent.bottom
+					anchors.left: parent.left
+					anchors.leftMargin: Appearance.padding.large
+					anchors.top: parent.top
+					font.pointSize: Appearance.font.size.large
+					text: "search"
+					verticalAlignment: Text.AlignVCenter
+				}
+
+				CustomTextField {
+					id: fontSearch
+
+					anchors.left: searchIcon.right
+					anchors.leftMargin: Appearance.spacing.small
+					anchors.right: parent.right
+					anchors.rightMargin: Appearance.spacing.normal
+					anchors.verticalCenter: parent.verticalCenter
+					placeholderText: "Search..."
+				}
+			}
+
+			CustomClippingRect {
+				anchors.bottom: parent.bottom
+				anchors.left: parent.left
+				anchors.margins: Appearance.padding.normal
+				anchors.right: parent.right
+				anchors.top: searchBox.bottom
+				bottomLeftRadius: 21
+				bottomRightRadius: 21
+
+				CustomListView {
+					anchors.fill: parent
+					clip: true
+					spacing: Appearance.spacing.small
+
+					delegate: CustomRect {
+						id: fontDelegate
+
+						required property string modelData
+
+						anchors.left: parent.left
+						anchors.right: parent.right
+						implicitHeight: 42
+						radius: Appearance.rounding.smallest
+
+						CustomText {
+							anchors.fill: parent
+							anchors.leftMargin: Appearance.padding.normal
+							text: modelData
+							verticalAlignment: Text.AlignVCenter
+						}
+
+						MaterialIcon {
+							anchors.fill: parent
+							anchors.rightMargin: Appearance.padding.normal
+							color: DynamicColors.palette.m3primary
+							font.pointSize: Appearance.font.size.large
+							horizontalAlignment: Text.AlignRight
+							text: "check_circle"
+							verticalAlignment: Text.AlignVCenter
+							visible: root.object[root.setting] === fontDelegate.modelData
+						}
+
+						StateLayer {
+							onClicked: {
+								root.object[root.setting] = fontDelegate.modelData;
+								Config.save();
+							}
+						}
+					}
+					model: ScriptModel {
+						values: {
+							const fonts = Qt.fontFamilies();
+							const search = fontSearch.text;
+							var regex = new RegExp(search, "i");
+
+							return fonts.filter(n => regex.test(n));
+						}
+					}
+				}
+			}
+		}
+	}
+}

Modules/Settings/Controls/SettingsPage.qml

@@ -36,6 +36,10 @@ CustomClippingRect {
 		clip: true
 		contentHeight: clayout.implicitHeight
 
+		CustomScrollBar.vertical: CustomScrollBar {
+			flickable: flickable
+		}
+
 		TapHandler {
 			acceptedButtons: Qt.LeftButton
 

Modules/Settings/Controls/WallpaperCropper.qml

@@ -6,97 +6,109 @@ import qs.Config
 import qs.Components
 import qs.Helpers
 
-ColumnLayout {
+Item {
 	id: root
 
-	spacing: 15
+	Image {
-	width: Math.min(parent ? parent.width : 600, 600)
+		id: imageView
 
-	Rectangle {
+		property real displayH: paintedHeight
-		id: previewContainer
+		property real displayW: paintedWidth
+		property real displayX: (width - paintedWidth) * 0.5
+		property real displayY: (height - paintedHeight) * 0.5
+		property real scaleX: sourceW / displayW
+		property real scaleY: sourceH / displayH
+		property real sourceH: Quickshell.screens[0].height
+		property real sourceW: Quickshell.screens[0].width
+
+		anchors.fill: parent
+		fillMode: Image.PreserveAspectFit
+		smooth: true
+		source: Wallpapers.current
+	}
+
+	Item {
+		id: overlay
 
-		Layout.fillHeight: true
-		Layout.preferredWidth: height * (Quickshell.screens.length > 0 ? (Quickshell.screens[0].height / Math.max(1, Quickshell.screens[0].width)) : 16 / 9)
 		clip: true
-		color: DynamicColors.palette.m3surfaceContainer
+		height: imageView.displayH
-		radius: Config.appearance.rounding.scale * 10
+		width: imageView.displayW
+		x: imageView.displayX
+		y: imageView.displayY
 
-		Image {
+		CustomRect {
-			id: img
+			id: cropRect
+
+			property real aspectRatio: Quickshell.screens[0].width / Quickshell.screens[0].height
+			readonly property rect sourceRect: Qt.rect(x * imageView.scaleX, y * imageView.scaleY, width * imageView.scaleX, height * imageView.scaleY)
+			property real zoom: Config.background.zoom
+
+			function clampToBounds() {
+				x = Math.max(0, Math.min(x, overlay.width - width));
+
+				y = Math.max(0, Math.min(y, overlay.height - height));
+			}
+
+			border.color: DynamicColors.palette.m3primary
+			border.width: 2
+			color: DynamicColors.tPalette.m3primary
+			height: width / aspectRatio
+			radius: Appearance.rounding.small
+			visible: imageView.status === Image.Ready
+			width: Math.min(overlay.width / zoom, overlay.height * aspectRatio / zoom)
+			x: Config.background.sourceClipX / imageView.scaleX
+			y: Config.background.sourceClipY / imageView.scaleY
+		}
+
+		MouseArea {
+			function updateCrop(mouseX, mouseY) {
+				let nx = mouseX - cropRect.width * 0.5;
+				let ny = mouseY - cropRect.height * 0.5;
+
+				nx = Math.max(0, Math.min(nx, overlay.width - cropRect.width));
+
+				ny = Math.max(0, Math.min(ny, overlay.height - cropRect.height));
+
+				cropRect.x = nx;
+				cropRect.y = ny;
+			}
 
 			anchors.fill: parent
-			asynchronous: true
+			hoverEnabled: true
-			fillMode: Image.PreserveAspectFit
+			preventStealing: true
-			source: Wallpapers.current
 
-			Rectangle {
+			onPositionChanged: mouse => {
-				id: cropRect
+				if (pressed)
+					updateCrop(mouse.x, mouse.y);
+			}
+			onPressed: mouse => {
+				updateCrop(mouse.x, mouse.y);
+			}
+			onReleased: {
+				Wallpapers.recentlyChanged = false;
+				Config.background.sourceClipX = cropRect.sourceRect.x;
+				Config.background.sourceClipY = cropRect.sourceRect.y;
+				Config.background.sourceClipW = cropRect.sourceRect.width;
+				Config.background.sourceClipH = cropRect.sourceRect.height;
+				Config.save();
+			}
+			onWheel: wheel => {
+				let oldCenterX = cropRect.x + cropRect.width * 0.5;
+				let oldCenterY = cropRect.y + cropRect.height * 0.5;
 
-				property real cropHeight: (imageAspect > screenAspect ? paintedHeight : paintedWidth / screenAspect) / Config.background.zoom
+				if (wheel.angleDelta.y > 0)
-				property real cropWidth: (imageAspect > screenAspect ? paintedHeight * screenAspect : paintedWidth) / Config.background.zoom
+					cropRect.zoom *= 1.1;
-				property real imageAspect: Math.max(1, paintedWidth) / Math.max(1, paintedHeight)
+				else
-				property real paintedHeight: img.paintedHeight > 0 ? img.paintedHeight : img.height
+					cropRect.zoom /= 1.1;
-				property real paintedWidth: img.paintedWidth > 0 ? img.paintedWidth : img.width
-				property real paintedX: (img.width - paintedWidth) / 2
-				property real paintedY: (img.height - paintedHeight) / 2
-				property real screenAspect: Quickshell.screens.length > 0 ? (Quickshell.screens[0].width / Math.max(1, Quickshell.screens[0].height)) : 16 / 9
 
-				border.color: DynamicColors.palette.m3primary
+				cropRect.zoom = Math.max(1.0, Math.min(cropRect.zoom, 10.0));
-				border.width: 2
+				Config.background.zoom = cropRect.zoom;
-				color: Qt.alpha(DynamicColors.palette.m3primaryContainer, 0.3)
-				height: cropHeight
-				width: cropWidth
-				x: paintedX + (paintedWidth - width) * Config.background.alignX
-				y: paintedY + (paintedHeight - height) * Config.background.alignY
 
-				DragHandler {
+				cropRect.x = oldCenterX - cropRect.width * 0.5;
-					target: null
+				cropRect.y = oldCenterY - cropRect.height * 0.5;
 
-					onActiveTranslationChanged: {
+				cropRect.clampToBounds();
-						if (active) {
-							let newX = cropRect.x - cropRect.paintedX + translation.x;
-							let newY = cropRect.y - cropRect.paintedY + translation.y;
-
-							let rangeX = cropRect.paintedWidth - cropRect.width;
-							let rangeY = cropRect.paintedHeight - cropRect.height;
-
-							if (rangeX > 0) {
-								let valX = newX / rangeX;
-								Config.background.alignX = Math.max(0.0, Math.min(1.0, valX));
-								Config.save();
-							}
-
-							if (rangeY > 0) {
-								let valY = newY / rangeY;
-								Config.background.alignY = Math.max(0.0, Math.min(1.0, valY));
-								Config.save();
-							}
-						}
-					}
-				}
-
-				PinchHandler {
-					maximumScale: 5.0
-					minimumScale: 1.0
-					target: null
-
-					onActiveScaleChanged: {
-						if (active) {
-							let newZoom = Config.background.zoom * (1 / (1 + (activeScale - 1) * 0.1));
-							Config.background.zoom = Math.max(1.0, Math.min(newZoom, 5.0));
-						}
-					}
-				}
 			}
 		}
 	}
-
-	SettingSpinBox {
-		max: 5.0
-		min: 1.0
-		name: "Zoom"
-		object: Config.background
-		setting: "zoom"
-		step: 0.1
-	}
 }

Modules/Settings/SettingsSearch.qml

@@ -6,7 +6,7 @@ import QtQuick.Controls
 import qs.Components
 import qs.Config
 import "../../scripts/fuzzysort.js" as Fuzzy
-import "./SettingsIndex.mjs" as SettingsIndex
+import "../../scripts/SettingsIndex.mjs" as SettingsIndex
 
 Item {
 	id: root
@@ -51,9 +51,14 @@ Item {
 	implicitHeight: searchContainer.implicitHeight
 	implicitWidth: 200
 
+	Shortcut {
+		sequence: "/"
+
+		onActivated: searchField.forceActiveFocus()
+	}
+
 	ListModel {
 		id: resultsModel
-
 	}
 
 	CustomRect {

Modules/Settings/Wrapper.qml

@@ -7,45 +7,24 @@ import qs.Helpers
 Item {
 	id: root
 
+	property real offsetScale: shouldBeActive ? 0 : 1
 	required property var panels
 	required property ShellScreen screen
+	readonly property bool shouldBeActive: visibilities.settings
 	required property PersistentProperties visibilities
 
-	implicitHeight: 0
+	anchors.topMargin: (-implicitHeight - 5) * offsetScale
+	implicitHeight: content.implicitHeight
 	implicitWidth: content.implicitWidth
-	visible: height > 0
+	opacity: 1 - offsetScale
+	visible: offsetScale < 1
 
-	states: State {
+	Behavior on offsetScale {
-		name: "visible"
+		Anim {
-		when: root.visibilities.settings
+			duration: Appearance.anim.durations.expressiveDefaultSpatial
-
+			easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
-		PropertyChanges {
-			root.implicitHeight: content.implicitHeight
 		}
 	}
-	transitions: [
-		Transition {
-			from: ""
-			to: "visible"
-
-			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		},
-		Transition {
-			from: "visible"
-			to: ""
-
-			Anim {
-				easing.bezierCurve: MaterialEasing.expressiveEffects
-				property: "implicitHeight"
-				target: root
-			}
-		}
-	]
 
 	CustomClippingRect {
 		anchors.fill: parent

Modules/Shortcuts.qml

@@ -14,8 +14,8 @@ Scope {
 		description: "Toggle launcher"
 		name: "toggle-launcher"
 
-		onPressed: root.launcherInterrupted = false
+		onPressed: {
-		onReleased: {
+			root.launcherInterrupted = false;
 			if (!root.launcherInterrupted && !root.hasFullscreen) {
 				const visibilities = Visibilities.getForActive();
 				visibilities.launcher = !visibilities.launcher;

Modules/SysTray/Popouts/AudioPopup.qml

@@ -18,12 +18,13 @@ Item {
 	readonly property int topMargin: 0
 	required property var wrapper
 
-	implicitHeight: layout.implicitHeight + Appearance.padding.small * 2
+	implicitHeight: vol.implicitHeight + Appearance.padding.small * 2
-	implicitWidth: layout.implicitWidth + Appearance.padding.small * 2
+	implicitWidth: 400 + Appearance.padding.small * 2
 
 	CustomRect {
 		anchors.left: parent.left
 		anchors.right: parent.right
+		anchors.top: parent.top
 		color: DynamicColors.tPalette.m3surfaceContainer
 		implicitHeight: parent.implicitHeight
 		radius: Appearance.rounding.small
@@ -31,180 +32,21 @@ Item {
 
 		Behavior on implicitHeight {
 			Anim {
-				duration: MaterialEasing.emphasizedDecelTime
+				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.emphasized
+				easing.bezierCurve: MaterialEasing.expressiveEffects
 			}
 		}
 	}
 
-	ColumnLayout {
+	VolumesTab {
-		id: layout
+		id: vol
 
-		anchors.centerIn: parent
+		anchors.left: parent.left
-		implicitWidth: stack.currentItem ? stack.currentItem.childrenRect.height : 0
+		anchors.margins: Appearance.padding.small
-		spacing: 12
+		anchors.right: parent.right
-
+		anchors.verticalCenter: parent.verticalCenter
-		RowLayout {
-			id: tabBar
-
-			property int tabHeight: 36
-
-			Layout.fillWidth: true
-			spacing: 6
-
-			CustomClippingRect {
-				Layout.fillWidth: true
-				Layout.preferredHeight: tabBar.tabHeight
-				color: stack.currentIndex === 0 ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
-				radius: root.rounding
-
-				StateLayer {
-					function onClicked(): void {
-						stack.currentIndex = 0;
-					}
-
-					CustomText {
-						anchors.centerIn: parent
-						color: stack.currentIndex === 0 ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3primary
-						text: qsTr("Volumes")
-					}
-				}
-			}
-
-			CustomClippingRect {
-				Layout.fillWidth: true
-				Layout.preferredHeight: tabBar.tabHeight
-				color: stack.currentIndex === 1 ? DynamicColors.palette.m3primary : DynamicColors.tPalette.m3surfaceContainer
-				radius: root.rounding
-
-				StateLayer {
-					function onClicked(): void {
-						stack.currentIndex = 1;
-					}
-
-					CustomText {
-						anchors.centerIn: parent
-						color: stack.currentIndex === 1 ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3primary
-						text: qsTr("Devices")
-					}
-				}
-			}
-		}
-
-		StackLayout {
-			id: stack
-
-			Layout.fillWidth: true
-			Layout.preferredHeight: currentIndex === 0 ? vol.childrenRect.height : dev.childrenRect.height
-			currentIndex: 0
-
-			Behavior on currentIndex {
-				SequentialAnimation {
-					ParallelAnimation {
-						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "opacity"
-							target: stack
-							to: 0
-						}
-
-						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "scale"
-							target: stack
-							to: 0.9
-						}
-					}
-
-					PropertyAction {
-					}
-
-					ParallelAnimation {
-						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "opacity"
-							target: stack
-							to: 1
-						}
-
-						Anim {
-							duration: MaterialEasing.expressiveEffectsTime
-							property: "scale"
-							target: stack
-							to: 1
-						}
-					}
-				}
-			}
-
-			VolumesTab {
-				id: vol
-			}
-
-			DevicesTab {
-				id: dev
-			}
-		}
 	}
 
-	component DevicesTab: Item {
-		implicitHeight: deviceColumn.height + Appearance.padding.normal
-		implicitWidth: deviceColumn.width + Appearance.padding.normal
-
-		ColumnLayout {
-			id: deviceColumn
-
-			anchors.centerIn: parent
-			spacing: 12
-
-			ButtonGroup {
-				id: sinks
-			}
-
-			ButtonGroup {
-				id: sources
-			}
-
-			CustomText {
-				font.weight: 500
-				text: qsTr("Output device")
-			}
-
-			Repeater {
-				model: Audio.sinks
-
-				CustomRadioButton {
-					required property PwNode modelData
-
-					ButtonGroup.group: sinks
-					checked: Audio.sink?.id === modelData.id
-					text: modelData.description
-
-					onClicked: Audio.setAudioSink(modelData)
-				}
-			}
-
-			CustomText {
-				Layout.topMargin: 10
-				font.weight: 500
-				text: qsTr("Input device")
-			}
-
-			Repeater {
-				model: Audio.sources
-
-				CustomRadioButton {
-					required property PwNode modelData
-
-					ButtonGroup.group: sources
-					checked: Audio.source?.id === modelData.id
-					text: modelData.description
-
-					onClicked: Audio.setAudioSource(modelData)
-				}
-			}
-		}
-	}
 	component VolumesTab: ColumnLayout {
 		spacing: 12
 
@@ -294,13 +136,35 @@ Item {
 			}
 		}
 
-		CustomRect {
+		CustomClippingRect {
 			Layout.fillWidth: true
 			Layout.preferredHeight: 42 + Appearance.spacing.smaller * 2
 			Layout.topMargin: root.topMargin
 			color: DynamicColors.tPalette.m3surfaceContainer
 			radius: root.rounding
 
+			PwNodePeakMonitor {
+				id: sourcePeak
+
+				node: Audio.source
+			}
+
+			CustomRect {
+				id: sourcePeakFill
+
+				anchors.bottom: parent.bottom
+				anchors.left: parent.left
+				anchors.top: parent.top
+				color: Qt.alpha(DynamicColors.palette.m3primary, 0.15)
+				implicitWidth: parent.width * sourcePeak.peak
+
+				Behavior on implicitWidth {
+					Anim {
+						duration: MaterialEasing.expressiveEffectsTime
+					}
+				}
+			}
+
 			RowLayout {
 				id: inputVolume
 

Modules/SysTray/Popouts/SubMenu.qml

@@ -0,0 +1,158 @@
+pragma ComponentBehavior: Bound
+
+import Quickshell
+import Quickshell.Widgets
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Effects
+import qs.Components
+import qs.Modules
+import qs.Config
+
+Column {
+	id: menu
+
+	property int biggestWidth: 0
+	required property QsMenuHandle handle
+	required property int level
+	required property PopoutState popouts
+	required property ShellScreen screen
+	property bool shown: true
+
+	height: childrenRect.height
+	opacity: shown ? 1 : 0
+	padding: 0
+	scale: shown ? 1 : 0.8
+	spacing: 4
+	width: biggestWidth
+
+	Behavior on opacity {
+		Anim {
+		}
+	}
+	Behavior on scale {
+		Anim {
+		}
+	}
+
+	QsMenuOpener {
+		id: menuOpener
+
+		menu: menu.handle
+	}
+
+	Repeater {
+		model: menuOpener.children
+
+		CustomRect {
+			id: item
+
+			required property int index
+			required property QsMenuEntry modelData
+
+			color: modelData.isSeparator ? DynamicColors.palette.m3outlineVariant : "transparent"
+			implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight
+			implicitWidth: menu.biggestWidth
+			radius: Appearance.rounding.full
+			visible: index !== (menuOpener.children.values.length - 1) ? true : (modelData.isSeparator ? false : true)
+
+			Loader {
+				id: children
+
+				active: !item.modelData.isSeparator
+				anchors.left: parent.left
+				anchors.right: parent.right
+				asynchronous: true
+
+				sourceComponent: Item {
+					implicitHeight: 30
+
+					StateLayer {
+						function onClicked(): void {
+							const entry = item.modelData;
+							if (entry.hasChildren) {
+								menu.popouts.pushSubmenu(menu.level, entry, item, menu.biggestWidth);
+							} else {
+								entry.triggered();
+								menu.popouts.hasCurrent = false;
+							}
+						}
+
+						disabled: !item.modelData.enabled
+						radius: item.radius
+					}
+
+					Loader {
+						id: icon
+
+						active: item.modelData.icon !== ""
+						anchors.right: parent.right
+						anchors.rightMargin: 10
+						anchors.verticalCenter: parent.verticalCenter
+						asynchronous: true
+
+						sourceComponent: Item {
+							implicitHeight: label.implicitHeight
+							implicitWidth: label.implicitHeight
+
+							IconImage {
+								id: iconImage
+
+								implicitSize: parent.implicitHeight
+								source: item.modelData.icon
+								visible: false
+							}
+
+							MultiEffect {
+								anchors.fill: iconImage
+								colorization: 1.0
+								colorizationColor: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
+								source: iconImage
+							}
+						}
+					}
+
+					CustomText {
+						id: label
+
+						anchors.left: parent.left
+						anchors.leftMargin: 10
+						anchors.verticalCenter: parent.verticalCenter
+						color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
+						text: labelMetrics.elidedText
+					}
+
+					TextMetrics {
+						id: labelMetrics
+
+						font.family: label.font.family
+						font.pointSize: label.font.pointSize
+						text: item.modelData.text
+
+						Component.onCompleted: {
+							var biggestWidth = menu.biggestWidth;
+							var currentWidth = labelMetrics.width + (item.modelData.icon ?? "" ? 30 : 0) + (item.modelData.hasChildren ? 30 : 0) + 20;
+							if (currentWidth > biggestWidth) {
+								menu.biggestWidth = currentWidth;
+							}
+						}
+					}
+
+					Loader {
+						id: expand
+
+						active: item.modelData.hasChildren
+						anchors.right: parent.right
+						anchors.verticalCenter: parent.verticalCenter
+						asynchronous: true
+
+						sourceComponent: MaterialIcon {
+							color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
+							text: "chevron_right"
+						}
+					}
+				}
+			}
+		}
+	}
+}

Modules/SysTray/Popouts/TrayMenuPopout.qml

@@ -1,249 +1,16 @@
 pragma ComponentBehavior: Bound
 
 import Quickshell
-import Quickshell.Widgets
 import QtQuick
-import QtQuick.Controls
-import QtQuick.Effects
 import qs.Components
 import qs.Modules
 import qs.Config
 
-StackView {
+SubMenu {
 	id: root
 
-	property int biggestWidth: 0
+	handle: trayItem
-	required property PopoutState popouts
+	level: 0
-	property int rootWidth: 0
+
 	required property QsMenuHandle trayItem
-
+}
-	implicitHeight: currentItem.implicitHeight
-	implicitWidth: currentItem.implicitWidth
-
-	initialItem: SubMenu {
-		handle: root.trayItem
-	}
-	popEnter: NoAnim {
-	}
-	popExit: NoAnim {
-	}
-	pushEnter: NoAnim {
-	}
-	pushExit: NoAnim {
-	}
-
-	Component {
-		id: subMenuComp
-
-		SubMenu {
-		}
-	}
-
-	component NoAnim: Transition {
-		NumberAnimation {
-			duration: 0
-		}
-	}
-	component SubMenu: Column {
-		id: menu
-
-		required property QsMenuHandle handle
-		property bool isSubMenu
-		property bool shown
-
-		opacity: shown ? 1 : 0
-		padding: 0
-		scale: shown ? 1 : 0.8
-		spacing: 4
-
-		Behavior on opacity {
-			Anim {
-			}
-		}
-		Behavior on scale {
-			Anim {
-			}
-		}
-
-		Component.onCompleted: shown = true
-		StackView.onActivating: shown = true
-		StackView.onDeactivating: shown = false
-		StackView.onRemoved: destroy()
-
-		QsMenuOpener {
-			id: menuOpener
-
-			menu: menu.handle
-		}
-
-		Repeater {
-			model: menuOpener.children
-
-			CustomRect {
-				id: item
-
-				required property QsMenuEntry modelData
-
-				color: modelData.isSeparator ? DynamicColors.palette.m3outlineVariant : "transparent"
-				implicitHeight: modelData.isSeparator ? 1 : children.implicitHeight
-				implicitWidth: root.biggestWidth
-				radius: Appearance.rounding.smallest / 2
-
-				Loader {
-					id: children
-
-					active: !item.modelData.isSeparator
-					anchors.left: parent.left
-					anchors.right: parent.right
-					asynchronous: true
-
-					sourceComponent: Item {
-						implicitHeight: 30
-
-						StateLayer {
-							function onClicked(): void {
-								const entry = item.modelData;
-								if (entry.hasChildren) {
-									root.rootWidth = root.biggestWidth;
-									root.biggestWidth = 0;
-									root.push(subMenuComp.createObject(null, {
-										handle: entry,
-										isSubMenu: true
-									}));
-								} else {
-									item.modelData.triggered();
-									root.popouts.hasCurrent = false;
-								}
-							}
-
-							disabled: !item.modelData.enabled
-							radius: item.radius
-						}
-
-						Loader {
-							id: icon
-
-							active: item.modelData.icon !== ""
-							anchors.right: parent.right
-							anchors.rightMargin: 10
-							anchors.verticalCenter: parent.verticalCenter
-							asynchronous: true
-
-							sourceComponent: Item {
-								implicitHeight: label.implicitHeight
-								implicitWidth: label.implicitHeight
-
-								IconImage {
-									id: iconImage
-
-									implicitSize: parent.implicitHeight
-									source: item.modelData.icon
-									visible: false
-								}
-
-								MultiEffect {
-									anchors.fill: iconImage
-									colorization: 1.0
-									colorizationColor: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
-									source: iconImage
-								}
-							}
-						}
-
-						CustomText {
-							id: label
-
-							anchors.left: parent.left
-							anchors.leftMargin: 10
-							anchors.verticalCenter: parent.verticalCenter
-							color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
-							text: labelMetrics.elidedText
-						}
-
-						TextMetrics {
-							id: labelMetrics
-
-							font.family: label.font.family
-							font.pointSize: label.font.pointSize
-							text: item.modelData.text
-
-							Component.onCompleted: {
-								var biggestWidth = root.biggestWidth;
-								var currentWidth = labelMetrics.width + (item.modelData.icon ?? "" ? 30 : 0) + (item.modelData.hasChildren ? 30 : 0) + 20;
-								if (currentWidth > biggestWidth) {
-									root.biggestWidth = currentWidth;
-								}
-							}
-						}
-
-						Loader {
-							id: expand
-
-							active: item.modelData.hasChildren
-							anchors.right: parent.right
-							anchors.verticalCenter: parent.verticalCenter
-							asynchronous: true
-
-							sourceComponent: MaterialIcon {
-								color: item.modelData.enabled ? DynamicColors.palette.m3onSurface : DynamicColors.palette.m3outline
-								text: "chevron_right"
-							}
-						}
-					}
-				}
-			}
-		}
-
-		Loader {
-			id: loader
-
-			active: menu.isSubMenu
-			asynchronous: true
-
-			sourceComponent: Item {
-				implicitHeight: back.implicitHeight + 2 / 2
-				implicitWidth: back.implicitWidth
-
-				Item {
-					anchors.bottom: parent.bottom
-					implicitHeight: back.implicitHeight
-					implicitWidth: back.implicitWidth + 10
-
-					CustomRect {
-						anchors.fill: parent
-						color: DynamicColors.palette.m3secondaryContainer
-						radius: Appearance.rounding.smallest / 2
-
-						StateLayer {
-							function onClicked(): void {
-								root.pop();
-								root.biggestWidth = root.rootWidth;
-							}
-
-							color: DynamicColors.palette.m3onSecondaryContainer
-							radius: parent.radius
-						}
-					}
-
-					Row {
-						id: back
-
-						anchors.verticalCenter: parent.verticalCenter
-
-						MaterialIcon {
-							anchors.verticalCenter: parent.verticalCenter
-							color: DynamicColors.palette.m3onSecondaryContainer
-							text: "chevron_left"
-						}
-
-						CustomText {
-							anchors.verticalCenter: parent.verticalCenter
-							color: DynamicColors.palette.m3onSecondaryContainer
-							text: qsTr("Back")
-						}
-					}
-				}
-			}
-		}
-	}
-}

Modules/SysTray/Popouts/UPowerPopout.qml

@@ -31,7 +31,7 @@ Item {
 		implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + 5 * 2 + saverLabel.contentHeight
 		implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + 8 * 2 + saverLabel.contentWidth
 		// color: "transparent"
-		radius: 6
+		radius: (20 - Appearance.padding.small) * Appearance.rounding.scale
 
 		CustomRect {
 			id: indicator

Modules/Time.qml

@@ -1,30 +0,0 @@
-pragma Singleton
-
-import Quickshell
-import QtQuick
-
-Singleton {
-	id: root
-
-	readonly property date date: clock.date
-	readonly property string dateStr: format("ddd d MMM - hh:mm:ss")
-	property alias enabled: clock.enabled
-	readonly property string hourStr: timeComponents[0] ?? ""
-	readonly property int hours: clock.hours
-	readonly property string minuteStr: timeComponents[1] ?? ""
-	readonly property int minutes: clock.minutes
-	readonly property string secondStr: timeComponents[2] ?? ""
-	readonly property int seconds: clock.seconds
-	readonly property list<string> timeComponents: timeStr.split(":")
-	readonly property string timeStr: format("hh:mm:ss")
-
-	function format(fmt: string): string {
-		return Qt.formatDateTime(clock.date, fmt);
-	}
-
-	SystemClock {
-		id: clock
-
-		precision: SystemClock.Seconds
-	}
-}

Modules/Updates/UpdatesPopout.qml

@@ -25,7 +25,7 @@ CustomClippingRect {
 		anchors.centerIn: parent
 		height: 200
 		visible: script.values.length === 0
-		width: 300
+		width: 600
 
 		MaterialIcon {
 			id: noUpdatesIcon
@@ -54,6 +54,8 @@ CustomClippingRect {
 		anchors.centerIn: parent
 		contentHeight: childrenRect.height
 		contentWidth: 600
+		displayMarginBeginning: root.itemHeight
+		displayMarginEnd: root.itemHeight
 		implicitHeight: Math.min(contentHeight, (root.itemHeight + spacing) * 5 - spacing)
 		implicitWidth: contentWidth
 		spacing: Appearance.spacing.normal
@@ -65,10 +67,11 @@ CustomClippingRect {
 			required property var modelData
 			readonly property list<string> sections: modelData.update.split(" ")
 
-			anchors.left: parent.left
+			// anchors.left: parent.left
-			anchors.right: parent.right
+			// anchors.right: parent.right
 			color: DynamicColors.tPalette.m3surfaceContainer
 			implicitHeight: root.itemHeight
+			implicitWidth: 600
 			radius: Appearance.rounding.small - Appearance.padding.small
 
 			RowLayout {

Modules/Updates/UpdatesWidget.qml

@@ -14,7 +14,7 @@ CustomRect {
 	color: DynamicColors.tPalette.m3surfaceContainer
 	implicitHeight: Config.barConfig.height + Appearance.padding.smallest * 2
 	implicitWidth: contentRow.implicitWidth + Appearance.spacing.small * 2
-	radius: height / 2
+	radius: Appearance.rounding.full
 
 	RowLayout {
 		id: contentRow

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

@@ -1,5 +1,6 @@
 pragma ComponentBehavior: Bound
 
+import Quickshell
 import QtQuick
 import qs.Components
 import qs.Helpers
@@ -8,85 +9,34 @@ import qs.Config
 Item {
 	id: root
 
-	property Image current: one
+	required property ShellScreen screen
 	property string source: Wallpapers.current
 
 	anchors.fill: parent
 
-	Component.onCompleted: {
+	Image {
-		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: CachingImage {
 		id: img
 
-		function update(): void {
+		anchors.fill: parent
-			if (path === root.source) {
-				root.current = this;
-			} else {
-				path = root.source;
-			}
-		}
-
-		anchors.fill: undefined
 		asynchronous: true
-		opacity: 0
+		fillMode: Image.PreserveAspectCrop
-		fillMode: Image.Stretch
+		opacity: 1
-		
+		retainWhileLoading: true
-		property real windowRatio: root.width / Math.max(1, root.height)
+		source: root.source
-		property real imageRatio: Math.max(1, sourceSize.width) / Math.max(1, sourceSize.height)
+		sourceClipRect: Wallpapers.recentlyChanged ? null : Qt.rect(Config.background.sourceClipX, Config.background.sourceClipY, Config.background.sourceClipW, Config.background.sourceClipH)
-		
+		sourceSize.height: root.screen.height
-		property bool isValid: sourceSize.width > 0 && sourceSize.height > 0 && root.width > 0 && root.height > 0
+		sourceSize.width: root.screen.width
 
-		width: isValid ? (imageRatio > windowRatio ? root.height * imageRatio : root.width) * Config.background.zoom : root.width
+		onSourceChanged: {
-		height: isValid ? (imageRatio > windowRatio ? root.height : root.width / imageRatio) * Config.background.zoom : root.height
+			if (Wallpapers.recentlyChanged) {
-
+				Config.background.sourceClipH = 0;
-		x: isValid ? (root.width - width) * Config.background.alignX : 0
+				Config.background.sourceClipW = 0;
-		y: isValid ? (root.height - height) * Config.background.alignY : 0
+				Config.background.sourceClipY = 0;
-
+				Config.background.sourceClipX = 0;
-		scale: Wallpapers.showPreview ? 1 : 0.8
+				Config.background.zoom = 1.0;
-
+				Config.save();
-		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;
 			}
+			Wallpapers.recentlyChanged = true;
 		}
 	}
 }

Modules/Wallpaper/Wallpaper.qml

@@ -30,6 +30,7 @@ Loader {
 			}
 
 			WallBackground {
+				screen: root.screen
 			}
 
 			Loader {

Modules/Workspaces.qml

@@ -21,7 +21,7 @@ Item {
 	readonly property int workspacesShown: workspaces.length
 
 	height: implicitHeight
-	implicitHeight: Config.barConfig.height + Math.max(Appearance.padding.smaller, Config.barConfig.border) * 2
+	implicitHeight: Config.barConfig.height + Appearance.padding.smaller * 2
 	implicitWidth: (root.workspaceButtonWidth * root.workspacesShown) + root.activeWorkspaceMargin * 2
 
 	Behavior on implicitWidth {
@@ -39,36 +39,15 @@ Item {
 		implicitHeight: root.implicitHeight - ((Appearance.padding.small - 1) * 2)
 		radius: height / 2
 
-		CustomRect {
-			id: indicator
-
-			property real indicatorLength: (Math.abs(idxPair.idx1 - idxPair.idx2) + 1) * root.workspaceButtonWidth
-			property real indicatorPosition: Math.min(idxPair.idx1, idxPair.idx2) * root.workspaceButtonWidth + root.activeWorkspaceMargin
-			property real indicatorThickness: root.workspaceButtonWidth
-
-			anchors.verticalCenter: parent.verticalCenter
-			color: DynamicColors.palette.m3primary
-			implicitHeight: indicatorThickness
-			implicitWidth: indicatorLength
-			radius: Appearance.rounding.full
-			x: indicatorPosition
-			z: 2
-
-			AnimatedTabIndexPair {
-				id: idxPair
-
-				index: root.workspaces.findIndex(w => w.active)
-			}
-		}
-
 		Grid {
+			id: grid
+
 			anchors.fill: parent
 			anchors.margins: root.activeWorkspaceMargin
 			columnSpacing: 0
 			columns: root.workspacesShown
 			rowSpacing: 0
 			rows: 1
-			z: 3
 
 			Repeater {
 				model: root.workspaces
@@ -91,88 +70,51 @@ Item {
 
 						CustomText {
 							anchors.centerIn: parent
-							color: button.modelData.active ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
+							color: DynamicColors.palette.m3onSecondaryContainer
 							elide: Text.ElideRight
 							horizontalAlignment: Text.AlignHCenter
 							text: button.modelData.name
 							verticalAlignment: Text.AlignVCenter
-							z: 3
 						}
 					}
 
 					onPressed: {
-						Hyprland.dispatch(`workspace ${button.modelData.name}`);
+						const ws = button.modelData.name;
+						Hyprland.dispatch(Hyprland.usingLua ? `hl.dsp.focus({ workspace= "${ws}"})` : `workspace ${ws}`);
 					}
 				}
 			}
 		}
 
-		Item {
+		CustomRect {
-			id: activeTextSource
+			id: indicator
 
-			anchors.fill: parent
+			property real indicatorLength: (Math.abs(idxPair.idx1 - idxPair.idx2) + 1) * root.workspaceButtonWidth
-			anchors.margins: root.activeWorkspaceMargin
+			property real indicatorPosition: Math.min(idxPair.idx1, idxPair.idx2) * root.workspaceButtonWidth + root.activeWorkspaceMargin
-			layer.enabled: true
+			property real indicatorThickness: root.workspaceButtonWidth
-			visible: false
-			z: 4
 
-			Grid {
+			anchors.verticalCenter: parent.verticalCenter
-				anchors.fill: parent
+			clip: true
-				columnSpacing: 0
+			color: DynamicColors.palette.m3primary
-				columns: root.workspacesShown
+			implicitHeight: indicatorThickness
-				rowSpacing: 0
+			implicitWidth: indicatorLength
-				rows: 1
+			radius: Appearance.rounding.full
+			x: indicatorPosition
 
-				Repeater {
+			AnimatedTabIndexPair {
-					model: root.workspaces
+				id: idxPair
 
-					Item {
+				index: root.workspaces.findIndex(w => w.active)
-						id: activeWorkspace
-
-						required property int index
-						required property HyprlandWorkspace modelData
-
-						implicitHeight: indicator.indicatorThickness
-						implicitWidth: indicator.indicatorThickness
-						width: root.workspaceButtonWidth
-
-						CustomText {
-							anchors.centerIn: parent
-							color: DynamicColors.palette.m3onPrimary
-							elide: Text.ElideRight
-							horizontalAlignment: Text.AlignHCenter
-							text: activeWorkspace.modelData.name
-							verticalAlignment: Text.AlignVCenter
-						}
-					}
-				}
 			}
-		}
 
-		Item {
+			Coloriser {
-			id: indicatorMask
+				colorizationColor: DynamicColors.palette.m3onPrimary
-
+				implicitHeight: grid.height
-			anchors.fill: bgRect
+				implicitWidth: grid.width
-			layer.enabled: true
+				source: grid
-			visible: false
+				sourceColor: DynamicColors.palette.m3onSurface
-
+				x: -indicator.x + 3
-			CustomRect {
-				color: "white"
-				height: indicator.height
-				radius: indicator.radius
-				width: indicator.width
-				x: indicator.x
-				y: indicator.y
 			}
 		}
-
-		MultiEffect {
-			anchors.fill: activeTextSource
-			maskEnabled: true
-			maskInverted: false
-			maskSource: indicatorMask
-			source: activeTextSource
-			z: 5
-		}
 	}
 }

Modules/Wrapper.qml

@@ -16,11 +16,13 @@ Item {
 	property alias currentName: popoutState.currentName
 	property string detachedMode
 	property alias hasCurrent: popoutState.hasCurrent
+	readonly property bool isDetached: detachedMode.length > 0
 	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
 	required property ShellScreen screen
+	property alias state: popoutState
 
 	function close(): void {
 		hasCurrent = false;
@@ -50,8 +52,6 @@ Item {
 	implicitWidth: nonAnimWidth
 
 	Behavior on implicitHeight {
-		enabled: root.offsetScale < 1
-
 		Anim {
 			duration: root.animLength
 			easing.bezierCurve: root.animCurve
@@ -73,11 +73,14 @@ Item {
 	Comp {
 		id: content
 
+		// anchors.horizontalCenter: parent.horizontalCenter
+		// anchors.top: parent.top
 		anchors.centerIn: parent
 		shouldBeActive: root.hasCurrent && !root.detachedMode
 
 		sourceComponent: Content {
 			popouts: popoutState
+			screen: root.screen
 		}
 	}
 

Plugins/ZShell/Blobs/CMakeLists.txt

@@ -12,6 +12,7 @@ qml_module(ZShell-blobs
 
 qt_add_shaders(ZShell-blobs "blob_shaders"
     BATCHABLE OPTIMIZED NOHLSL NOMSL
+	GLSL "300es,330"
     PREFIX "/"
     FILES
         shaders/blob.frag

Plugins/ZShell/Blobs/blobmaterial.cpp

@@ -2,6 +2,9 @@
 
 #include <cstring>
 
+static_assert(sizeof(decltype(BlobRectData::excludeMask)) == sizeof(float),
+              "BlobMaterial packs excludeMask into a float slot via memcpy");
+
 QSGMaterialType* BlobMaterial::type() const {
 	static QSGMaterialType s_type;
 	return &s_type;
@@ -82,8 +85,11 @@ bool BlobMaterialShader::updateUniformData(RenderState& state, QSGMaterial* newM
 	for (int i = 0; i < count; ++i) {
 		const auto& r = mat->m_rects[i];
 		const int base = 160 + i * 80;
+		// Pack excludeMask into props.x via bit-cast (read in shader with floatBitsToInt)
+		float maskAsFloat;
+		memcpy(&maskAsFloat, &r.excludeMask, sizeof(float));
 		const float d0[4] = { r.cx, r.cy, r.hw, r.hh };
-		const float d1[4] = { 0.0f, r.offsetX, r.offsetY, r.minEig };
+		const float d1[4] = { maskAsFloat, r.offsetX, r.offsetY, r.minEig };
 		const float d3[4] = { r.screenHalfX, r.screenHalfY, 0.0f, 0.0f };
 		memcpy(buf->data() + base, d0, 16);
 		memcpy(buf->data() + base + 16, d1, 16);

Plugins/ZShell/Blobs/blobmaterial.hpp

@@ -14,6 +14,9 @@ struct BlobRectData {
 	float screenHalfX = 0, screenHalfY = 0;
 	// Effective per-corner radii (tr, br, bl, tl), pre-computed on CPU
 	float radius[4] = { 0, 0, 0, 0 };
+	// Bitmask of indices in this rect's m_cachedRects that mutually exclude (or are excluded by) this rect.
+	// Used by the shader to skip smin between excluded pairs.
+	int excludeMask = 0;
 };
 
 class BlobMaterial : public QSGMaterial {

Plugins/ZShell/Blobs/blobrect.cpp

@@ -158,11 +158,12 @@ void BlobRect::setBottomRightRadius(qreal r) {
 }
 
 void BlobRect::cornerRadii(float out[4]) const {
-	const auto base = static_cast<float>(m_radius);
+	const auto maxR = static_cast<float>(std::min(width(), height())) * 0.5f;
-	out[0] = m_topRightRadius >= 0 ? static_cast<float>(m_topRightRadius) : base;
+	const auto base = std::min(static_cast<float>(m_radius), maxR);
-	out[1] = m_bottomRightRadius >= 0 ? static_cast<float>(m_bottomRightRadius) : base;
+	out[0] = std::min(m_topRightRadius >= 0 ? static_cast<float>(m_topRightRadius) : base, maxR);
-	out[2] = m_bottomLeftRadius >= 0 ? static_cast<float>(m_bottomLeftRadius) : base;
+	out[1] = std::min(m_bottomRightRadius >= 0 ? static_cast<float>(m_bottomRightRadius) : base, maxR);
-	out[3] = m_topLeftRadius >= 0 ? static_cast<float>(m_topLeftRadius) : base;
+	out[2] = std::min(m_bottomLeftRadius >= 0 ? static_cast<float>(m_bottomLeftRadius) : base, maxR);
+	out[3] = std::min(m_topLeftRadius >= 0 ? static_cast<float>(m_topLeftRadius) : base, maxR);
 }
 
 bool BlobRect::isExcluded(const BlobShape* other) const {

Plugins/ZShell/Blobs/blobshape.cpp

@@ -72,11 +72,17 @@ void BlobShape::geometryChange(const QRectF& newGeometry, const QRectF& oldGeome
 		// 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());
-		const auto dw = std::abs(newGeometry.width() - oldGeometry.width());
+		// Accumulate size delta across multiple frames so incremental size
-		const auto dh = std::abs(newGeometry.height() - oldGeometry.height());
+		// changes that are each below the threshold still trigger a dirty
-		if (std::abs(m_pendingDx) > 0.5f || std::abs(m_pendingDy) > 0.5f || dw > 0.5 || dh > 0.5) {
+		// mark once their accumulated delta exceeds it.
+		m_pendingDw += static_cast<float>(newGeometry.width() - oldGeometry.width());
+		m_pendingDh += static_cast<float>(newGeometry.height() - oldGeometry.height());
+		if (std::abs(m_pendingDx) > 0.5f || std::abs(m_pendingDy) > 0.5f ||
+		    std::abs(m_pendingDw) > 0.5f || std::abs(m_pendingDh) > 0.5f) {
 			m_pendingDx = 0;
 			m_pendingDy = 0;
+			m_pendingDw = 0;
+			m_pendingDh = 0;
 			m_group->markShapeDirty(this);
 		}
 	}
@@ -96,7 +102,8 @@ void BlobShape::updateCenteredDeformMatrix() {
 }
 
 void BlobShape::cornerRadii(float out[4]) const {
-	const auto r = static_cast<float>(m_radius);
+	const auto maxR = static_cast<float>(std::min(width(), height())) * 0.5f;
+	const auto r = std::min(static_cast<float>(m_radius), maxR);
 	out[0] = r;
 	out[1] = r;
 	out[2] = r;
@@ -148,6 +155,10 @@ void BlobShape::updatePolish() {
 	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());
+
 	for (BlobShape* other : m_group->shapes()) {
 		if (other->isInvertedRect())
 			continue;
@@ -209,12 +220,29 @@ void BlobShape::updatePolish() {
 			r.screenHalfY = std::abs(b) * r.hw + std::abs(d) * r.hh;
 
 			m_cachedRects.append(r);
+			rectShapes.append(other);
 		}
 	}
 
 	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;
+		BlobShape* si = rectShapes[i];
+		for (qsizetype j = 0; j < cachedCount; ++j) {
+			if (j == i)
+				continue;
+			BlobShape* sj = rectShapes[j];
+			if (si->isExcluded(sj) || sj->isExcluded(si))
+				mask |= (1 << j);
+		}
+		m_cachedRects[i].excludeMask = mask;
+	}
+
 	// Cache inverted rect data
 	m_cachedHasInverted = false;
 	m_cachedInvertedRadius = 0;
@@ -269,6 +297,7 @@ void BlobShape::updatePolish() {
 	const auto rectCount = m_cachedRects.size();
 	for (qsizetype i = 0; i < rectCount; ++i) {
 		auto& ri = m_cachedRects[i];
+		const int riExcludeMask = ri.excludeMask;
 		float fTr = 1.0f, fBr = 1.0f, fBl = 1.0f, fTl = 1.0f;
 
 		const float cTrX = ri.cx + ri.hw, cTrY = ri.cy - ri.hh;
@@ -279,6 +308,8 @@ void BlobShape::updatePolish() {
 		for (qsizetype j = 0; j < rectCount; ++j) {
 			if (j == i)
 				continue;
+			if (riExcludeMask & (1 << j))
+				continue;
 			const auto& rj = m_cachedRects[j];
 			fTr = std::min(fTr, cpuSmoothstep(0.0f, smoothFactor, cpuSdBox(cTrX, cTrY, rj.cx, rj.cy, rj.hw, rj.hh)));
 			fBr = std::min(fBr, cpuSmoothstep(0.0f, smoothFactor, cpuSdBox(cBrX, cBrY, rj.cx, rj.cy, rj.hw, rj.hh)));

Plugins/ZShell/Blobs/blobshape.hpp

@@ -84,8 +84,10 @@ QRectF m_localPaddedRect;
 QVector<BlobRectData> m_cachedRects;
 int m_cachedMyIndex = -2;
 float m_pendingDx = 0;
-float m_pendingDy = 0;
+	float m_pendingDy = 0;
-bool m_cachedHasInverted = false;
+	float m_pendingDw = 0;
+	float m_pendingDh = 0;
+	bool m_cachedHasInverted = false;
 float m_cachedInvertedRadius = 0;
 float m_cachedInvertedOuter[4] = {};
 float m_cachedInvertedInner[4] = {};

Plugins/ZShell/Blobs/shaders/blob.frag

@@ -63,13 +63,17 @@ float smaxSharpA(float a, float b, float k) {
 void main() {
   vec2 pixel = vec2(paddedX, paddedY) + qt_TexCoord0 * vec2(paddedW, paddedH);
 
-  float mergedSdf = 1e10;
+  // Phase 1: compute per-rect SDF, track owner. We can't smin yet because
+  // excluded pairs need to skip the smooth blend, which requires pairwise pass
+  // below.
+  float dArr[16];
   int owner = -2;
   float minDist = 1e10;
 
   for (int i = 0; i < rectCount; i++) {
-    vec4 rect = rectData[i * 5];      // cx, cy, hw, hh
+    vec4 rect = rectData[i * 5]; // cx, cy, hw, hh
-    vec4 props = rectData[i * 5 + 1]; // radius, offsetX, offsetY, minEig
+    vec4 props =
+        rectData[i * 5 + 1]; // excludeMask(int bits), offsetX, offsetY, minEig
     vec4 invDm = rectData[i * 5 + 2]; // inverse deform matrix
     vec4 sh = rectData[i * 5 + 3];    // screenHalfX, screenHalfY, 0, 0
     vec4 radii =
@@ -81,8 +85,10 @@ void main() {
     // AABB early-out: skip rects far from this pixel
     vec2 extent = sh.xy + vec2(smoothFactor * 1.5);
     if (abs(pixel.x - center.x) > extent.x ||
-        abs(pixel.y - center.y) > extent.y)
+        abs(pixel.y - center.y) > extent.y) {
+      dArr[i] = 1e10;
       continue;
+    }
 
     // Apply pre-computed inverse deformation to the evaluation point
     mat2 invDeform = mat2(invDm.xy, invDm.zw);
@@ -138,82 +144,38 @@ void main() {
       d *= scale;
     }
 
-    // Rect-to-rect edge sinks: track the same edge of neighboring rects
+    dArr[i] = d;
-    {
-      float rectSinkValue = 0.0;
-      vec2 iHalf = sh.xy;
-      float preOff = smoothFactor * (1.0 / 6.0);
-
-      for (int j = 0; j < rectCount; j++) {
-        if (j == i)
-          continue;
-
-        vec4 jRect = rectData[j * 5];
-        vec4 jProps = rectData[j * 5 + 1];
-        vec2 jSh = rectData[j * 5 + 3].xy;
-        vec2 jCtr = jRect.xy + jProps.yz;
-
-        // Per-edge containment: the other rect's full span on the
-        // perpendicular axis must be inside this rect for that edge.
-        bool hInside = (jCtr.y - jSh.y) >= (center.y - iHalf.y) &&
-                       (jCtr.y + jSh.y) <= (center.y + iHalf.y);
-        bool vInside = (jCtr.x - jSh.x) >= (center.x - iHalf.x) &&
-                       (jCtr.x + jSh.x) <= (center.x + iHalf.x);
-
-        // Top/Bottom: other rect's height must be inside this rect
-        float topPen =
-            hInside ? clamp((center.y - iHalf.y) - (jCtr.y - jSh.y) - preOff,
-                            0.0, smoothFactor)
-                    : 0.0;
-        float botPen =
-            hInside ? clamp((jCtr.y + jSh.y) - (center.y + iHalf.y) - preOff,
-                            0.0, smoothFactor)
-                    : 0.0;
-
-        // Left/Right: other rect's width must be inside this rect
-        float leftPen =
-            vInside ? clamp((center.x - iHalf.x) - (jCtr.x - jSh.x) - preOff,
-                            0.0, smoothFactor)
-                    : 0.0;
-        float rightPen =
-            vInside ? clamp((jCtr.x + jSh.x) - (center.x + iHalf.x) - preOff,
-                            0.0, smoothFactor)
-                    : 0.0;
-
-        // Lateral distance from pixel to other rect's extent along each edge
-        float hLat = max(abs(pixel.x - jCtr.x) - jSh.x, 0.0);
-        float vLat = max(abs(pixel.y - jCtr.y) - jSh.y, 0.0);
-
-        // Perpendicular proximity: full strength at edge, fade inside
-        float topZone =
-            1.0 - smoothstep(center.y - iHalf.y,
-                             center.y - iHalf.y + smoothFactor, pixel.y);
-        float botZone = smoothstep(center.y + iHalf.y - smoothFactor,
-                                   center.y + iHalf.y, pixel.y);
-        float leftZone =
-            1.0 - smoothstep(center.x - iHalf.x,
-                             center.x - iHalf.x + smoothFactor, pixel.x);
-        float rightZone = smoothstep(center.x + iHalf.x - smoothFactor,
-                                     center.x + iHalf.x, pixel.x);
-
-        float s = smoothFactor * 2.0;
-        float sink = max(max(topPen * smoothstep(s, 0.0, hLat) * topZone,
-                             botPen * smoothstep(s, 0.0, hLat) * botZone),
-                         max(leftPen * smoothstep(s, 0.0, vLat) * leftZone,
-                             rightPen * smoothstep(s, 0.0, vLat) * rightZone));
-        rectSinkValue = max(rectSinkValue, sink);
-      }
-
-      d -= rectSinkValue;
-    }
-
-    mergedSdf = smin(mergedSdf, d, smoothFactor);
     if (d < smoothFactor && d < minDist) {
       minDist = d;
       owner = i;
     }
   }
 
+  // Phase 2: hard-min baseline over all rects.
+  float mergedSdf = 1e10;
+  for (int i = 0; i < rectCount; i++) {
+    mergedSdf = min(mergedSdf, dArr[i]);
+  }
+
+  // Phase 3: pair-wise smin contributions, skipping excluded pairs. Pair smin
+  // <= min, so taking the min over all non-excluded pair smins gives the
+  // smoothly-merged SDF.
+  for (int i = 0; i < rectCount; i++) {
+    if (dArr[i] >= 1e9)
+      continue;
+    int excludeMask = floatBitsToInt(rectData[i * 5 + 1].x);
+    for (int j = i + 1; j < rectCount; j++) {
+      if (dArr[j] >= 1e9)
+        continue;
+      if ((excludeMask & (1 << j)) != 0)
+        continue;
+      // smin only deviates from min within smoothFactor
+      if (abs(dArr[i] - dArr[j]) >= smoothFactor)
+        continue;
+      mergedSdf = min(mergedSdf, smin(dArr[i], dArr[j], smoothFactor));
+    }
+  }
+
   if (hasInverted != 0) {
     float dOuter = sdBox(pixel, invertedOuter.xy, invertedOuter.zw) - 1.0;
     float dInner =

Plugins/ZShell/Internal/hyprextras.cpp

@@ -1,217 +1,384 @@
 #include "hyprextras.hpp"
+#include "hyprdevices.hpp"
 
 #include <qdir.h>
 #include <qjsonarray.h>
 #include <qlocalsocket.h>
+#include <qloggingcategory.h>
+#include <qmetatype.h>
+#include <qregularexpression.h>
 #include <qvariant.h>
 
+Q_LOGGING_CATEGORY(lcHypr, "ZShell.internal.hypr", QtInfoMsg)
+
 namespace ZShell::internal::hypr {
 
+namespace {
+
+static QString luaEscapeString(const QString& s) {
+	QString out;
+	out.reserve(s.size() + 2);
+	out += QLatin1Char('"');
+
+	for (const QChar c : s) {
+		switch (c.unicode()) {
+		case '\\':
+			out += QLatin1String(R"(\\)");
+			break;
+		case '"':
+			out += QLatin1String(R"(\")");
+			break;
+		case '\n':
+			out += QLatin1String(R"(\n)");
+			break;
+		case '\r':
+			out += QLatin1String(R"(\r)");
+			break;
+		case '\t':
+			out += QLatin1String(R"(\t)");
+			break;
+		default:
+			out += c;
+			break;
+		}
+	}
+
+	out += QLatin1Char('"');
+	return out;
+}
+
+static QString luaValue(const QVariant& v);
+
+static QString luaArray(const QVariantList& list) {
+	QStringList parts;
+	parts.reserve(list.size());
+
+	for (const auto& item : list) {
+		parts << luaValue(item);
+	}
+
+	return QLatin1String("{ ") + parts.join(QLatin1String(", ")) + QLatin1String(" }");
+}
+
+static QString luaArray(const QStringList& list) {
+	QStringList parts;
+	parts.reserve(list.size());
+
+	for (const auto& item : list) {
+		parts << luaEscapeString(item);
+	}
+
+	return QLatin1String("{ ") + parts.join(QLatin1String(", ")) + QLatin1String(" }");
+}
+
+static QString luaMapFromHash(const QVariantHash& hash) {
+	QStringList parts;
+	parts.reserve(hash.size());
+
+	for (auto it = hash.cbegin(); it != hash.cend(); ++it) {
+		parts << luaEscapeString(it.key()) + QLatin1String(" = ") + luaValue(it.value());
+	}
+
+	return QLatin1String("{ ") + parts.join(QLatin1String(", ")) + QLatin1String(" }");
+}
+
+static QString luaMap(const QVariantMap& map) {
+	QStringList parts;
+	parts.reserve(map.size());
+
+	for (auto it = map.cbegin(); it != map.cend(); ++it) {
+		parts << luaEscapeString(it.key()) + QLatin1String(" = ") + luaValue(it.value());
+	}
+
+	return QLatin1String("{ ") + parts.join(QLatin1String(", ")) + QLatin1String(" }");
+}
+
+static QString luaValue(const QVariant& v) {
+	if (!v.isValid() || v.isNull()) {
+		return QLatin1String("nil");
+	}
+
+	switch (v.metaType().id()) {
+	case QMetaType::Bool:
+		return v.toBool() ? QLatin1String("true") : QLatin1String("false");
+
+	case QMetaType::Int:
+	case QMetaType::UInt:
+	case QMetaType::LongLong:
+	case QMetaType::ULongLong:
+	case QMetaType::Double:
+		return v.toString();
+
+	case QMetaType::QString:
+		return luaEscapeString(v.toString());
+
+	case QMetaType::QStringList:
+		return luaArray(v.toStringList());
+
+	case QMetaType::QVariantList:
+		return luaArray(v.toList());
+
+	case QMetaType::QVariantMap:
+		return luaMap(v.toMap());
+
+	case QMetaType::QVariantHash:
+		return luaMapFromHash(v.toHash());
+
+	default:
+		return luaEscapeString(v.toString());
+	}
+}
+
+static QString normalizeOptionPath(QString key) {
+	key = key.trimmed();
+	key.replace(QLatin1Char(':'), QLatin1Char('.'));
+	return key;
+}
+
+static QString buildHlConfigCall(const QString& key, const QVariant& value) {
+	const auto parts = normalizeOptionPath(key).split(QLatin1Char('.'), Qt::SkipEmptyParts);
+	if (parts.isEmpty()) {
+		return {};
+	}
+
+	QString out;
+	out.reserve(32 + key.size() + value.toString().size());
+	out += QLatin1String("hl.config({ ");
+
+	for (int i = 0; i < parts.size(); ++i) {
+		out += parts.at(i);
+		out += QLatin1String(" = ");
+		if (i + 1 < parts.size()) {
+			out += QLatin1String("{ ");
+		}
+	}
+
+	out += luaValue(value);
+
+	for (int i = 0; i + 1 < parts.size(); ++i) {
+		out += QLatin1String(" }");
+	}
+
+	out += QLatin1String(" })");
+	return out;
+}
+
+} // namespace
+
 HyprExtras::HyprExtras(QObject* parent)
-    : QObject(parent)
+	: QObject(parent)
-    , m_requestSocket("")
+	, m_requestSocket("")
-    , m_eventSocket("")
+	, m_eventSocket("")
-    , m_socket(nullptr)
+	, m_socket(nullptr)
-    , m_socketValid(false)
+	, m_socketValid(false)
-    , m_devices(new HyprDevices(this)) {
+	, m_devices(new HyprDevices(this)) {
-    const auto his = qEnvironmentVariable("HYPRLAND_INSTANCE_SIGNATURE");
+	const auto his = qEnvironmentVariable("HYPRLAND_INSTANCE_SIGNATURE");
-    if (his.isEmpty()) {
+	if (his.isEmpty()) {
-        qWarning()
+		qCWarning(lcHypr) << "$HYPRLAND_INSTANCE_SIGNATURE is unset. Unable to connect to Hyprland socket.";
-            << "HyprExtras::HyprExtras: $HYPRLAND_INSTANCE_SIGNATURE is unset. Unable to connect to Hyprland socket.";
+		return;
-        return;
+	}
-    }
 
-    auto hyprDir = QString("%1/hypr/%2").arg(qEnvironmentVariable("XDG_RUNTIME_DIR"), his);
+	auto hyprDir = QString("%1/hypr/%2").arg(qEnvironmentVariable("XDG_RUNTIME_DIR"), his);
-    if (!QDir(hyprDir).exists()) {
+	if (!QDir(hyprDir).exists()) {
-        hyprDir = "/tmp/hypr/" + his;
+		hyprDir = QStringLiteral("/tmp/hypr/") + his;
 
-        if (!QDir(hyprDir).exists()) {
+		if (!QDir(hyprDir).exists()) {
-            qWarning() << "HyprExtras::HyprExtras: Hyprland socket directory does not exist. Unable to connect to "
+			qCWarning(lcHypr) << "Hyprland socket directory does not exist. Unable to connect to Hyprland socket.";
-                          "Hyprland socket.";
+			return;
-            return;
+		}
-        }
+	}
-    }
 
-    m_requestSocket = hyprDir + "/.socket.sock";
+	m_requestSocket = hyprDir + QStringLiteral("/.socket.sock");
-    m_eventSocket = hyprDir + "/.socket2.sock";
+	m_eventSocket = hyprDir + QStringLiteral("/.socket2.sock");
 
-    refreshOptions();
+	refreshOptions();
-    refreshDevices();
+	refreshDevices();
 
-    m_socket = new QLocalSocket(this);
+	m_socket = new QLocalSocket(this);
 
-    QObject::connect(m_socket, &QLocalSocket::errorOccurred, this, &HyprExtras::socketError);
+	QObject::connect(m_socket, &QLocalSocket::errorOccurred, this, &HyprExtras::socketError);
-    QObject::connect(m_socket, &QLocalSocket::stateChanged, this, &HyprExtras::socketStateChanged);
+	QObject::connect(m_socket, &QLocalSocket::stateChanged, this, &HyprExtras::socketStateChanged);
-    QObject::connect(m_socket, &QLocalSocket::readyRead, this, &HyprExtras::readEvent);
+	QObject::connect(m_socket, &QLocalSocket::readyRead, this, &HyprExtras::readEvent);
 
-    m_socket->connectToServer(m_eventSocket, QLocalSocket::ReadOnly);
+	m_socket->connectToServer(m_eventSocket, QLocalSocket::ReadOnly);
 }
 
 QVariantHash HyprExtras::options() const {
-    return m_options;
+	return m_options;
 }
 
 HyprDevices* HyprExtras::devices() const {
-    return m_devices;
+	return m_devices;
 }
 
 void HyprExtras::message(const QString& message) {
-    if (message.isEmpty()) {
+	if (message.isEmpty()) {
-        return;
+		return;
-    }
+	}
 
-    makeRequest(message, [](bool success, const QByteArray& res) {
+	makeRequest(message, [](bool success, const QByteArray& res) {
-        if (!success) {
+			if (!success) {
-            qWarning() << "HyprExtras::message: request error:" << QString::fromUtf8(res);
+				qCWarning(lcHypr) << "message: request error:" << QString::fromUtf8(res);
-        }
+			}
-    });
+		});
 }
 
 void HyprExtras::batchMessage(const QStringList& messages) {
-    if (messages.isEmpty()) {
+	if (messages.isEmpty()) {
-        return;
+		return;
-    }
+	}
 
-    makeRequest("[[BATCH]]" + messages.join(";"), [](bool success, const QByteArray& res) {
+	makeRequest(QStringLiteral("[[BATCH]]") + messages.join(QLatin1Char(';')),
-        if (!success) {
+	            [](bool success, const QByteArray& res) {
-            qWarning() << "HyprExtras::batchMessage: request error:" << QString::fromUtf8(res);
+			if (!success) {
-        }
+				qCWarning(lcHypr) << "batchMessage: request error:" << QString::fromUtf8(res);
-    });
+			}
+		});
 }
 
 void HyprExtras::applyOptions(const QVariantHash& options) {
-    if (options.isEmpty()) {
+	if (options.isEmpty()) {
-        return;
+		return;
-    }
+	}
 
-    QString request = "[[BATCH]]";
+	QStringList calls;
-    for (auto it = options.constBegin(); it != options.constEnd(); ++it) {
+	calls.reserve(options.size());
-        request += QString("keyword %1 %2;").arg(it.key(), it.value().toString());
-    }
 
-    makeRequest(request, [this](bool success, const QByteArray& res) {
+	for (auto it = options.constBegin(); it != options.constEnd(); ++it) {
-        if (success) {
+		const auto call = buildHlConfigCall(it.key(), it.value());
-            refreshOptions();
+		if (!call.isEmpty()) {
-        } else {
+			calls << call;
-            qWarning() << "HyprExtras::applyOptions: request error" << QString::fromUtf8(res);
+		}
-        }
+	}
-    });
+
+	if (calls.isEmpty()) {
+		return;
+	}
+
+	makeRequest(QStringLiteral("eval ") + calls.join(QLatin1String("; ")), [this](bool success, const QByteArray& res) {
+			if (success) {
+				refreshOptions();
+			} else {
+				qCWarning(lcHypr) << "applyOptions: request error" << QString::fromUtf8(res);
+			}
+		});
 }
 
 void HyprExtras::refreshOptions() {
-    if (!m_optionsRefresh.isNull()) {
+	if (!m_optionsRefresh.isNull()) {
-        m_optionsRefresh->close();
+		m_optionsRefresh->close();
-    }
+	}
 
-    m_optionsRefresh = makeRequestJson("descriptions", [this](bool success, const QJsonDocument& response) {
+	m_optionsRefresh = makeRequestJson(QStringLiteral("descriptions"), [this](bool success, const QJsonDocument& response) {
-        m_optionsRefresh.reset();
+			m_optionsRefresh.reset();
-        if (!success) {
+			if (!success) {
-            return;
+				return;
-        }
+			}
 
-        const auto options = response.array();
+			const auto options = response.array();
-        bool dirty = false;
+			bool dirty = false;
 
-        for (const auto& o : std::as_const(options)) {
+			for (const auto& o : std::as_const(options)) {
-            const auto obj = o.toObject();
+				const auto obj = o.toObject();
-            const auto key = obj.value("value").toString();
+				const auto key = obj.value(QStringLiteral("value")).toString();
-            const auto value = obj.value("data").toObject().value("current").toVariant();
+				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) {
+				if (m_options.value(key) != value) {
-            emit optionsChanged();
+					dirty = true;
-        }
+					m_options.insert(key, value);
-    });
+				}
+			}
+
+			if (dirty) {
+				emit optionsChanged();
+			}
+		});
 }
 
 void HyprExtras::refreshDevices() {
-    if (!m_devicesRefresh.isNull()) {
+	if (!m_devicesRefresh.isNull()) {
-        m_devicesRefresh->close();
+		m_devicesRefresh->close();
-    }
+	}
 
-    m_devicesRefresh = makeRequestJson("devices", [this](bool success, const QJsonDocument& response) {
+	m_devicesRefresh = makeRequestJson(QStringLiteral("devices"), [this](bool success, const QJsonDocument& response) {
-        m_devicesRefresh.reset();
+			m_devicesRefresh.reset();
-        if (success) {
+			if (success) {
-            m_devices->updateLastIpcObject(response.object());
+				m_devices->updateLastIpcObject(response.object());
-        }
+			}
-    });
+		});
 }
 
 void HyprExtras::socketError(QLocalSocket::LocalSocketError error) const {
-    if (!m_socketValid) {
+	if (!m_socketValid) {
-        qWarning() << "HyprExtras::socketError: unable to connect to Hyprland event socket:" << error;
+		qCWarning(lcHypr) << "socketError: unable to connect to Hyprland event socket:" << error;
-    } else {
+	} else {
-        qWarning() << "HyprExtras::socketError: Hyprland event socket error:" << error;
+		qCWarning(lcHypr) << "socketError: Hyprland event socket error:" << error;
-    }
+	}
 }
 
 void HyprExtras::socketStateChanged(QLocalSocket::LocalSocketState state) {
-    if (state == QLocalSocket::UnconnectedState && m_socketValid) {
+	if (state == QLocalSocket::UnconnectedState && m_socketValid) {
-        qWarning() << "HyprExtras::socketStateChanged: Hyprland event socket disconnected.";
+		qCWarning(lcHypr) << "socketStateChanged: Hyprland event socket disconnected.";
-    }
+	}
 
-    m_socketValid = state == QLocalSocket::ConnectedState;
+	m_socketValid = state == QLocalSocket::ConnectedState;
 }
 
 void HyprExtras::readEvent() {
-    while (true) {
+	while (true) {
-        auto rawEvent = m_socket->readLine();
+		auto rawEvent = m_socket->readLine();
-        if (rawEvent.isEmpty()) {
+		if (rawEvent.isEmpty()) {
-            break;
+			break;
-        }
+		}
-        rawEvent.truncate(rawEvent.length() - 1); // Remove trailing \n
+		rawEvent.truncate(rawEvent.length() - 1);
-        const auto event = QByteArrayView(rawEvent.data(), rawEvent.indexOf(">>"));
+		const auto event = QByteArrayView(rawEvent.data(), rawEvent.indexOf(">>"));
-        handleEvent(QString::fromUtf8(event));
+		handleEvent(QString::fromUtf8(event));
-    }
+	}
 }
 
 void HyprExtras::handleEvent(const QString& event) {
-    if (event == "configreloaded") {
+	if (event == QStringLiteral("configreloaded")) {
-        refreshOptions();
+		refreshOptions();
-    } else if (event == "activelayout") {
+	} else if (event == QStringLiteral("activelayout")) {
-        refreshDevices();
+		refreshDevices();
-    }
+	}
 }
 
 HyprExtras::SocketPtr HyprExtras::makeRequestJson(
-    const QString& request, const std::function<void(bool, QJsonDocument)>& callback) {
+	const QString& request, const std::function<void(bool, QJsonDocument)>& callback) {
-    return makeRequest("j/" + request, [callback](bool success, const QByteArray& response) {
+	return makeRequest(QStringLiteral("j/") + request, [callback](bool success, const QByteArray& response) {
-        callback(success, QJsonDocument::fromJson(response));
+			callback(success, QJsonDocument::fromJson(response));
-    });
+		});
 }
 
 HyprExtras::SocketPtr HyprExtras::makeRequest(
-    const QString& request, const std::function<void(bool, QByteArray)>& callback) {
+	const QString& request, const std::function<void(bool, QByteArray)>& callback) {
-    if (m_requestSocket.isEmpty()) {
+	if (m_requestSocket.isEmpty()) {
-        return SocketPtr();
+		return SocketPtr();
-    }
+	}
 
-    auto socket = SocketPtr::create(this);
+	auto socket = SocketPtr::create(this);
 
-    QObject::connect(socket.data(), &QLocalSocket::connected, this, [=, this]() {
+	QObject::connect(socket.data(), &QLocalSocket::connected, this, [=, this]() {
-        QObject::connect(socket.data(), &QLocalSocket::readyRead, this, [socket, callback]() {
+			QObject::connect(socket.data(), &QLocalSocket::readyRead, this, [socket, callback]() {
-            const auto response = socket->readAll();
+				const auto response = socket->readAll();
-            callback(true, std::move(response));
+				callback(true, std::move(response));
-            socket->close();
+				socket->close();
-        });
+			});
 
-        socket->write(request.toUtf8());
+			socket->write(request.toUtf8());
-        socket->flush();
+			socket->flush();
-    });
+		});
 
-    QObject::connect(socket.data(), &QLocalSocket::errorOccurred, this, [=](QLocalSocket::LocalSocketError err) {
+	QObject::connect(socket.data(), &QLocalSocket::errorOccurred, this, [=](QLocalSocket::LocalSocketError err) {
-        qWarning() << "HyprExtras::makeRequest: error making request:" << err << "| request:" << request;
+			qCWarning(lcHypr) << "makeRequest: error making request:" << err << "| request:" << request;
-        callback(false, {});
+			callback(false, {});
-        socket->close();
+			socket->close();
-    });
+		});
 
-    socket->connectToServer(m_requestSocket);
+	socket->connectToServer(m_requestSocket);
 
-    return socket;
+	return socket;
 }
 
 } // namespace ZShell::internal::hypr