Merge pull request 'feat: video wallpapers' (#163) from feat/video-wallpaper into main

Reviewed-on: #163

-a

@@ -0,0 +1,3 @@
+
+#omz revision: d2b7f557cceaddb16ba89bbf8200d8a8df35c4d8
+#omz fpath: /home/zach/.oh-my-zsh/plugins/colored-man-pages /home/zach/.oh-my-zsh/plugins/universalarchive /home/zach/.oh-my-zsh/plugins/tldr /home/zach/.oh-my-zsh/plugins/extract /home/zach/.oh-my-zsh/plugins/copypath /home/zach/.oh-my-zsh/plugins/cp /home/zach/.oh-my-zsh/plugins/conda-env /home/zach/.oh-my-zsh/plugins/command-not-found /home/zach/.oh-my-zsh/plugins/dirhistory /home/zach/.oh-my-zsh/plugins/copybuffer /home/zach/.oh-my-zsh/plugins/copyfile /home/zach/.oh-my-zsh/custom/plugins/fast-syntax-highlighting /home/zach/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting /home/zach/.oh-my-zsh/custom/plugins/zsh-autosuggestions /home/zach/.oh-my-zsh/plugins/archlinux /home/zach/.oh-my-zsh/plugins/web-search /home/zach/.oh-my-zsh/plugins/sudo /home/zach/.oh-my-zsh/plugins/git /home/zach/.oh-my-zsh/functions /home/zach/.oh-my-zsh/completions /home/zach/.oh-my-zsh/custom/functions /home/zach/.oh-my-zsh/custom/completions /home/zach/tools/ripgrep/complete /home/linuxbrew/.linuxbrew/share/zsh/site-functions /home/zach/.oh-my-zsh/plugins/colored-man-pages /home/zach/.oh-my-zsh/plugins/universalarchive /home/zach/.oh-my-zsh/plugins/tldr /home/zach/.oh-my-zsh/plugins/extract /home/zach/.oh-my-zsh/plugins/copypath /home/zach/.oh-my-zsh/plugins/cp /home/zach/.oh-my-zsh/plugins/conda-env /home/zach/.oh-my-zsh/plugins/command-not-found /home/zach/.oh-my-zsh/plugins/dirhistory /home/zach/.oh-my-zsh/plugins/copybuffer /home/zach/.oh-my-zsh/plugins/copyfile /home/zach/.oh-my-zsh/custom/plugins/fast-syntax-highlighting /home/zach/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting /home/zach/.oh-my-zsh/custom/plugins/zsh-autosuggestions /home/zach/.oh-my-zsh/plugins/archlinux /home/zach/.oh-my-zsh/plugins/web-search /home/zach/.oh-my-zsh/plugins/sudo /home/zach/.oh-my-zsh/plugins/git /home/zach/.oh-my-zsh/functions /home/zach/.oh-my-zsh/completions /home/zach/.oh-my-zsh/custom/functions /home/zach/.oh-my-zsh/custom/completions /home/zach/.oh-my-zsh/cache/completions /home/zach/tools/ripgrep/complete /home/linuxbrew/.linuxbrew/share/zsh/site-functions /usr/local/share/zsh/site-functions /usr/share/zsh/site-functions /usr/share/zsh/functions/Calendar /usr/share/zsh/functions/Chpwd /usr/share/zsh/functions/Completion /usr/share/zsh/functions/Completion/Base /usr/share/zsh/functions/Completion/Linux /usr/share/zsh/functions/Completion/Unix /usr/share/zsh/functions/Completion/X /usr/share/zsh/functions/Completion/Zsh /usr/share/zsh/functions/Exceptions /usr/share/zsh/functions/MIME /usr/share/zsh/functions/Math /usr/share/zsh/functions/Misc /usr/share/zsh/functions/Newuser /usr/share/zsh/functions/Prompts /usr/share/zsh/functions/TCP /usr/share/zsh/functions/VCS_Info /usr/share/zsh/functions/VCS_Info/Backends /usr/share/zsh/functions/Zftp /usr/share/zsh/functions/Zle /home/zach/.zfunc

.gitea/workflows/ci-image.yml

@@ -18,7 +18,7 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Install Docker CLI
-              run: apk add --no-cache docker-cli docker-cli-buildx
+              run: apk add --no-cache docker-cli
 
             - name: Login to registry
               run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login git.aramjonghu.dev --username aramjonghu --password-stdin

.gitea/workflows/cpp.yml

@@ -20,10 +20,28 @@ jobs:
                     -exec clang-format -i --style=file {} +
                   git diff --exit-code && echo "clang-format: passed"
 
-    build & lint:
+    build:
         runs-on: alpine
         container:
             image: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Configure
+              run: cmake -B build -G Ninja -DENABLE_MODULES=plugin -DCMAKE_BUILD_TYPE=Release
+
+            - name: Build
+              run: ninja -C build
+
+    clang-tidy:
+        runs-on: alpine
+        container:
+            image: git.aramjonghu.dev/aramjonghu/zshell-ci:latest
+
         steps:
             - name: Checkout
               uses: actions/checkout@v4

.gitea/workflows/js-ts.yml

@@ -4,7 +4,7 @@ on:
     pull_request:
 
 jobs:
-    fmt & lint:
+    fmt:
         runs-on: alpine
         container: node:26-alpine
 
@@ -24,6 +24,20 @@ jobs:
                   else
                     echo "No JS/TS files found"
                   fi
+
+    lint:
+        runs-on: alpine
+        container: node:26-alpine
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Install tools
+              run: |
+                  apk add --no-cache \
+                    git
+
             - 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

.gitea/workflows/python.yml

@@ -7,7 +7,7 @@ on:
     pull_request:
 
 jobs:
-    fmt & lint:
+    static:
         runs-on: debian
         container: node:26-trixie-slim
 
@@ -33,7 +33,7 @@ jobs:
                   . .venv/bin/activate
                   ruff check .
 
-    test & nuitka build:
+    verify:
         if: always()
         runs-on: debian
         container: node:26-trixie-slim

.gitea/workflows/rust.yml

@@ -3,9 +3,8 @@ name: Rust
 on:
     pull_request:
 
-# jobs can be separated if we integrate tests
 jobs:
-    build, clippy & fmt:
+    build:
         runs-on: alpine
         container: node:26-alpine
         env:
@@ -35,9 +34,7 @@ jobs:
                   apk add --no-cache \
                     git \
                     cargo \
-                    rust \
-                    rust-clippy \
-                    rustfmt
+                    rust
 
             - name: Cargo check
               run: |
@@ -53,22 +50,40 @@ jobs:
                   else
                     echo "No Rust project found"
                   fi
-            - name: Clippy
+
+    fmt:
+        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-fmt-${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
+                  restore-keys: |
+                      rust-${{ runner.os }}-build-${{ env.cache-name }}-
+                      rust-${{ runner.os }}-build-
+                      rust-
+
+            - name: Install tools
               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
+                  apk add --no-cache \
+                    git \
+                    cargo \
+                    rust \
+                    rustfmt
+
             - name: Format check
               run: |
                   if [ -n "$(find . -name "Cargo.toml" -print -quit)" ]; then
@@ -85,3 +100,53 @@ jobs:
                   else
                     echo "No Rust project found"
                   fi
+
+    clippy:
+        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-clippy-${{ runner.os }}-${{ 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 \
+                    rust-clippy
+
+            - 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

CMakeLists.txt

@@ -50,6 +50,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(QT_NO_PRIVATE_MODULE_WARNING ON)
 set(ENABLE_MODULES "plugin;shell;cli;m3shapes" CACHE STRING "Modules to build/install")
 
 set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")

Components/ClipRect.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import Quickshell
 import ZShell.Components
 
 Item {
@@ -19,7 +20,7 @@ Item {
 	}
 
 	ShaderEffectSource {
-		id: source
+		id: src
 
 		hideSource: true
 		sourceItem: contentItem
@@ -27,7 +28,7 @@ Item {
 
 	RoundedMask {
 		anchors.fill: parent
-		source: source
+		source: src
 		topLeftRadius: root.topLeftRadius
 		topRightRadius: root.topRightRadius
 		bottomRightRadius: root.bottomRightRadius

Components/HorizontalScrollBarTrack.qml

@@ -2,17 +2,18 @@ import QtQuick
 import ZShell.Config
 import qs.Services
 
-CustomClippingRect {
+Item {
 	id: track
 
 	required property var scrollBar
 	required property var mouseArea
 
+	ClipRect {
+		radius: Tokens.rounding.full
 		anchors.left: parent.left
 		anchors.right: parent.right
 		anchors.bottom: parent.bottom
 		implicitHeight: handle.implicitHeight
-	radius: Tokens.rounding.full
 
 		CustomRect {
 			id: handle
@@ -53,4 +54,5 @@ CustomClippingRect {
 				hoverEnabled: true
 			}
 		}
+	}
 }

Components/Menu.qml

@@ -34,7 +34,7 @@ MouseArea {
 	cursorShape: expanded ? Qt.ArrowCursor : undefined
 	enabled: expanded
 	hoverEnabled: expanded
-	layer.enabled: opacity < 1
+	layer.enabled: false
 	opacity: expanded ? 1 : 0
 	parent: {
 		const win = QsWindow.window;
@@ -101,8 +101,7 @@ MouseArea {
 			yScale: root.expanded ? 1 : 0.1
 
 			Behavior on yScale {
-				Anim {
-				}
+				Anim {}
 			}
 		}
 
@@ -137,8 +136,7 @@ MouseArea {
 						radius: menu.radius - column.anchors.margins
 
 						Behavior on radius {
-							Anim {
-							}
+							Anim {}
 						}
 
 						StateLayer {

Components/TextFieldBase.qml

@@ -12,7 +12,7 @@ TextField {
 	implicitHeight: contentHeight + topPadding + bottomPadding
 	implicitWidth: contentWidth + leftPadding + rightPadding
 	placeholderTextColor: Colors.palette.m3onSurfaceVariant // No anim cause placeholder is custom
-	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.QtRendering
+	renderType: TextField.QtRendering
 	selectedTextColor: color
 	selectionColor: Qt.alpha(Colors.palette.m3primary, 0.4)
 	verticalAlignment: TextInput.AlignVCenter

Components/VerticalFadeFlickable.qml

@@ -30,7 +30,7 @@ CustomFlickable {
 			type: Anim.SlowEffects
 		}
 	}
-	// layer.textureSize: Qt.size(width * dpr, height * dpr)
+	layer.textureSize: Qt.size(width * dpr, height * dpr)
 	layer.effect: Mask {
 		maskSource: mask
 

Components/VerticalScrollBarTrack.qml

@@ -2,17 +2,18 @@ import QtQuick
 import ZShell.Config
 import qs.Services
 
-CustomClippingRect {
+Item {
 	id: track
 
 	required property var scrollBar
 	required property var mouseArea
 
+	ClipRect {
 		anchors.bottom: parent.bottom
 		anchors.right: parent.right
 		anchors.top: parent.top
-	implicitWidth: handle.implicitWidth
 		radius: Tokens.rounding.full
+		implicitWidth: handle.implicitWidth
 
 		CustomRect {
 			id: handle
@@ -53,4 +54,5 @@ CustomClippingRect {
 				hoverEnabled: true
 			}
 		}
+	}
 }

Drawers/Exclusions.qml

@@ -43,13 +43,6 @@ Scope {
 		hasBar: root.geometry.barOnBottom
 	}
 
-	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 {
 		property bool hasBar
 
@@ -59,7 +52,6 @@ Scope {
 		name: "Bar-Exclusion"
 		screen: root.screen
 
-		mask: Region {
-		}
+		mask: Region {}
 	}
 }

Drawers/Panels.qml

@@ -19,15 +19,11 @@ import ZShell.Config
 Item {
 	id: root
 
-	required property Item bar
-	required property real borderThickness
 	readonly property alias clipboard: clipboard
 	readonly property alias dashboard: dashboard
 	readonly property alias dashboardWrapper: dashboardWrapper
 	readonly property alias dock: dock
 	readonly property alias drawing: drawing
-	required property var drawingItem
-	required property EdgeGeometry geometry
 	readonly property alias launcher: launcher
 	readonly property alias notifications: notifications
 	readonly property alias osd: osd
@@ -36,14 +32,19 @@ Item {
 	readonly property alias popoutsWrapper: popouts
 	readonly property alias resources: resources
 	readonly property alias resourcesWrapper: resourcesWrapper
-	required property ShellScreen screen
-	required property ScreenState screenState
 	readonly property alias settings: settings
 	readonly property alias settingsWrapper: settingsWrapper
 	readonly property alias sidebar: sidebar
 	readonly property alias toasts: toasts
 	readonly property alias utilities: utilities
 
+	required property Item bar
+	required property real borderThickness
+	required property var drawingItem
+	required property EdgeGeometry geometry
+	required property ShellScreen screen
+	required property ScreenState screenState
+
 	anchors.bottomMargin: geometry.insetBottom(borderThickness)
 	anchors.fill: parent
 	anchors.leftMargin: geometry.insetLeft(borderThickness)

Greeter/Center.qml

@@ -27,27 +27,21 @@ ColumnLayout {
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
-			font.bold: true
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
 			text: Time.hourStr
 		}
 
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3primary
-			font.bold: true
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
 			text: ":"
 		}
 
 		CustomText {
 			Layout.alignment: Qt.AlignVCenter
 			color: Colors.palette.m3secondary
-			font.bold: true
-			font.family: Config.appearance.font.family.clock
-			font.pointSize: Math.floor(Tokens.font.size.extraLarge * 3 * root.centerScale)
+			font: Tokens.font.headline.builders.large.scale(3 * root.centerScale).weight(Font.Bold).width(30).build()
 			text: Time.minuteStr
 		}
 	}
@@ -56,13 +50,11 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: -Tokens.padding.large * 2
 		color: Colors.palette.m3tertiary
-		font.bold: true
-		font.family: Config.appearance.font.family.mono
-		font.pointSize: Math.floor(Tokens.font.size.extraLarge * root.centerScale)
+		font: Tokens.font.title.builders.medium.weight(Font.DemiBold).build()
 		text: Time.format("dddd, d MMMM yyyy")
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: Tokens.spacing.largeIncreased * 2
 		color: Colors.tPalette.m3surfaceContainer
@@ -73,7 +65,7 @@ ColumnLayout {
 		MaterialIcon {
 			anchors.centerIn: parent
 			color: Colors.palette.m3onSurfaceVariant
-			font.pointSize: Math.floor(root.centerWidth / 4)
+			fontStyle: Tokens.font.icon.size(root.centerWidth / 4).build()
 			text: "person"
 		}
 
@@ -88,9 +80,7 @@ ColumnLayout {
 	CustomText {
 		Layout.alignment: Qt.AlignHCenter
 		color: Colors.palette.m3onSurfaceVariant
-		font.family: Config.appearance.font.family.mono
-		font.pointSize: Tokens.font.size.normal
-		font.weight: 600
+		font: Tokens.font.body.large
 		text: root.greeter.username
 		visible: text.length > 0
 	}
@@ -155,8 +145,7 @@ ColumnLayout {
 					}
 
 					Behavior on opacity {
-						Anim {
-						}
+						Anim {}
 					}
 				}
 
@@ -191,7 +180,6 @@ ColumnLayout {
 
 					anchors.centerIn: parent
 					color: root.greeter.buffer && !root.greeter.launching ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
-					font.weight: 500
 					text: root.greeter.launching ? "hourglass_top" : "arrow_forward"
 				}
 			}
@@ -204,8 +192,7 @@ ColumnLayout {
 		implicitHeight: Math.max(message.implicitHeight, stateMessage.implicitHeight)
 
 		Behavior on implicitHeight {
-			Anim {
-			}
+			Anim {}
 		}
 
 		CustomText {
@@ -245,12 +232,10 @@ ColumnLayout {
 			wrapMode: Text.WrapAtWordBoundaryOrAnywhere
 
 			Behavior on opacity {
-				Anim {
-				}
+				Anim {}
 			}
 			Behavior on scale {
-				Anim {
-				}
+				Anim {}
 			}
 
 			onMsgChanged: {
@@ -292,8 +277,7 @@ ColumnLayout {
 			anchors.left: parent.left
 			anchors.right: parent.right
 			color: isError ? Colors.palette.m3error : Colors.palette.m3primary
-			font.family: Config.appearance.font.family.mono
-			font.pointSize: Tokens.font.size.small
+			font: Tokens.font.mono.medium
 			horizontalAlignment: Qt.AlignHCenter
 			opacity: 0
 			scale: 0.7

Greeter/Components/CircularIndicator.qml

@@ -20,7 +20,7 @@ BusyIndicator {
 	property int animState
 	property color bgColor: Colors.palette.m3secondaryContainer
 	property color fgColor: Colors.palette.m3primary
-	property real implicitSize: Tokens.font.size.normal * 3
+	property real implicitSize: Tokens.font.body.medium.pointSize * 3
 	property real internalStrokeWidth: strokeWidth
 	readonly property alias progress: manager.progress
 	property real strokeWidth: Tokens.padding.extraSmall * 0.8

Greeter/Components/ClipRect.qml

@@ -0,0 +1,41 @@
+import QtQuick
+import ZShell.Components
+
+Item {
+	id: root
+
+	property real radius
+	property real topLeftRadius: radius
+	property real topRightRadius: radius
+	property real bottomRightRadius: radius
+	property real bottomLeftRadius: radius
+	property color color: "transparent"
+	default property alias contentData: contentItem.data
+
+	Item {
+		id: contentItem
+
+		anchors.fill: parent
+	}
+
+	ShaderEffectSource {
+		id: source
+
+		hideSource: true
+		sourceItem: contentItem
+	}
+
+	RoundedMask {
+		anchors.fill: parent
+		source: source
+		topLeftRadius: root.topLeftRadius
+		topRightRadius: root.topRightRadius
+		bottomRightRadius: root.bottomRightRadius
+		bottomLeftRadius: root.bottomLeftRadius
+		color: root.color
+	}
+
+	Behavior on color {
+		CAnim {}
+	}
+}

Greeter/Components/CustomFlickable.qml

@@ -1,13 +1,36 @@
 import QtQuick
+import qs.Services
 
 Flickable {
 	id: root
 
+	property bool doneFakeFlick
+
+	interactive: !ShellState.forActive().isDrawing
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {
+		onRunningChanged: {
+			if (!running && !root.doneFakeFlick) {
+				root.doneFakeFlick = true;
+				root.flick(1, 1);
+				root.flick(-1, -1);
+				Qt.callLater(() => root.cancelFlick());
+			}
+		}
+
 		Anim {
 			properties: "x,y"
 		}
 	}
+
+	Timer {
+		interval: 10
+		running: root.doneFakeFlick
+
+		onTriggered: {
+			root.doneFakeFlick = false;
+			root.returnToBounds();
+		}
+	}
 }

Greeter/Components/CustomListView.qml

@@ -1,13 +1,36 @@
 import QtQuick
+import qs.Services
 
 ListView {
 	id: root
 
+	property bool doneFakeFlick
+
+	interactive: !ShellState.forActive()?.isDrawing
 	maximumFlickVelocity: 3000
 
 	rebound: Transition {
+		// onRunningChanged: {
+		// 	if (!running && !root.doneFakeFlick) {
+		// 		root.doneFakeFlick = true;
+		// 		root.flick(1, 1);
+		// 		root.flick(-1, -1);
+		// 		Qt.callLater(() => root.cancelFlick());
+		// 	}
+		// }
+
 		Anim {
 			properties: "x,y"
+			type: Anim.DefaultEffects
 		}
 	}
+
+	// Timer {
+	// 	interval: 10
+	// 	running: root.doneFakeFlick
+	//
+	// 	onTriggered: {
+	// 		root.doneFakeFlick = false;
+	// 	}
+	// }
 }

Greeter/Components/CustomMouseArea.qml

@@ -4,6 +4,7 @@ MouseArea {
 	property int scrollAccumulatedY: 0
 
 	function onWheel(event: WheelEvent): void {
+		event.accepted = false;
 	}
 
 	onWheel: event => {

Greeter/Components/CustomRect.qml

@@ -6,7 +6,6 @@ Rectangle {
 	color: "transparent"
 
 	Behavior on color {
-		CAnim {
-		}
+		CAnim {}
 	}
 }

Greeter/Components/CustomText.qml

@@ -14,10 +14,9 @@ Text {
 	property real animateTo: 1
 
 	color: Colors.palette.m3onSurface
-	font.family: Config.appearance.font.family.sans
-	font.pointSize: Tokens.font.size.normal
+	font: Tokens.font.body.small
 	linkColor: Colors.palette.m3onPrimaryFixedVariant
-	renderType: Text.NativeRendering
+	renderType: Text.QtRendering
 	textFormat: Text.PlainText
 
 	Behavior on color {
@@ -28,22 +27,25 @@ Text {
 		enabled: root.animate
 
 		SequentialAnimation {
-			Anim {
+			TAnim {
+				target: root
 				to: root.animateFrom
+				type: Anim.FastEffects
 			}
 
 			PropertyAction {
 			}
 
-			Anim {
+			TAnim {
+				target: root
 				to: root.animateTo
+				type: Anim.DefaultEffects
 			}
 		}
 	}
 
-	component Anim: NumberAnimation {
+	component TAnim: Anim {
 		duration: root.animateDuration / 2
-		easing.type: Easing.BezierSpline
 		properties: root.animateProp.split(",").length > 1 ? root.animateProp : ""
 		property: root.animateProp.split(",").length === 1 ? root.animateProp : ""
 		target: root

Greeter/Components/CustomTextField.qml

@@ -1,76 +1,305 @@
 pragma ComponentBehavior: Bound
 
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Shapes
 import ZShell.Config
 import qs.Services
 
-TextField {
+TextFieldBase {
 	id: root
 
-	background: null
-	color: Colors.palette.m3onSurface
-	cursorVisible: !readOnly
-	font.family: Config.appearance.font.family.sans
-	font.pointSize: Tokens.font.size.smaller
-	placeholderTextColor: Colors.palette.m3outline
-	renderType: echoMode === TextField.Password ? TextField.QtRendering : TextField.NativeRendering
+	enum TextFieldType {
+		Outlined,
+		Filled
+	}
 
-	Behavior on color {
-		CAnim {
+	readonly property int clampedRadius: Math.min(horizontalPadding, Math.min(width, height) / 2, radius)
+	readonly property string effectiveSupportingText: isError && errorText ? errorText : supportingText
+	readonly property int filledOffset: type === CustomTextField.Filled ? Tokens.spacing.small : 0
+	readonly property int leadingOffset: leadingIcon ? leadingIconLoader.width + leadingIconLoader.anchors.leftMargin : 0
+	readonly property real smallFontScale: smallFontSize / font.pointSize
+	readonly property int supportingTextOffset: effectiveSupportingText ? supportingTextLoader.height + Tokens.spacing.extraSmall : 0
+	readonly property int trailingOffset: trailingIcon ? trailingIconLoader.width + trailingIconLoader.anchors.rightMargin : 0
+	readonly property bool valid: !validate || (!text && emptyIsValid) || (validate instanceof RegExp ? validate.test(text) : !!validate(text))
+
+	property int horizontalPadding: Tokens.padding.large
+	property int verticalPadding: Tokens.padding.large
+
+	property int radius: Tokens.rounding.small
+
+	property string supportingText
+	property string trailingIcon
+	property int smallFontSize: Tokens.font.label.small.pointSize
+
+	property int type: CustomTextField.Outlined
+	property var validate // Regex or function
+	property bool emptyIsValid: true
+	property string errorText
+	property bool isError
+	property string leadingIcon
+
+	bottomPadding: verticalPadding + supportingTextOffset - filledOffset
+	leftPadding: horizontalPadding + leadingOffset
+	rightPadding: horizontalPadding + trailingOffset
+	topPadding: verticalPadding + filledOffset
+
+	background: Loader {
+		anchors.bottomMargin: root.supportingTextOffset
+		anchors.fill: parent
+		sourceComponent: root.type === CustomTextField.Filled ? filledComp : outlineComp
+
+		StateLayer {
+			id: stateLayer
+
+			cursorShape: Qt.IBeamCursor
+			enabled: !root.activeFocus
+			manualPressOverride: tapHandler.pressed
+			radius: root.type === CustomTextField.Outlined ? root.clampedRadius : 0
+			topLeftRadius: root.clampedRadius
+			topRightRadius: root.clampedRadius
+
+			onClicked: root.focus = true
 		}
 	}
-	cursorDelegate: CustomRect {
-		id: cursor
 
-		property bool disableBlink
+	onEditingFinished: {
+		if (!valid)
+			isError = true;
+	}
+	onPressed: {
+		if (stateLayer.enabled)
+			stateLayer.press(stateLayer.mouseX, stateLayer.mouseY);
+	}
+	onTextEdited: {
+		if (isError)
+			isError = false;
+	}
 
-		color: Colors.palette.m3primary
-		implicitWidth: 2
-		radius: Tokens.rounding.medium
+	Item {
+		id: contentWrapper
 
-		Behavior on opacity {
+		anchors.bottomMargin: root.supportingTextOffset
+		anchors.fill: parent
+
+		CustomText {
+			id: placeholder
+
+			anchors.left: parent.left
+			anchors.leftMargin: root.leftPadding
+			anchors.topMargin: Tokens.padding.extraSmall
+			anchors.verticalCenter: parent.verticalCenter
+			color: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : root.text ? Colors.palette.m3outline : root.placeholderTextColor)
+			font.family: root.font.family
+			font.pointSize: root.font.pointSize
+			font.variableAxes: root.font.variableAxes
+			font.weight: root.font.weight
+			renderType: Text.QtRendering
+			text: root.placeholderText
+
+			states: [
+				State {
+					name: "smallOutlined"
+					when: root.type === CustomTextField.Outlined && (root.activeFocus || root.text)
+
+					PropertyChanges {
+						placeholder.anchors.leftMargin: -(1 - root.smallFontScale) * placeholder.width / 2 + root.horizontalPadding
+						placeholder.scale: root.smallFontScale
+					}
+
+					AnchorChanges {
+						anchors.verticalCenter: contentWrapper.top
+						target: placeholder
+					}
+				},
+				State {
+					name: "smallFilled"
+					when: root.type === CustomTextField.Filled && (root.activeFocus || root.text)
+
+					PropertyChanges {
+						placeholder.anchors.leftMargin: -(1 - root.smallFontScale) * placeholder.width / 2 + root.horizontalPadding + root.leadingOffset
+						placeholder.scale: root.smallFontScale
+					}
+
+					AnchorChanges {
+						anchors.top: contentWrapper.top
+						anchors.verticalCenter: undefined
+						target: placeholder
+					}
+				}
+			]
+			transitions: Transition {
 				Anim {
-				duration: Tokens.anim.durations.small
+					properties: "scale,leftMargin"
+					type: Anim.DefaultEffects
+				}
+
+				AnchorAnim {
+					duration: Tokens.anim.durations.expressiveDefaultEffects
+					easing: Tokens.anim.expressiveDefaultEffects
+				}
 			}
 		}
 
-		Connections {
-			function onCursorPositionChanged(): void {
-				if (root.activeFocus && root.cursorVisible) {
-					cursor.opacity = 1;
-					cursor.disableBlink = true;
-					enableBlink.restart();
+		Loader {
+			id: leadingIconLoader
+
+			active: root.leadingIcon
+			anchors.left: parent.left
+			anchors.leftMargin: Tokens.padding.small
+			anchors.verticalCenter: parent.verticalCenter
+
+			sourceComponent: MaterialIcon {
+				color: Colors.palette.m3onSurfaceVariant
+				text: root.leadingIcon
+				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
 			}
 		}
 
-			target: root
-		}
+		Loader {
+			id: trailingIconLoader
 
-		Timer {
-			id: enableBlink
+			active: root.trailingIcon
+			anchors.right: parent.right
+			anchors.rightMargin: Tokens.padding.small
+			anchors.verticalCenter: parent.verticalCenter
 
-			interval: 100
-
-			onTriggered: cursor.disableBlink = false
-		}
-
-		Timer {
-			interval: 500
-			repeat: true
-			running: root.activeFocus && root.cursorVisible && !cursor.disableBlink
-			triggeredOnStart: true
-
-			onTriggered: parent.opacity = parent.opacity === 1 ? 0 : 1
-		}
-
-		Binding {
-			cursor.opacity: 0
-			when: !root.activeFocus || !root.cursorVisible
+			sourceComponent: MaterialIcon {
+				color: Colors.palette.m3onSurfaceVariant
+				text: root.trailingIcon
+				fontStyle: Tokens.font.icon.builders.medium.scale(0.9).build()
+			}
+		}
+	}
+
+	Loader {
+		id: supportingTextLoader
+
+		active: root.effectiveSupportingText
+		anchors.bottom: parent.bottom
+		anchors.left: parent.left
+		anchors.leftMargin: root.horizontalPadding
+
+		sourceComponent: CustomText {
+			color: root.isError ? Colors.palette.m3error : Colors.palette.m3onSurfaceVariant
+			font: Tokens.font.label.small
+			text: root.effectiveSupportingText
+		}
+	}
+
+	TapHandler {
+		id: tapHandler
+	}
+
+	Component {
+		id: outlineComp
+
+		Shape {
+			id: bg
+
+			asynchronous: true
+			preferredRendererType: Shape.CurveRenderer
+
+			ShapePath {
+				id: path
+
+				readonly property real inset: strokeWidth / 2
+				readonly property real outlineGap: placeholder.width * root.smallFontScale + Tokens.spacing.small * 2
+				property real outlineGapScale: root.activeFocus || root.text ? 1 : 0
+
+				capStyle: ShapePath.RoundCap
+				fillColor: "transparent"
+				startX: path.inset + root.horizontalPadding - root.clampedRadius + path.outlineGap * (1 - path.outlineGapScale) / 2 + path.outlineGap * path.outlineGapScale
+				startY: path.inset
+				strokeColor: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : Colors.palette.m3outline)
+				strokeWidth: root.activeFocus ? 2 : 1
+
+				Behavior on outlineGapScale {
+					Anim {
+						type: Anim.DefaultEffects
+					}
+				}
+				Behavior on strokeColor {
+					CAnim {}
+				}
+				Behavior on strokeWidth {
+					Anim {}
+				}
+
+				PathLine {
+					x: bg.width - path.inset - root.clampedRadius
+					y: path.inset
+				}
+
+				PathArc {
+					radiusX: root.clampedRadius
+					radiusY: root.clampedRadius
+					x: bg.width - path.inset
+					y: path.inset + root.clampedRadius
+				}
+
+				PathLine {
+					x: bg.width - path.inset
+					y: bg.height - path.inset - root.clampedRadius
+				}
+
+				PathArc {
+					radiusX: root.clampedRadius
+					radiusY: root.clampedRadius
+					x: bg.width - path.inset - root.clampedRadius
+					y: bg.height - path.inset
+				}
+
+				PathLine {
+					x: path.inset + root.clampedRadius
+					y: bg.height - path.inset
+				}
+
+				PathArc {
+					radiusX: root.clampedRadius
+					radiusY: root.clampedRadius
+					x: path.inset
+					y: bg.height - path.inset - root.clampedRadius
+				}
+
+				PathLine {
+					x: path.inset
+					y: path.inset + root.clampedRadius
+				}
+
+				PathArc {
+					radiusX: root.clampedRadius
+					radiusY: root.clampedRadius
+					x: path.inset + root.clampedRadius
+					y: path.inset
+				}
+
+				PathLine {
+					x: path.inset + root.horizontalPadding - root.clampedRadius / 2 + path.outlineGap * (1 - path.outlineGapScale) / 2
+					y: path.inset
+				}
+			}
+		}
+	}
+
+	Component {
+		id: filledComp
+
+		CustomRect {
+			color: root.activeFocus ? Colors.tPalette.m3surfaceContainerHighest : Colors.tPalette.m3surfaceContainerHigh
+			topLeftRadius: root.clampedRadius
+			topRightRadius: root.clampedRadius
+
+			CustomRect {
+				anchors.bottom: parent.bottom
+				anchors.left: parent.left
+				anchors.right: parent.right
+				color: root.isError ? Colors.palette.m3error : (root.activeFocus ? Colors.palette.m3primary : Colors.palette.m3outline)
+				implicitHeight: root.activeFocus ? 2 : 1
+
+				Behavior on implicitHeight {
+					Anim {}
 				}
 			}
-	Behavior on placeholderTextColor {
-		CAnim {
 		}
 	}
 }

Greeter/Components/CustomTextInput.qml

@@ -1,15 +1,16 @@
 import QtQuick
+import QtQuick.Controls
 import ZShell.Config
 import qs.Services
 
 TextInput {
 	renderType: Text.NativeRendering
 	selectedTextColor: Colors.palette.m3onSecondaryContainer
-	selectionColor: Colors.tPalette.m3onSecondaryContainer
+	selectionColor: Colors.tPalette.colSecondaryContainer
 
 	font {
 		family: Config.appearance?.font.family.sans ?? "sans-serif"
 		hintingPreference: Font.PreferFullHinting
-		pixelSize: Tokens?.font.size.normal ?? 15
+		pixelSize: Config.appearance?.font.size.normal ?? 15
 	}
 }

Greeter/Components/FadeImage.qml

@@ -0,0 +1,79 @@
+import QtQuick
+import Quickshell
+import ZShell.Config
+
+Image {
+	id: root
+
+	property int fadeInAnim: Anim.DefaultEffects
+	property int fadeInLargeAnim: Anim.StandardLarge
+	property int fadeOutAnim: Anim.FastEffects
+	property bool fadingOut
+	property bool hadPrevious
+	property bool preventInit
+
+	function maybeStartInAnim(): void {
+		if (!preventInit && !opacityInAnim.running && status === Image.Ready) {
+			opacityInAnim.type = hadPrevious ? fadeInAnim : fadeInLargeAnim;
+			opacityInAnim.start();
+		}
+	}
+
+	asynchronous: true
+	fillMode: Image.PreserveAspectCrop
+	opacity: 0
+	retainWhileLoading: true
+	sourceSize: {
+		const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
+		return Qt.size(width * dpr, height * dpr);
+	}
+
+	Anim on opacity {
+		id: opacityInAnim
+
+		running: false
+		to: 1
+	}
+	Behavior on source {
+		SequentialAnimation {
+			ScriptAction {
+				script: opacityInAnim.stop()
+			}
+
+			PropertyAction {
+				property: "fadingOut"
+				target: root
+				value: true
+			}
+
+			Anim {
+				property: "opacity"
+				target: root
+				to: 0
+				type: root.fadeOutAnim
+			}
+
+			PropertyAction {
+				property: "fadingOut"
+				target: root
+				value: false
+			}
+
+			PropertyAction {
+				property: "hadPrevious"
+				target: root
+				value: root.source
+			}
+
+			PropertyAction {
+			}
+
+			ScriptAction {
+				script: root.maybeStartInAnim()
+			}
+		}
+	}
+
+	onPreventInitChanged: maybeStartInAnim()
+	onStatusChanged: maybeStartInAnim()
+}

Greeter/Components/LoadingIndicator.qml

@@ -0,0 +1,115 @@
+import QtQuick
+import Quickshell
+import M3Shapes
+import ZShell.Config
+import qs.Services
+
+MaterialShape {
+	id: root
+
+	property bool animated: true
+	property real cRotation
+	property bool containsIcon
+	property real dampingRatio: 0.6
+	property real lRotation
+	property int morphAnimRotation: 60
+	property real morphScale: 0.14
+	property alias rotateAnimDuration: rotateAnim.duration
+	property int shapeIndex
+	property list<int> shapes: {
+		if (containsIcon)
+			return [MaterialShape.SoftBurst, MaterialShape.Cookie9Sided, MaterialShape.Pill, MaterialShape.Sunny, MaterialShape.Cookie4Sided, MaterialShape.Oval];
+		return [MaterialShape.SoftBurst, MaterialShape.Cookie9Sided, MaterialShape.Pentagon, MaterialShape.Pill, MaterialShape.Sunny, MaterialShape.Cookie4Sided, MaterialShape.Oval];
+	}
+	readonly property real springDuration: {
+		const wn = Math.sqrt(stiffness);
+		const r = -dampingRatio * wn;
+		const c = 1 / Math.sqrt(1 - dampingRatio * dampingRatio);
+		return Math.log(visibilityThreshold / c) / r;
+	}
+	readonly property real springMaxVelocity: {
+		const wn = Math.sqrt(stiffness);
+		const factor = Math.exp(-z * Math.acos(z) / Math.sqrt(1 - z * z));
+		return wn * factor;
+	}
+	property bool springSettled: true
+	property real stiffness: 180
+	property real thisLRotation
+	property real visibilityThreshold: 0.075
+
+	function spring(t: real): var {
+		const wn = Math.sqrt(stiffness);
+		const za = dampingRatio * wn;
+
+		const wd = wn * Math.sqrt(1 - dampingRatio * dampingRatio);
+		const r = za / wd;
+		const pos = 1 - Math.exp(-za * t) * (Math.cos(wd * t) + r * Math.sin(wd * t));
+		const vel = Math.exp(-za * t) * (wn * wn / wd) * Math.sin(wd * t);
+
+		return [pos, vel];
+	}
+
+	color: Colors.palette.m3primary
+	implicitSize: 38
+	toShape: shapes[0]
+
+	RotationAnimation on cRotation {
+		id: rotateAnim
+
+		duration: 4666
+		easing.type: Easing.Linear
+		from: 0
+		loops: Animation.Infinite
+		running: root.animated
+		to: 360
+	}
+	Behavior on color {
+		CAnim {
+		}
+	}
+
+	ElapsedTimer {
+		id: timer
+	}
+
+	FrameAnimation {
+		running: root.animated && !root.springSettled
+
+		onTriggered: {
+			const t = timer.elapsed();
+
+			if (t >= root.springDuration) {
+				root.springSettled = true;
+			} else {
+				const [pos, vel] = root.spring(t);
+				root.morphProgress = Math.min(1, pos); // Overshooting the morph looks weird
+				root.thisLRotation = pos * root.morphAnimRotation;
+				root.scale = 1 + vel * root.morphScale / root.springMaxVelocity;
+			}
+		}
+	}
+
+	Timer {
+		interval: 650
+		repeat: true
+		running: root.animated
+		triggeredOnStart: true
+
+		onTriggered: {
+			root.beginBatchUpdate();
+			root.fromShape = root.toShape;
+			root.shapeIndex = (root.shapeIndex + 1) % root.shapes.length;
+			root.toShape = root.shapes[root.shapeIndex];
+			root.morphProgress = 0;
+
+			root.rotation = root.rotation;
+			root.lRotation = (root.lRotation + root.thisLRotation) % 360;
+			root.thisLRotation = 0;
+			root.rotation = Qt.binding(() => root.cRotation + root.lRotation + root.thisLRotation);
+
+			root.springSettled = false;
+			timer.restart();
+			root.endBatchUpdate();
+		}
+	}
+}

Greeter/Components/MaterialIcon.qml

@@ -1,16 +1,14 @@
+import QtQuick
 import ZShell.Config
 import qs.Services
 
 CustomText {
-	property real fill
-	property int grade: Colors.light ? 0 : -25
+	id: root
 
-	font.family: "Material Symbols Rounded"
-	font.pointSize: Tokens.font.size.larger
-	font.variableAxes: ({
-			FILL: fill.toFixed(1),
-			GRAD: grade,
-			opsz: fontInfo.pixelSize,
-			wght: fontInfo.weight
-		})
+	property real fill: 0
+	property int grade: Colors.light ? 0 : -25
+	property font fontStyle: Tokens.font.icon.small
+
+	renderType: Text.NativeRendering
+	font: Tokens.font.icon.size(fontStyle.pointSize).weight(fontStyle.weight).vaxes(fontStyle.variableAxes).fill(fill.toFixed(1)).grade(grade).build()
 }

Greeter/Components/StateLayer.qml

@@ -1,8 +1,6 @@
 import QtQuick
 import QtQuick.Shapes
 import ZShell
-import ZShell.Components
-import qs.Helpers
 import ZShell.Config
 import qs.Services
 
@@ -13,7 +11,6 @@ MouseArea {
 	property alias bottomRightRadius: base.bottomRightRadius
 	property real circleRadius
 	property alias color: base.color
-	property bool disabled
 	readonly property real endRadius: {
 		const d1 = distSq(0, 0);
 		const d2 = distSq(width, 0);
@@ -22,6 +19,7 @@ MouseArea {
 		return (Math.sqrt(Math.max(d1, d2, d3, d4)) + (shapeMorph ? 24 : 0)) * 1.3;
 	}
 	property real endRadiusAtPress
+	property bool manualHoverOverride
 	property bool manualPressOverride
 	property real pressX: width / 2
 	property real pressY: height / 2
@@ -29,7 +27,7 @@ MouseArea {
 	readonly property alias rect: base
 	property bool shapeMorph
 	property bool showHoverBackground: true
-	property real stateOpacity: containsMouse ? 0.08 : 0
+	property real stateOpacity: containsMouse || manualHoverOverride ? 0.08 : 0
 	property alias topLeftRadius: base.topLeftRadius
 	property alias topRightRadius: base.topRightRadius
 
@@ -52,8 +50,8 @@ MouseArea {
 	}
 
 	anchors.fill: parent
-	cursorShape: disabled ? undefined : Qt.PointingHandCursor
-	enabled: !disabled
+	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
+	enabled: parent.enabled
 	hoverEnabled: true
 
 	Behavior on stateOpacity {
@@ -100,13 +98,13 @@ MouseArea {
 		id: base
 
 		anchors.fill: parent
-		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
-		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
 		color: Colors.palette.m3onSurface
 		opacity: root.stateOpacity
 		// Pick up radius from parent if it has one (parent can be anything with radius props)
 		// qmllint disable missing-property
 		radius: root.parent?.radius ?? 0
+		bottomLeftRadius: root.parent?.bottomLeftRadius ?? radius ?? 0
+		bottomRightRadius: root.parent?.bottomRightRadius ?? radius ?? 0
 		topLeftRadius: root.parent?.topLeftRadius ?? radius ?? 0
 		topRightRadius: root.parent?.topRightRadius ?? radius ?? 0
 		// qmllint enable missing-property

Greeter/Content.qml

@@ -13,27 +13,10 @@ RowLayout {
 
 	spacing: Tokens.spacing.largeIncreased * 2
 
-	ColumnLayout {
-		Layout.fillWidth: true
-		spacing: Tokens.spacing.medium
-
 	CustomRect {
-			Layout.fillWidth: true
-			color: Colors.tPalette.m3surfaceContainer
-			implicitHeight: weather.implicitHeight
-			radius: Tokens.rounding.small
-			topLeftRadius: Tokens.rounding.largeIncreased
-
-			WeatherInfo {
-				id: weather
-
-				rootHeight: root.height
-			}
-		}
-
-		CustomClippingRect {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
+		topLeftRadius: Tokens.rounding.largeIncreased
 		bottomLeftRadius: Tokens.rounding.largeIncreased
 		color: Colors.tPalette.m3surfaceContainer
 		radius: Tokens.rounding.small
@@ -42,17 +25,12 @@ RowLayout {
 			greeter: root.greeter
 		}
 	}
-	}
 
 	Center {
 		greeter: root.greeter
 		screenHeight: root.screenHeight
 	}
 
-	ColumnLayout {
-		Layout.fillWidth: true
-		spacing: Tokens.spacing.medium
-
 	CustomRect {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
@@ -65,5 +43,4 @@ RowLayout {
 			greeter: root.greeter
 		}
 	}
-	}
 }

Greeter/GreeterSurface.qml

@@ -134,8 +134,7 @@ Scope {
 					id: lockIcon
 
 					anchors.centerIn: parent
-					font.bold: true
-					font.pointSize: Tokens.font.size.extraLarge * 4
+					fontStyle: Tokens.font.icon.builders.extraLarge.size(Tokens.font.icon.extraLarge.pointSize * 3).build()
 					text: "lock"
 				}
 

Greeter/InputField.qml

@@ -39,8 +39,7 @@ Item {
 		anchors.centerIn: parent
 		animate: true
 		color: root.greeter.launching ? Colors.palette.m3secondary : Colors.palette.m3outline
-		font.family: Config.appearance.font.family.mono
-		font.pointSize: Tokens.font.size.normal
+		font: Tokens.font.mono.medium
 		opacity: root.buffer ? 0 : 1
 		text: {
 			if (root.greeter.launching)
@@ -51,8 +50,7 @@ Item {
 		}
 
 		Behavior on opacity {
-			Anim {
-			}
+			Anim {}
 		}
 	}
 
@@ -64,15 +62,13 @@ Item {
 		anchors.verticalCenter: parent.verticalCenter
 		color: Colors.palette.m3onSurface
 		elide: Text.ElideLeft
-		font.family: Config.appearance.font.family.mono
-		font.pointSize: Tokens.font.size.normal
+		font: Tokens.font.mono.medium
 		horizontalAlignment: Qt.AlignHCenter
 		opacity: root.greeter.echoResponse && root.buffer ? 1 : 0
 		text: root.buffer
 
 		Behavior on opacity {
-			Anim {
-			}
+			Anim {}
 		}
 	}
 
@@ -89,7 +85,7 @@ Item {
 
 		anchors.centerIn: parent
 		anchors.horizontalCenterOffset: implicitWidth > root.width ? -(implicitWidth - root.width) / 2 : 0
-		implicitHeight: Tokens.font.size.normal
+		implicitHeight: Tokens.font.body.medium
 		implicitWidth: fullWidth
 		interactive: false
 		opacity: root.greeter.echoResponse ? 0 : 1
@@ -107,8 +103,7 @@ Item {
 			scale: 0
 
 			Behavior on opacity {
-				Anim {
-				}
+				Anim {}
 			}
 			Behavior on scale {
 				Anim {
@@ -156,15 +151,13 @@ Item {
 		Behavior on implicitWidth {
 			id: imWidthBehavior
 
-			Anim {
-			}
+			Anim {}
 		}
 		model: ScriptModel {
 			values: root.buffer.split("")
 		}
 		Behavior on opacity {
-			Anim {
-			}
+			Anim {}
 		}
 	}
 }

Greeter/SessionDock.qml

@@ -13,22 +13,19 @@ ColumnLayout {
 
 	anchors.fill: parent
 	anchors.margins: Tokens.padding.large
-	spacing: Tokens.spacing.small
+	spacing: Tokens.spacing.large
 
 	CustomText {
 		Layout.fillWidth: true
 		color: Colors.palette.m3outline
 		elide: Text.ElideRight
-		font.family: Config.appearance.font.family.mono
-		font.weight: 500
+		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
 		text: root.greeter.sessions.length > 0 ? qsTr("%1 session%2").arg(root.greeter.sessions.length).arg(root.greeter.sessions.length === 1 ? "" : "s") : qsTr("Sessions")
 	}
 
-	CustomClippingRect {
+	Item {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
-		color: "transparent"
-		radius: Tokens.rounding.small
 
 		Loader {
 			active: opacity > 0
@@ -46,16 +43,14 @@ ColumnLayout {
 				MaterialIcon {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					font.pointSize: Tokens.font.size.extraLarge * 2
+					fontStyle: Tokens.font.icon.large
 					text: "desktop_windows"
 				}
 
 				CustomText {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					font.family: Config.appearance.font.family.mono
-					font.pointSize: Tokens.font.size.large
-					font.weight: 500
+					font: Tokens.font.headline.builders.small.width(90).build()
 					text: qsTr("No Sessions Found")
 				}
 			}
@@ -68,6 +63,7 @@ ColumnLayout {
 			clip: true
 			currentIndex: root.greeter.sessionIndex
 			highlightFollowsCurrentItem: false
+			boundsBehavior: ListView.StopAtBounds
 			model: root.greeter.sessions
 			spacing: Tokens.spacing.small
 
@@ -80,7 +76,7 @@ ColumnLayout {
 				anchors.left: parent?.left
 				anchors.right: parent?.right
 				implicitHeight: row.implicitHeight + Tokens.padding.small * 2
-				radius: Tokens.rounding.medium - Tokens.padding.small
+				radius: Tokens.rounding.large
 
 				StateLayer {
 					onClicked: {
@@ -97,7 +93,7 @@ ColumnLayout {
 
 					MaterialIcon {
 						color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurfaceVariant
-						font.pointSize: Tokens.font.size.extraLarge
+						fontStyle: Tokens.font.icon.extraLarge
 						text: modelData.kind === "x11" ? "tv" : "desktop_windows"
 					}
 
@@ -109,8 +105,7 @@ ColumnLayout {
 							Layout.fillWidth: true
 							color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 							elide: Text.ElideRight
-							font.pointSize: Tokens.font.size.normal
-							font.weight: 600
+							font: Tokens.font.body.builders.medium.weight(Font.Bold).build()
 							text: modelData.name
 						}
 
@@ -118,8 +113,7 @@ ColumnLayout {
 							Layout.fillWidth: true
 							color: session.index === sessions.currentIndex ? Colors.palette.m3onPrimaryFixedVariant : Colors.palette.m3onSurfaceVariant
 							elide: Text.ElideRight
-							font.family: Config.appearance.font.family.mono
-							font.pointSize: Tokens.font.size.small
+							font: Tokens.font.mono.small
 							text: modelData.kind
 						}
 					}
@@ -129,7 +123,7 @@ ColumnLayout {
 				color: Colors.palette.m3primary
 				implicitHeight: sessions.currentItem?.implicitHeight ?? 0
 				implicitWidth: sessions.width
-				radius: Tokens.rounding.medium - Tokens.padding.small
+				radius: Tokens.rounding.large
 				y: sessions.currentItem?.y ?? 0
 
 				Behavior on y {

Greeter/UserDock.qml

@@ -14,22 +14,19 @@ ColumnLayout {
 
 	anchors.fill: parent
 	anchors.margins: Tokens.padding.large
-	spacing: Tokens.spacing.small
+	spacing: Tokens.spacing.large
 
 	CustomText {
 		Layout.fillWidth: true
 		color: Colors.palette.m3outline
 		elide: Text.ElideRight
-		font.family: Config.appearance.font.family.mono
-		font.weight: 500
+		font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
 		text: root.greeter.users.length > 0 ? qsTr("%1 user%2").arg(root.greeter.users.length).arg(root.greeter.users.length === 1 ? "" : "s") : qsTr("Users")
 	}
 
-	CustomClippingRect {
+	Item {
 		Layout.fillHeight: true
 		Layout.fillWidth: true
-		color: "transparent"
-		radius: Tokens.rounding.small
 
 		Loader {
 			active: opacity > 0
@@ -48,16 +45,14 @@ ColumnLayout {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
 					fill: 1
-					font.pointSize: Tokens.font.size.extraLarge * 2
+					fontStyle: Tokens.font.icon.large
 					text: "account_circle"
 				}
 
 				CustomText {
 					Layout.alignment: Qt.AlignHCenter
 					color: Colors.palette.m3outlineVariant
-					font.family: Config.appearance.font.family.mono
-					font.pointSize: Tokens.font.size.large
-					font.weight: 500
+					font: Tokens.font.headline.builders.small.width(90).build()
 					text: qsTr("No Users Found")
 				}
 			}
@@ -70,6 +65,7 @@ ColumnLayout {
 			clip: true
 			currentIndex: root.greeter.selectedUser ? root.greeter.users.indexOf(root.greeter.selectedUser) : -1
 			highlightFollowsCurrentItem: false
+			boundsBehavior: ListView.StopAtBounds
 			model: root.greeter.users
 			spacing: Tokens.spacing.small
 
@@ -82,7 +78,7 @@ ColumnLayout {
 				anchors.left: parent?.left
 				anchors.right: parent?.right
 				implicitHeight: row.implicitHeight + Tokens.padding.small * 2
-				radius: Tokens.rounding.medium - Tokens.padding.small
+				radius: Tokens.rounding.large
 
 				StateLayer {
 					onClicked: {
@@ -97,7 +93,7 @@ ColumnLayout {
 					anchors.margins: Tokens.padding.small
 					spacing: Tokens.spacing.medium
 
-					CustomClippingRect {
+					ClipRect {
 						Layout.preferredHeight: 50
 						Layout.preferredWidth: 50
 						radius: Tokens.rounding.full
@@ -106,7 +102,7 @@ ColumnLayout {
 							anchors.centerIn: parent
 							color: user.index === users.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurfaceVariant
 							fill: 1
-							font.pointSize: Tokens.font.size.extraLarge
+							fontStyle: Tokens.font.icon.extraLarge
 							text: modelData.kind === "x11" ? "tv" : "account_circle"
 						}
 
@@ -124,8 +120,7 @@ ColumnLayout {
 							Layout.fillWidth: true
 							color: user.index === users.currentIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 							elide: Text.ElideRight
-							font.pointSize: Tokens.font.size.normal
-							font.weight: 600
+							font: Tokens.font.body.builders.medium.weight(Font.Bold).build()
 							text: modelData.username
 						}
 					}
@@ -135,7 +130,7 @@ ColumnLayout {
 				color: Colors.palette.m3primary
 				implicitHeight: users.currentItem?.implicitHeight ?? 0
 				implicitWidth: users.width
-				radius: Tokens.rounding.medium - Tokens.padding.small
+				radius: Tokens.rounding.large
 				y: users.currentItem?.y ?? 0
 
 				Behavior on y {

Greeter/WeatherInfo.qml

@@ -1,171 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import QtQuick
-import QtQuick.Layouts
-import ZShell.Config
-import qs.Components
-import qs.Helpers
-import qs.Services
-
-ColumnLayout {
-	id: root
-
-	required property int rootHeight
-
-	anchors.left: parent.left
-	anchors.margins: Tokens.padding.large * 2
-	anchors.right: parent.right
-	spacing: Tokens.spacing.small
-
-	Loader {
-		Layout.alignment: Qt.AlignHCenter
-		Layout.bottomMargin: -Tokens.padding.large
-		Layout.topMargin: Tokens.padding.large * 2
-		active: root.rootHeight > 610
-		visible: active
-
-		sourceComponent: CustomText {
-			color: Colors.palette.m3primary
-			font.pointSize: Tokens.font.size.extraLarge
-			font.weight: 500
-			text: qsTr("Weather")
-		}
-	}
-
-	RowLayout {
-		Layout.fillWidth: true
-		spacing: Tokens.spacing.largeIncreased
-
-		MaterialIcon {
-			animate: true
-			color: Colors.palette.m3secondary
-			font.pointSize: Tokens.font.size.extraLarge * 2.5
-			text: Weather.icon
-		}
-
-		ColumnLayout {
-			spacing: Tokens.spacing.small
-
-			CustomText {
-				Layout.fillWidth: true
-				animate: true
-				color: Colors.palette.m3secondary
-				elide: Text.ElideRight
-				font.pointSize: Tokens.font.size.large
-				font.weight: 500
-				text: Weather.description
-			}
-
-			CustomText {
-				Layout.fillWidth: true
-				animate: true
-				color: Colors.palette.m3onSurfaceVariant
-				elide: Text.ElideRight
-				font.pointSize: Tokens.font.size.normal
-				text: qsTr("Humidity: %1%").arg(Weather.humidity)
-			}
-		}
-
-		Loader {
-			Layout.rightMargin: Tokens.padding.small
-			active: root.width > 400
-			visible: active
-
-			sourceComponent: ColumnLayout {
-				spacing: Tokens.spacing.small
-
-				CustomText {
-					Layout.fillWidth: true
-					animate: true
-					color: Colors.palette.m3primary
-					elide: Text.ElideLeft
-					font.pointSize: Tokens.font.size.extraLarge
-					font.weight: 500
-					horizontalAlignment: Text.AlignRight
-					text: Weather.temp
-				}
-
-				CustomText {
-					Layout.fillWidth: true
-					animate: true
-					color: Colors.palette.m3outline
-					elide: Text.ElideLeft
-					font.pointSize: Tokens.font.size.smaller
-					horizontalAlignment: Text.AlignRight
-					text: qsTr("Feels like: %1").arg(Weather.feelsLike)
-				}
-			}
-		}
-	}
-
-	Loader {
-		id: forecastLoader
-
-		Layout.bottomMargin: Tokens.padding.large * 2
-		Layout.fillWidth: true
-		Layout.topMargin: Tokens.spacing.small
-		active: root.rootHeight > 820
-		visible: active
-
-		sourceComponent: RowLayout {
-			spacing: Tokens.spacing.largeIncreased
-
-			Repeater {
-				model: {
-					const forecast = Weather.hourlyForecast;
-					const count = root.width < 320 ? 3 : root.width < 400 ? 4 : 5;
-					if (!forecast)
-						return Array.from({
-							length: count
-						}, () => null);
-
-					const start = Math.max(0, Weather.currentHourIndex);
-					return forecast.slice(start, start + count);
-				}
-
-				ColumnLayout {
-					id: forecastHour
-
-					required property var modelData
-
-					Layout.fillWidth: true
-					spacing: Tokens.spacing.small
-
-					CustomText {
-						Layout.fillWidth: true
-						color: Colors.palette.m3outline
-						font.pointSize: Tokens.font.size.larger
-						horizontalAlignment: Text.AlignHCenter
-						text: {
-							const hour = forecastHour.modelData?.hour ?? 0;
-							return hour > 12 ? `${(hour - 12).toString().padStart(2, "0")} PM` : `${hour.toString().padStart(2, "0")} AM`;
-						}
-					}
-
-					MaterialIcon {
-						Layout.alignment: Qt.AlignHCenter
-						font.pointSize: Tokens.font.size.extraLarge * 1.5
-						font.weight: 500
-						text: forecastHour.modelData?.icon ?? "cloud_alert"
-					}
-
-					CustomText {
-						Layout.alignment: Qt.AlignHCenter
-						color: Colors.palette.m3secondary
-						font.pointSize: Tokens.font.size.larger
-						text: Config.services.useFahrenheit ? `${forecastHour.modelData?.tempF ?? 0}°F` : `${forecastHour.modelData?.tempC ?? 0}°C`
-					}
-				}
-			}
-		}
-	}
-
-	Timer {
-		interval: 900000 // 15 minutes
-		repeat: true
-		running: true
-		triggeredOnStart: true
-
-		onTriggered: Weather.reload()
-	}
-}

Helpers/Wallpapers.qml

@@ -5,7 +5,7 @@ import Quickshell
 import Quickshell.Io
 import QtQuick
 import ZShell.Models
-import ZShell.Internal
+import ZShell.Wallpaper
 import ZShell.Config
 import qs.Components
 import qs.Services
@@ -16,24 +16,48 @@ Searcher {
 	id: root
 
 	property string actualCurrent: WallpaperPath.currentWallpaperPath
-	property alias crops: adapter.monitorCrops
 	readonly property string current: showPreview ? previewPath : actualCurrent
-	property alias monitorCrops: monitorCrops
+	readonly property string currentThumbnail: thumbnailFor(current)
+	readonly property bool currentIsVideo: isVideoPath(current)
 	property bool pendingPreviewClear
 	property bool previewColorLock
 	property string previewPath
 	property bool recentlyChanged
 	property bool showPreview: false
+	property int cropVersion: 0
 
-	function getCategoryFor(w: FileSystemEntry): string {
+	function getCategoryFor(w: WallpaperEntry): string {
 		let category = w.parentDir.slice(Paths.wallsdir.length + 1);
 		if (category.includes("/"))
 			category = category.slice(0, category.indexOf("/"));
 		return category;
 	}
 
+	readonly property var videoExts: ["mp4", "mkv", "webm", "avi", "mov", "wmv", "flv", "m4v", "mpg", "mpeg", "3gp", "ogv", "ts", "vob"]
+
+	function isVideoPath(path: string): bool {
+		if (!path)
+			return false;
+		const dot = path.lastIndexOf(".");
+		if (dot < 0)
+			return false;
+		return videoExts.includes(path.slice(dot + 1).toLowerCase());
+	}
+
+	function thumbnailFor(path: string): string {
+		if (!path)
+			return "";
+
+		for (const entry of root.list) {
+			if (entry.path === path)
+				return entry.thumbnailPath || path;
+		}
+
+		return path;
+	}
+
 	function getCrop(screen: string): var {
-		return root.crops[screen];
+		return wallpapers.crop(root.current, screen);
 	}
 
 	function preview(path: string): void {
@@ -50,19 +74,18 @@ Searcher {
 		else if (zoom > 5.0)
 			zoom = 5.0;
 
-		root.crops[screen] = {
+		wallpapers.setCrop(root.current, screen, {
 			x: rect.x,
 			y: rect.y,
 			width: rect.width,
 			height: rect.height,
 			zoom: zoom
-		};
+		});
 	}
 
 	function setWallpaper(path: string): void {
 		actualCurrent = path;
 		WallpaperPath.currentWallpaperPath = path;
-		Quickshell.screens.forEach(n => setCrop(n.name, Qt.rect(0, 0, 1, 1), 1.0));
 		Quickshell.execDetached(["zshell-cli", "wallpaper", "lockscreen", "--input-image", `${root.actualCurrent}`, "--output-path", `${Paths.state}/lockscreen_bg.png`, "--blur-amount", `${Config.lock.blurAmount}`]);
 		if (Config.colors.schemeGen)
 			Quickshell.execDetached(["zshell-cli", "scheme", "generate", "--image-path", `${root.actualCurrent}`, "--scheme", `${Config.colors.schemeType}`, "--mode", `${Config.colors.mode}`]);
@@ -96,38 +119,13 @@ Searcher {
 		target: "wallpaper"
 	}
 
-	FileView {
-		id: monitorCrops
-
-		path: `${Paths.state}/wallpaper-crops.json`
-		watchChanges: true
-
-		onAdapterUpdated: cropWriteDelay.restart()
-		onFileChanged: reload()
-
-		JsonAdapter {
-			id: adapter
-
-			property var monitorCrops: ({})
-		}
-	}
-
-	Timer {
-		id: cropWriteDelay
-
-		interval: 100
-		repeat: false
-		running: false
-
-		onTriggered: monitorCrops.writeAdapter()
-	}
-
-	FileSystemModel {
+	WallpaperDb {
 		id: wallpapers
 
-		filter: FileSystemModel.Images
+		dbPath: `${Paths.state}/wallpapers.sqlite`
+		cacheSize: wallpaper.largestBufferSize
+		requireHardwareCodec: true
 		path: Config.general.wallpaperPath
-		recursive: true
 	}
 
 	Process {
@@ -146,36 +144,100 @@ Searcher {
 	WallpaperService {
 		id: wallpaper
 
+		dbPath: wallpapers.dbPath
 		path: root.current
 	}
 
+	Connections {
+		target: wallpapers
+
+		function onCacheStored(path: string): void {
+			if (path === root.current)
+				wallpaper.invalidateCache();
+		}
+
+		function onCropsChanged(path: string): void {
+			if (path === root.current)
+				root.cropVersion++;
+		}
+	}
+
 	Variants {
+		id: screenVariants
 		model: Quickshell.screens
 
 		WallpaperObject {
-			readonly property var crops: root.getCrop(modelData.name)
+			id: obj
 			required property var modelData
 
-			cropHeight: crops?.height ?? 1.0
-			cropWidth: crops?.width ?? 1.0
-			cropX: crops?.x ?? 0.0
-			cropY: crops?.y ?? 0.0
+			// Crop animation only for edits, never for wallpaper swaps.
+			property bool animateCrop: false
+
 			screen: modelData.name
 			service: wallpaper
-			zoom: crops?.zoom ?? 1.0
+
+			// Apply the wallpaper's own crop. Driven off the service's pathChanged
+			// (which fires after applyPath has snapshotted the outgoing frame with
+			// the outgoing crop) and off crop edits, never as a reactive binding on
+			// the wallpaper path — so a swap applies the incoming crop atomically
+			// after the base is captured.
+			function seedCrop(): void {
+				// Load the current wallpaper's crop without pushing: the service
+				// already read it from the database. This only seeds the values so
+				// a later edit animates from the right starting point.
+				obj.syncCrop(root.getCrop(modelData.name));
+			}
+
+			// Apply an edited crop: assign via the setters so the Behaviors animate
+			// the numbers and push each intermediate value to the service.
+			function editCrop(): void {
+				const c = root.getCrop(modelData.name);
+				obj.cropX = c?.x ?? 0.0;
+				obj.cropY = c?.y ?? 0.0;
+				obj.cropWidth = c?.width ?? 1.0;
+				obj.cropHeight = c?.height ?? 1.0;
+				obj.zoom = c?.zoom ?? 1.0;
+			}
+
+			Component.onCompleted: seedCrop()
+			onScreenChanged: seedCrop()
 
 			Behavior on cropHeight {
+				enabled: obj.animateCrop
 				Anim {}
 			}
 			Behavior on cropWidth {
+				enabled: obj.animateCrop
 				Anim {}
 			}
 			Behavior on cropX {
+				enabled: obj.animateCrop
 				Anim {}
 			}
 			Behavior on cropY {
+				enabled: obj.animateCrop
 				Anim {}
 			}
 		}
 	}
+
+	Connections {
+		target: wallpaper
+		function onPathChanged(): void {
+			for (const obj of screenVariants.instances) {
+				obj.animateCrop = false;
+				obj.seedCrop();
+			}
+		}
+	}
+
+	Connections {
+		target: root
+		function onCropVersionChanged(): void {
+			for (const obj of screenVariants.instances) {
+				obj.animateCrop = true;
+				obj.editCrop();
+			}
+		}
+	}
 }

Modules/Bar/Bar.qml

@@ -210,8 +210,7 @@ GridLayout {
 				roleValue: "network"
 
 				delegate: EntryWrapper {
-					NetworkWidget {
-					}
+					NetworkWidget {}
 				}
 			}
 

Modules/Bar/Border.qml

@@ -1,49 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import Quickshell
-import QtQuick
-import QtQuick.Effects
-import ZShell.Config
-import qs.Components
-import qs.Services
-
-Item {
-	id: root
-
-	required property Item bar
-	required property ScreenState screenState
-
-	anchors.fill: parent
-
-	CustomRect {
-		anchors.fill: parent
-		anchors.margins: -1
-		color: Colors.palette.m3surface
-		layer.enabled: true
-
-		layer.effect: MultiEffect {
-			maskEnabled: true
-			maskInverted: true
-			maskSource: mask
-			maskSpreadAtMin: 1
-			maskThresholdMin: 0.5
-		}
-	}
-
-	Item {
-		id: mask
-
-		anchors.fill: parent
-		layer.enabled: true
-		visible: false
-
-		Rectangle {
-			anchors.fill: parent
-			anchors.margins: Config.bar.border + 1
-			anchors.topMargin: root.bar.implicitHeight + 1
-			radius: Config.bar.border > 0 ? Config.bar.rounding : 0
-			topLeftRadius: Config.bar.rounding
-			topRightRadius: Config.bar.rounding
-		}
-	}
-}

Modules/Bar/Components/Clock.qml

@@ -45,7 +45,9 @@ WidgetBase {
 	}
 	required property GridLayout loader
 	required property Wrapper popouts
-	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
+	readonly property int roundedWidth: Math.round(timeText.implicitWidth)
+	readonly property int evenWidth: roundedWidth % 2 === 0 ? roundedWidth : roundedWidth + 1
+	readonly property real size: horizontal ? evenWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
 	required property ScreenState screenState
 
 	implicitHeight: horizontal ? baseSize : size

Modules/Bar/Components/Common/BatteryIcon.qml

@@ -24,7 +24,7 @@ Row {
 		color: Battery.getColors(root.percentage, root.devState).bg
 		height: root.batHeight
 		radius: root.radius
-		width: root.batWidth
+		width: root.batWidth - 1
 
 		CustomText {
 			color: Battery.getColors(root.percentage, root.devState).fg

Modules/Bar/Components/MediaWidget.qml

@@ -13,7 +13,7 @@ WidgetBase {
 	readonly property int textWidth: Math.min(metrics.width, 200)
 
 	implicitHeight: horizontal ? baseSize : layout.implicitHeight + Tokens.padding.small * 2
-	implicitWidth: horizontal ? layout.implicitWidth + Tokens.padding.small * 2 : baseSize
+	implicitWidth: horizontal ? (layout.implicitWidth % 2 === 0 ? layout.implicitWidth : layout.implicitWidth + 1) + Tokens.padding.small * 2 : baseSize
 	radius: Tokens.rounding.full
 
 	Behavior on implicitHeight {

Modules/Bar/Components/Resource.qml

@@ -12,7 +12,6 @@ GridLayout {
 	property real animatedPercentage: 0
 	readonly property real arcStartAngle: 0.75 * Math.PI
 	readonly property real arcSweep: 1.5 * Math.PI
-	readonly property real dpr: (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1
 	required property bool horizontal
 	property string icon
 	required property color iconColor
@@ -23,17 +22,12 @@ GridLayout {
 	property bool warning: percentage * 100 >= warningThreshold
 	property int warningThreshold: 80
 
-	function snap(v) {
-		return Math.round(v * dpr) / dpr;
-	}
-
 	columnSpacing: Tokens.spacing.medium
 	columns: horizontal ? -1 : 1
 	percentage: 0
 
 	Behavior on animatedPercentage {
-		Anim {
-		}
+		Anim {}
 	}
 
 	Component.onCompleted: animatedPercentage = percentage
@@ -59,7 +53,7 @@ GridLayout {
 		Layout.preferredHeight: root.horizontal ? icon.implicitHeight - Tokens.padding.extraSmall : 4
 		Layout.preferredWidth: root.horizontal ? 4 : icon.implicitWidth
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
-		radius: Math.min(width, height) / 2
+		radius: Tokens.rounding.full
 
 		Item {
 			id: clipper
@@ -69,18 +63,20 @@ GridLayout {
 			anchors.left: root.horizontal ? undefined : parent.left
 			anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
 			clip: true
-			height: root.horizontal ? root.snap(root.percentage * track.height) : track.height * 2
-			width: root.horizontal ? track.width * 2 : root.snap(root.percentage * track.width)
+			implicitHeight: root.horizontal ? root.percentage * track.height : track.height * 2
+			implicitWidth: root.horizontal ? track.width * 2 : root.percentage * track.width
 
 			CustomRect {
 				anchors.bottom: root.horizontal ? parent.bottom : undefined
 				anchors.horizontalCenter: root.horizontal ? parent.horizontalCenter : undefined
 				anchors.left: root.horizontal ? undefined : parent.left
 				anchors.verticalCenter: root.horizontal ? undefined : parent.verticalCenter
+
 				color: root.mainColor
-				height: track.height
 				radius: track.radius
-				width: track.width
+
+				implicitHeight: track.height
+				implicitWidth: track.width
 			}
 		}
 	}

Modules/Bar/Components/Resources.qml

@@ -33,6 +33,7 @@ WidgetBase {
 		anchors.horizontalCenterOffset: root.horizontal ? 0 : 1
 		anchors.verticalCenterOffset: root.horizontal ? 0 : -3
 		columnSpacing: Tokens.spacing.small
+		rowSpacing: 0
 		columns: root.horizontal ? -1 : 1
 
 		ServiceRef {
@@ -51,6 +52,7 @@ WidgetBase {
 			Layout.alignment: Qt.AlignVCenter
 			Layout.fillHeight: root.horizontal
 			Layout.fillWidth: !root.horizontal
+
 			horizontal: root.horizontal
 			icon: "memory"
 			iconColor: root.screenState.resources ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface

Modules/Bar/Components/StatusIcons.qml

@@ -31,7 +31,7 @@ WidgetBase {
 		return -1;
 	}
 	readonly property real size: horizontal ? grid.implicitWidth + grid.anchors.leftMargin + grid.anchors.rightMargin : grid.implicitHeight + grid.anchors.bottomMargin + grid.anchors.topMargin
-	readonly property int spacing: Tokens.spacing.medium / 2
+	readonly property int spacing: Tokens.spacing.extraSmall
 
 	// Entries that can shrink to nothing, spacing included
 	function collapsed(entry: var): bool {
@@ -51,14 +51,12 @@ WidgetBase {
 	Behavior on implicitHeight {
 		enabled: !root.horizontal
 
-		Anim {
-		}
+		Anim {}
 	}
 	Behavior on implicitWidth {
 		enabled: root.horizontal
 
-		Anim {
-		}
+		Anim {}
 	}
 
 	GridLayout {
@@ -70,6 +68,8 @@ WidgetBase {
 		anchors.rightMargin: root.horizontal ? Tokens.padding.extraSmall : 0
 		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
 		columns: root.horizontal ? -1 : 1
+		columnSpacing: root.spacing
+		rowSpacing: root.spacing
 
 		Repeater {
 			model: ScriptModel {
@@ -111,8 +111,7 @@ WidgetBase {
 					delegate: EntryWrapper {
 						name: "upower"
 
-						UPowerWidget {
-						}
+						UPowerWidget {}
 					}
 				}
 			}
@@ -135,8 +134,8 @@ WidgetBase {
 		Layout.rightMargin: root.horizontal ? Math.round(rightGap) : 0
 		Layout.topMargin: root.horizontal ? 0 : Math.round(leftGap)
 		children: item
-		implicitHeight: item?.implicitHeight ?? 0
-		implicitWidth: item?.implicitWidth ?? 0
+		implicitHeight: item?.height ?? item?.implicitHeight ?? 0
+		implicitWidth: item?.width ?? item?.implicitWidth ?? 0
 
 		Behavior on leftGap {
 			Anim {

Modules/Bar/Components/StatusIcons/AudioWidget.qml

@@ -6,7 +6,7 @@ import qs.Components
 import qs.Services
 
 MaterialIcon {
-	id: speaker
+	id: root
 
 	required property bool horizontal
 
@@ -15,6 +15,8 @@ MaterialIcon {
 	fill: 1
 	fontStyle: Tokens.font.icon.small
 	text: Audio.muted ? "volume_off" : "volume_up"
+	width: Math.round(implicitWidth)
+	height: Math.round(implicitHeight)
 
 	Behavior on Layout.maximumWidth {
 		Anim {}

Modules/Bar/Components/StatusIcons/MicWidget.qml

@@ -6,7 +6,7 @@ import qs.Components
 import qs.Services
 
 MaterialIcon {
-	id: mic
+	id: root
 
 	required property bool horizontal
 
@@ -15,6 +15,8 @@ MaterialIcon {
 	fill: 1
 	fontStyle: Tokens.font.icon.small
 	text: Audio.sourceMuted ? "mic_off" : "mic"
+	width: Math.round(implicitWidth)
+	height: Math.round(implicitHeight)
 
 	Behavior on Layout.maximumWidth {
 		Anim {}

Modules/Bar/Components/Tray/TrayItem.qml

@@ -79,6 +79,7 @@ Item {
 
 		anchors.centerIn: parent
 		antialiasing: true
+		backer.retainWhileLoading: true
 		color: root.current && !Config.bar.tray.showOnHover ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 		implicitSize: Config.bar.tray.trayIconSize * root.dpr
 		layer.enabled: Config.bar.tray.recolorIcons

Modules/Bar/Components/TrayIcons.qml

@@ -38,6 +38,7 @@ WidgetBase {
 		anchors.topMargin: root.horizontal ? 0 : Tokens.padding.extraSmall
 		columns: root.horizontal ? -1 : 1
 		rowSpacing: -2
+		columnSpacing: Tokens.spacing.extraSmall
 
 		Repeater {
 			id: repeater

Modules/Bar/Components/Workspaces.qml

@@ -12,13 +12,14 @@ import qs.Services
 Item {
 	id: root
 
-	property real activeWorkspaceMargin: Math.ceil(Tokens.padding.medium / 4)
+	property real activeWorkspaceMargin: Tokens.padding.extraSmall / 2
+	readonly property int spacing: Tokens.spacing.extraSmall / 2
 	readonly property int effectiveActiveWorkspaceId: monitor?.activeWorkspace?.id ?? 1
 	required property bool horizontal
 	readonly property HyprlandMonitor monitor: Hyprland.monitorFor(root.screen)
 	required property ShellScreen screen
 	readonly property real shortSize: Math.max(Config.bar.height, Tokens.sizes.bar.innerSize)
-	readonly property real size: (workspaceButtonWidth * workspacesShown) + activeWorkspaceMargin * 2
+	readonly property real size: (workspaceButtonWidth * workspacesShown) + (spacing * Math.max(0, workspacesShown - 1)) + activeWorkspaceMargin * 2
 	property int workspaceButtonWidth: (horizontal ? bgRect.implicitHeight : bgRect.implicitWidth) - root.activeWorkspaceMargin * 2
 	property int workspaceIndexInGroup: (effectiveActiveWorkspaceId - 1) % root.workspacesShown
 	readonly property list<var> workspaces: Hyprland.workspaces.values.filter(w => w.monitor === root.monitor)
@@ -59,15 +60,17 @@ Item {
 
 			anchors.fill: parent
 			anchors.margins: root.activeWorkspaceMargin
-			columnSpacing: 0
+			columnSpacing: root.spacing
 			columns: root.horizontal ? root.workspacesShown : 1
-			rowSpacing: 0
+			rowSpacing: root.spacing
 			rows: root.horizontal ? 1 : root.workspacesShown
+			layer.enabled: true
+			layer.mipmap: true
 
 			Repeater {
 				model: root.workspaces
 
-				Button {
+				CustomRect {
 					id: button
 
 					required property int index
@@ -75,24 +78,15 @@ Item {
 
 					implicitHeight: indicator.indicatorThickness
 					implicitWidth: indicator.indicatorThickness
-					width: root.workspaceButtonWidth
-
-					background: Item {
-						id: workspaceButtonBackground
-
-						implicitHeight: root.workspaceButtonWidth
-						implicitWidth: root.workspaceButtonWidth
+					radius: Tokens.rounding.full
 
 					CustomText {
 						anchors.centerIn: parent
 						color: Colors.palette.m3onSecondaryContainer
-							elide: Text.ElideRight
-							horizontalAlignment: Text.AlignHCenter
 						text: button.modelData?.name ?? ""
-							verticalAlignment: Text.AlignVCenter
-						}
 					}
 
+					StateLayer {
 						onPressed: {
 							const ws = button.modelData.name;
 							Hyprland.dispatch(Hyprland.usingLua ? `hl.dsp.focus({ workspace= "${ws}"})` : `workspace ${ws}`);
@@ -100,12 +94,15 @@ Item {
 					}
 				}
 			}
+		}
 
 		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
+			readonly property real step: root.workspaceButtonWidth + root.spacing
+
+			property real indicatorLength: (Math.abs(idxPair.idx1 - idxPair.idx2) + 1) * root.workspaceButtonWidth + Math.abs(idxPair.idx1 - idxPair.idx2) * root.spacing
+			property real indicatorPosition: Math.min(idxPair.idx1, idxPair.idx2) * step + root.activeWorkspaceMargin
 			property real indicatorThickness: root.workspaceButtonWidth
 
 			anchors.horizontalCenter: root.horizontal ? undefined : parent.horizontalCenter
@@ -129,9 +126,10 @@ Item {
 				implicitHeight: grid.height
 				implicitWidth: grid.width
 				source: grid
+				autoPaddingEnabled: false
 				sourceColor: Colors.palette.m3onSurface
-				x: root.horizontal ? -indicator.x + 3 : 0
-				y: root.horizontal ? 0 : -indicator.y + 3
+				x: root.horizontal ? -indicator.x + root.activeWorkspaceMargin : 0
+				y: root.horizontal ? 0 : -indicator.y + root.activeWorkspaceMargin
 			}
 		}
 	}

Modules/Bar/Popouts/AudioPopout.qml

@@ -134,7 +134,7 @@ Item {
 				node: Audio.source
 			}
 
-			CustomClippingRect {
+			ClipRect {
 				anchors.fill: parent
 				radius: parent.radius
 
@@ -249,7 +249,7 @@ Item {
 					node: appBox.modelData
 				}
 
-				CustomClippingRect {
+				ClipRect {
 					anchors.fill: parent
 					radius: parent.radius
 

Modules/Clipboard/Content.qml

@@ -25,7 +25,7 @@ Item {
 		searchField.forceActiveFocus();
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		id: search
 
 		anchors.left: parent.left
@@ -54,7 +54,7 @@ Item {
 		}
 	}
 
-	CustomClippingRect {
+	CustomRect {
 		id: preview
 
 		anchors.bottom: parent.bottom
@@ -64,6 +64,7 @@ Item {
 		color: Colors.tPalette.m3surfaceContainer
 		implicitWidth: ClipHistory.previewIsImage ? Math.max(Math.min(imagePreview.sourceSize.width + Tokens.padding.large * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth) : Math.max(Math.min(textPreviewColumn.width + textPreviewColumn.anchors.margins * 2, Config.clipboard.sizes.previewWidth), Config.clipboard.sizes.minPreviewWidth)
 		radius: 25
+		clip: true
 
 		Behavior on implicitWidth {
 			Anim {}
@@ -228,11 +229,12 @@ Item {
 					anchors.fill: parent
 					spacing: Tokens.spacing.small
 
-					CustomClippingRect {
+					Item {
 						id: textRect
 
 						Layout.fillHeight: true
 						Layout.fillWidth: true
+						clip: true
 
 						Item {
 							id: textWrapper

Modules/Dashboard/Dash/User.qml

@@ -14,7 +14,7 @@ Row {
 	padding: 20
 	spacing: 12
 
-	CustomClippingRect {
+	ClipRect {
 		color: Colors.layer(Colors.palette.m3surfaceContainerHigh, 2)
 		implicitHeight: info.implicitHeight
 		implicitWidth: info.implicitHeight

Modules/Dashboard/Media.qml

@@ -16,7 +16,7 @@ Item {
 	implicitWidth: 1000
 	implicitHeight: 320
 
-	CustomClippingRect {
+	ClipRect {
 		anchors.fill: parent
 		radius: root.radius
 

Modules/Dashboard/Processes/ProcessesList.qml

@@ -46,7 +46,7 @@ CustomListView {
 			anchors.bottom: parent.bottom
 			spacing: Tokens.spacing.extraSmall / 2
 
-			CustomClippingRect {
+			ClipRect {
 				id: iconClip
 
 				Layout.fillHeight: true

Modules/DesktopIcons/BackgroundContextMenu.qml

@@ -25,7 +25,7 @@ Item {
 		onClicked: root.close()
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		id: popupBackground
 		readonly property real padding: 4
 

Modules/DesktopIcons/DesktopIconContextMenu.qml

@@ -40,7 +40,7 @@ Item {
 	visible: false
 	z: 999
 
-	CustomClippingRect {
+	ClipRect {
 		id: popupBackground
 
 		readonly property real padding: Tokens.padding.extraSmall

Modules/Launcher/Items/WallpaperTile.qml

@@ -1,3 +1,5 @@
+pragma ComponentBehavior: Bound
+
 import Quickshell
 import QtQuick
 import ZShell.Config
@@ -9,7 +11,7 @@ Item {
 	id: root
 
 	required property bool isCurrent
-	required property var modelData // FileSystemEntry-like {path, relativePath}
+	required property var modelData
 	required property real tileHeight
 	required property real tileWidth
 	required property ScreenState screenState
@@ -19,7 +21,7 @@ Item {
 	implicitHeight: tileHeight + Tokens.padding.large * 2
 	implicitWidth: tileWidth
 
-	CustomClippingRect {
+	ClipRect {
 		id: image
 
 		anchors.horizontalCenter: parent.horizontalCenter
@@ -29,25 +31,75 @@ Item {
 		radius: Tokens.rounding.small
 		y: Tokens.padding.large
 
-		MaterialIcon {
+		Loader {
+			active: opacity > 0
 			anchors.centerIn: parent
-			color: Colors.tPalette.m3outline
-			fontStyle: Tokens.font.icon.builders.extraLarge.scale(2).weight(Font.DemiBold).build()
-			text: "image"
+			opacity: img.status === Image.Ready ? 0 : 1
+
+			Behavior on opacity {
+				Anim {}
+			}
+			sourceComponent: CustomRect {
+				color: Colors.palette.m3primaryContainer
+				implicitHeight: loadingIndicator.implicitSize + Tokens.padding.large * 2
+				implicitWidth: loadingIndicator.implicitSize + Tokens.padding.large * 2
+				radius: Tokens.rounding.full
+
+				LoadingIndicator {
+					id: loadingIndicator
+
+					anchors.centerIn: parent
+					containsIcon: true
+					implicitSize: Math.min(image.width, image.height) * 0.3
+				}
+			}
 		}
 
-		CachingImage {
+		Image {
+			id: img
 			anchors.bottom: parent.bottom
 			anchors.horizontalCenter: parent.horizontalCenter
 			anchors.top: parent.top
-			cache: true
+			asynchronous: true
 			fillMode: Image.PreserveAspectCrop
 			height: root.tileHeight
-			path: root.modelData ? root.modelData.path : ""
+			source: root.modelData ? root.modelData.thumbnailPath : ""
 			smooth: root.isCurrent
 			sourceSize.height: root.tileHeight
 			sourceSize.width: root.tileHeight * (16 / 9)
 			width: root.tileHeight * (16 / 9)
+
+			opacity: status === Image.Ready ? 1 : 0
+			Behavior on opacity {
+				Anim {
+					type: Anim.SlowEffects
+				}
+			}
+
+			Loader {
+				opacity: root.modelData.isVideo && img.status === Image.Ready ? 1 : 0
+				active: opacity > 0
+				anchors.centerIn: parent
+				Behavior on opacity {
+					Anim {
+						type: Anim.SlowEffects
+					}
+				}
+
+				sourceComponent: CustomRect {
+					implicitWidth: videoIcon.implicitWidth + Tokens.padding.extraLarge * 2
+					implicitHeight: implicitWidth
+					radius: Tokens.rounding.full
+					color: Colors.tPalette.m3surface
+
+					MaterialIcon {
+						id: videoIcon
+						anchors.centerIn: parent
+						text: "video_library"
+						fontStyle: Tokens.font.icon.extraLarge
+					}
+				}
+			}
 		}
 
 		StateLayer {

Modules/Lock/Center.qml

@@ -55,7 +55,7 @@ ColumnLayout {
 		text: Time.format("dddd, d MMMM yyyy")
 	}
 
-	CustomClippingRect {
+	ClipRect {
 		Layout.alignment: Qt.AlignHCenter
 		Layout.topMargin: Tokens.spacing.largeIncreased * 2
 		color: Colors.tPalette.m3surfaceContainer

Modules/Lock/Content.qml

@@ -5,14 +5,13 @@ import qs.Helpers
 import ZShell.Config
 import qs.Services
 
-CustomClippingRect {
+Item {
 	id: root
 
 	required property var lock
 
 	implicitHeight: layout.implicitHeight
 	implicitWidth: layout.implicitWidth
-	radius: Tokens.rounding.largeIncreased
 
 	RowLayout {
 		id: layout
@@ -50,22 +49,10 @@ CustomClippingRect {
 			lock: root.lock
 		}
 
-		ColumnLayout {
-			Layout.fillWidth: true
-			spacing: Tokens.spacing.medium
-
-			CustomRect {
+		NotifDock {
 			Layout.fillHeight: true
 			Layout.fillWidth: true
-				bottomRightRadius: Tokens.rounding.largeIncreased
-				color: Colors.tPalette.m3surfaceContainer
-				radius: Tokens.rounding.small
-				topRightRadius: Tokens.rounding.largeIncreased
-
-				NotifDock {
 			lock: root.lock
 		}
 	}
-		}
-	}
 }

Modules/Lock/LockSurface.qml

@@ -221,9 +221,9 @@ WlSessionLockSurface {
 
 			anchors.fill: parent
 			color: Colors.palette.m3surface
-			layer.enabled: true
 			opacity: Colors.transparency.enabled ? Colors.transparency.base : 1
 			radius: lockContent.radius
+			layer.enabled: true
 
 			layer.effect: MultiEffect {
 				blurMax: 15

Modules/Lock/Media.qml

@@ -2,19 +2,24 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import ZShell.Components
-import qs.Components
 import ZShell.Config
+import qs.Components
 import qs.Helpers
 import qs.Services
 
-CustomClippingRect {
+Item {
 	id: root
 
 	required property var lock
 
-	color: Colors.tPalette.m3surfaceContainer
 	implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
+
+	ClipRect {
+		anchors.fill: parent
+
+		color: Colors.tPalette.m3surfaceContainer
 		radius: Tokens.rounding.small
+		bottomLeftRadius: Tokens.rounding.largeIncreased
 
 		FadeImage {
 			id: image
@@ -22,7 +27,6 @@ CustomClippingRect {
 			anchors.fill: parent
 			asynchronous: true
 			fillMode: Image.PreserveAspectCrop
-		layer.enabled: true
 			opacity: status === Image.Ready ? 1 : 0
 			source: Players.getArtUrl(Players.active)
 			sourceSize: {
@@ -42,6 +46,7 @@ CustomClippingRect {
 				opacity: 0.7
 			}
 		}
+	}
 
 	ColumnLayout {
 		id: layout
@@ -77,7 +82,7 @@ CustomClippingRect {
 			spacing: Tokens.spacing.extraSmall
 
 			IconButton {
-				enabled: Players.active?.canGoPrevious
+				enabled: Players.active?.canGoPrevious ?? false
 				icon: "skip_previous"
 				isRound: true
 				shapeMorph: true
@@ -88,7 +93,7 @@ CustomClippingRect {
 
 			IconButton {
 				checked: Players.active?.isPlaying ?? false
-				enabled: Players.active?.canTogglePlaying
+				enabled: Players.active?.canTogglePlaying ?? false
 				icon: Players.active?.isPlaying ? "pause" : "play_arrow"
 				implicitWidth: implicitHeight + Tokens.padding.largeIncreased * 2
 				isRound: true
@@ -98,7 +103,7 @@ CustomClippingRect {
 			}
 
 			IconButton {
-				enabled: Players.active?.canGoNext
+				enabled: Players.active?.canGoNext ?? false
 				icon: "skip_next"
 				isRound: true
 				shapeMorph: true

Modules/Lock/NotifDock.qml

@@ -11,11 +11,17 @@ import ZShell.Config
 import qs.Daemons
 import qs.Services
 
-ColumnLayout {
+CustomRect {
 	id: root
 
 	required property var lock
 
+	bottomRightRadius: Tokens.rounding.largeIncreased
+	color: Colors.tPalette.m3surfaceContainer
+	radius: Tokens.rounding.small
+	topRightRadius: Tokens.rounding.largeIncreased
+
+	ColumnLayout {
 		anchors.fill: parent
 		anchors.margins: Tokens.padding.large
 		spacing: Tokens.spacing.small
@@ -24,18 +30,13 @@ ColumnLayout {
 			Layout.fillWidth: true
 			color: Colors.palette.m3outline
 			elide: Text.ElideRight
-		font.family: Config.appearance.font.family.mono
-		font.weight: 500
+			font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
 			text: NotifServer.list.length > 0 ? qsTr("%1 notification%2").arg(NotifServer.list.length).arg(NotifServer.list.length === 1 ? "" : "s") : qsTr("Notifications")
 		}
 
-	ClippingRectangle {
-		id: clipRect
-
+		Item {
 			Layout.fillHeight: true
 			Layout.fillWidth: true
-		color: "transparent"
-		radius: Tokens.rounding.small
 
 			Loader {
 				active: opacity > 0
@@ -50,19 +51,6 @@ ColumnLayout {
 				sourceComponent: ColumnLayout {
 					spacing: Tokens.spacing.largeIncreased
 
-				Image {
-					asynchronous: true
-					fillMode: Image.PreserveAspectFit
-					layer.enabled: true
-					source: Qt.resolvedUrl(`${Quickshell.shellDir}/assets/dino.png`)
-					sourceSize.width: clipRect.width * 0.8
-
-					layer.effect: Coloriser {
-						brightness: 1
-						colorizationColor: Colors.palette.m3outlineVariant
-					}
-				}
-
 					CustomText {
 						Layout.alignment: Qt.AlignHCenter
 						color: Colors.palette.m3outlineVariant
@@ -136,4 +124,5 @@ ColumnLayout {
 				}
 			}
 		}
+	}
 }

Modules/Lock/NotifGroup.qml

@@ -85,7 +85,7 @@ CustomRect {
 				}
 			}
 
-			ClippingRectangle {
+			ClipRect {
 				anchors.fill: parent
 				color: root.urgency === "critical" ? Colors.palette.m3error : root.urgency === "low" ? Colors.layer(Colors.palette.m3surfaceContainerHighest, 3) : Colors.palette.m3secondaryContainer
 				radius: Tokens.rounding.full

Modules/Lock/UserImage.qml

@@ -1,12 +1,13 @@
 import Quickshell
 import Quickshell.Widgets
 import QtQuick
+import qs.Components
 import qs.Paths
 
 Item {
 	id: root
 
-	ClippingRectangle {
+	ClipRect {
 		anchors.fill: parent
 		radius: Tokens.rounding.full
 

Modules/Lock/Weather/BriefInfo.qml

@@ -16,7 +16,7 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		animate: true
 		color: Colors.palette.m3onSurfaceVariant
-		font: Tokens.font.title.large
+		font: Tokens.font.body.large
 		text: Weather.description
 	}
 
@@ -29,7 +29,7 @@ ColumnLayout {
 
 			animate: true
 			color: Colors.palette.m3primary
-			font: Tokens.font.body.large
+			font: Tokens.font.title.large
 			text: Weather.temp
 		}
 
@@ -37,6 +37,7 @@ ColumnLayout {
 			animate: true
 			color: Colors.palette.m3secondary
 			text: Weather.icon
+			fontStyle: Tokens.font.icon.large
 		}
 	}
 
@@ -53,7 +54,7 @@ ColumnLayout {
 		Layout.alignment: Qt.AlignHCenter
 		animate: true
 		color: Colors.palette.m3onSurfaceVariant
-		font: Tokens.font.body.normal
+		font: Tokens.font.body.medium
 		text: {
 			const today = Weather.forecast[0];
 			return qsTr("High %1 • Low %2").arg(Weather.formatTemp(today?.maxTempC)).arg(Weather.formatTemp(today?.minTempC));

Modules/Lock/Weather/Forecast.qml

@@ -36,7 +36,7 @@ CustomRect {
 		}
 	}
 
-	VerticalFadeListView {
+	CustomListView {
 		id: layout
 
 		anchors.bottom: parent.bottom
@@ -45,13 +45,20 @@ CustomRect {
 		anchors.margins: Tokens.padding.large
 		anchors.right: parent.right
 		implicitHeight: contentItem.childrenRect.height
-		model: Weather.hourlyForecast
+		currentIndex: Weather.currentHourIndex
+		// highlightFollowsCurrentItem: true
+		// preferredHighlightEnd: currentItem.implicitWidth
+		// preferredHighlightBegin: 0
+		// highlightRangeMode: ListView.ApplyRange
+		clip: true
+		model: Weather.hourlyForecast.slice(Weather.currentHourIndex - 1)
 		orientation: VerticalFadeListView.Horizontal
 		spacing: Tokens.spacing.medium
 
 		delegate: ColumnLayout {
 			id: hour
 
+			readonly property bool current: ListView.view.currentItem === this
 			readonly property var cond: modelData
 			required property int index
 			required property var modelData
@@ -60,7 +67,7 @@ CustomRect {
 
 			MaterialShape {
 				Layout.alignment: Qt.AlignHCenter
-				color: Qt.alpha(Colors.palette.m3primary, hour.index === Weather.currentHourIndex ? 1 : 0)
+				color: Qt.alpha(Colors.palette.m3primary, hour.current ? 1 : 0)
 				implicitSize: temp.implicitHeight + Tokens.padding.small * 2
 				shape: MaterialShape.Cookie4Sided
 
@@ -72,7 +79,7 @@ CustomRect {
 					id: temp
 
 					anchors.centerIn: parent
-					color: hour.index === Weather.currentHourIndex ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+					color: hour.current ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
 					font: Tokens.font.body.medium
 					text: Weather.formatTemp(hour.cond.tempC).slice(0, -1) // Remove C/F
 				}
@@ -96,7 +103,7 @@ CustomRect {
 				Layout.topMargin: Tokens.spacing.extraSmall
 				color: Colors.palette.m3onSurfaceVariant
 				font: Tokens.font.body.small
-				text: hour.index === 0 ? qsTr("Now") : Qt.formatDateTime(new Date(hour.cond.timestamp.replace("T", " ")), Config.services.useTwelveHourClock ? "ha" : "hh:00")
+				text: hour.current ? qsTr("Now") : Qt.formatDateTime(new Date(hour.cond.timestamp.replace("T", " ")), Config.services.useTwelveHourClock ? "ha" : "hh:00")
 			}
 		}
 	}

Modules/Lock/WeatherInfo.qml

@@ -19,6 +19,7 @@ CustomRect {
 		return base + brief.anchors.topMargin;
 	}
 	radius: Tokens.rounding.small
+	topLeftRadius: Tokens.rounding.largeIncreased
 
 	Timer {
 		interval: 900000 // 15 minutes
@@ -48,7 +49,6 @@ CustomRect {
 		anchors.right: parent.right
 		asynchronous: true
 
-		sourceComponent: Forecast {
-		}
+		sourceComponent: Forecast {}
 	}
 }

Modules/Notifications/Content.qml

@@ -28,7 +28,10 @@ Item {
 		for (let i = 0; i < count; i++)
 			height += (list.itemAtIndex(i) as NotifWrapper)?.nonAnimHeight ?? 0;
 
-		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x || screenState.dashboard)
+		if (panels.popouts.hasCurrent && (panels.popouts.currentCenter + (panels.popouts.current?.width / 2)) > panels.notifications.x)
+			return 0;
+
+		if (screenState.dashboard && (panels.dashboard.x + panels.dashboard.width >= panels.notifications.x))
 			return 0;
 
 		if (screenState.osd) {

Modules/Notifications/Notification.qml

@@ -108,7 +108,7 @@ CustomRect {
 				visible: root.hasImage || root.hasAppIcon
 				width: Config.notifs.sizes.image
 
-				sourceComponent: CustomClippingRect {
+				sourceComponent: ClipRect {
 					color: root.modelData.urgency === NotificationUrgency.Critical ? Colors.palette.m3error : root.modelData.urgency === NotificationUrgency.Low ? Colors.layer(Colors.palette.m3surfaceContainerHighest, 2) : Colors.palette.m3secondaryContainer
 					implicitHeight: Config.notifs.sizes.image
 					implicitWidth: Config.notifs.sizes.image

Modules/Resources/Cards/BatteryTank.qml

@@ -5,7 +5,7 @@ import ZShell.Config
 import qs.Components
 import qs.Services
 
-CustomClippingRect {
+ClipRect {
 	id: root
 
 	property real animPerc: UPower.displayDevice.percentage

Modules/Resources/Cards/HeroCard.qml

@@ -19,7 +19,7 @@ CustomRect {
 	implicitWidth: 450
 	radius: Tokens.rounding.largeIncreased
 
-	CustomClippingRect {
+	ClipRect {
 		anchors.fill: parent
 		radius: parent.radius
 

Modules/Settings/Common/PageBase.qml

@@ -149,7 +149,7 @@ ColumnLayout {
 		}
 	}
 
-	Flickable {
+	CustomFlickable {
 		id: flickable
 
 		Layout.fillHeight: true

Modules/Settings/Common/WallItem.qml

@@ -25,7 +25,7 @@ Item {
 		anchors.fill: parent
 		spacing: Tokens.spacing.small
 
-		CustomClippingRect {
+		ClipRect {
 			id: imgWrapper
 
 			Layout.fillWidth: true
@@ -39,8 +39,7 @@ Item {
 				opacity: img.status === Image.Ready ? 0 : 1
 
 				Behavior on opacity {
-					Anim {
-					}
+					Anim {}
 				}
 				sourceComponent: CustomRect {
 					color: Colors.palette.m3primaryContainer
@@ -64,18 +63,43 @@ Item {
 				anchors.fill: parent
 				asynchronous: true
 				fillMode: Image.PreserveAspectCrop
-				opacity: status === Image.Ready ? 1 : 0
 				retainWhileLoading: true
 				sourceSize: {
 					const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
 					return Qt.size(width * dpr, height * dpr);
 				}
 
+				opacity: status === Image.Ready ? 1 : 0
 				Behavior on opacity {
 					Anim {
 						type: Anim.SlowEffects
 					}
 				}
+
+				Loader {
+					opacity: root.modelData.isVideo && img.status === Image.Ready ? 1 : 0
+					active: opacity > 0
+					anchors.centerIn: parent
+					Behavior on opacity {
+						Anim {
+							type: Anim.SlowEffects
+						}
+					}
+
+					sourceComponent: CustomRect {
+						implicitWidth: videoIcon.implicitWidth + Tokens.padding.extraLarge * 2
+						implicitHeight: implicitWidth
+						radius: Tokens.rounding.full
+						color: Colors.tPalette.m3surface
+
+						MaterialIcon {
+							id: videoIcon
+							anchors.centerIn: parent
+							text: "video_library"
+							fontStyle: Tokens.font.icon.extraLarge
+						}
+					}
+				}
 			}
 		}
 	}

Modules/Settings/Common/WallpaperCropper.qml

@@ -13,9 +13,14 @@ import qs.Services
 Item {
 	id: wrapper
 
-	property int buttonRowHeight: Tokens.padding.large * 3
+	readonly property bool isVideo: Wallpapers.currentIsVideo
+	readonly property string currentWallpaper: Wallpapers.current
+	readonly property var currentScreen: screens.length > selectedScreenIndex ? screens[selectedScreenIndex] : null
+	readonly property real maxZoom: 5.0
 	readonly property bool changesMade: {
 		cropRevision;
+		Wallpapers.cropVersion;
+		wrapper.currentWallpaper;
 
 		const r = cropRectLoader.item;
 		if (!r || !currentScreen || scaledImg.status !== Image.Ready)
@@ -25,9 +30,9 @@ Item {
 
 		return Math.abs(r.x - t.x) > 0.5 || Math.abs(r.y - t.y) > 0.5 || Math.abs(r.zoom - t.zoom) > 0.001;
 	}
+
+	property int buttonRowHeight: Tokens.padding.large * 3
 	property int cropRevision: 0
-	readonly property var currentScreen: screens.length > selectedScreenIndex ? screens[selectedScreenIndex] : null
-	readonly property real maxZoom: 5.0
 	property var screens: []
 	property int selectedScreenIndex: 0
 	property bool shouldBeActive: true
@@ -100,29 +105,28 @@ Item {
 	visible: opacity > 0
 
 	Behavior on opacity {
-		Anim {
-		}
+		Anim {}
 	}
 	Behavior on scale {
-		Anim {
-		}
+		Anim {}
 	}
 	Behavior on y {
-		Anim {
-		}
+		Anim {}
 	}
 
 	Component.onCompleted: {
 		refreshScreens();
 		Qt.callLater(syncCropToScreen);
 	}
+	onCurrentWallpaperChanged: {
+		Qt.callLater(syncCropToScreen);
+	}
 	onSelectedScreenIndexChanged: {
 		Qt.callLater(syncCropToScreen);
 	}
 
-	ButtonRow {
-		id: screenSelector
-
+	Loader {
+		id: selectorLoader
 		anchors.bottom: imageSlot.top
 		anchors.bottomMargin: Tokens.spacing.medium
 		anchors.left: parent.left
@@ -130,6 +134,12 @@ Item {
 		anchors.right: parent.right
 		anchors.rightMargin: Tokens.padding.extraLarge * 2
 		anchors.top: parent.top
+
+		active: wrapper.screens.length > 1 && !wrapper.isVideo
+
+		sourceComponent: ButtonRow {
+			id: screenSelector
+
 			spacing: Tokens.spacing.small
 
 			Repeater {
@@ -152,6 +162,7 @@ Item {
 				}
 			}
 		}
+	}
 
 	RowLayout {
 		id: sliderLayout
@@ -160,6 +171,7 @@ Item {
 		anchors.left: parent.left
 		anchors.right: parent.right
 		implicitHeight: 30
+		enabled: !wrapper.isVideo
 
 		CustomSlider {
 			id: zoomSlider
@@ -222,9 +234,9 @@ Item {
 		anchors.left: parent.left
 		anchors.right: parent.right
 		anchors.top: parent.top
-		anchors.topMargin: wrapper.buttonRowHeight + Tokens.spacing.medium
+		anchors.topMargin: selectorLoader.active ? wrapper.buttonRowHeight + Tokens.spacing.medium : Tokens.spacing.medium
 
-		CustomClippingRect {
+		ClipRect {
 			id: fitBox
 
 			readonly property real aspect: scaledImg.implicitHeight > 0 ? scaledImg.implicitWidth / scaledImg.implicitHeight : 1
@@ -271,7 +283,7 @@ Item {
 				opacity: status === Image.Ready ? 1 : 0
 				retainWhileLoading: true
 				smooth: true
-				source: Wallpapers.current
+				source: Wallpapers.currentThumbnail
 				sourceSize.height: {
 					const dpr = (QsWindow.window as QsWindow)?.devicePixelRatio ?? 1;
 					return imageSlot.height * dpr;
@@ -282,12 +294,37 @@ Item {
 						type: Anim.SlowEffects
 					}
 				}
+
+				Loader {
+					opacity: wrapper.isVideo && scaledImg.status === Image.Ready ? 1 : 0
+					active: opacity > 0
+					anchors.centerIn: parent
+					Behavior on opacity {
+						Anim {
+							type: Anim.SlowEffects
+						}
+					}
+
+					sourceComponent: CustomRect {
+						implicitWidth: videoIcon.implicitWidth + Tokens.padding.extraLarge * 2
+						implicitHeight: implicitWidth
+						radius: Tokens.rounding.full
+						color: Colors.tPalette.m3surface
+
+						MaterialIcon {
+							id: videoIcon
+							anchors.centerIn: parent
+							text: "video_library"
+							fontStyle: Tokens.font.icon.extraLarge
+						}
+					}
+				}
 			}
 
 			Loader {
 				id: cropRectLoader
 
-				active: scaledImg.status === Image.Ready
+				active: scaledImg.status === Image.Ready && !wrapper.isVideo
 
 				sourceComponent: Component {
 					CustomRect {
@@ -330,7 +367,6 @@ Item {
 							y = t.y;
 						}
 
-						// Where the rect should be according to saved data (same rules as a restore).
 						function savedTarget() {
 							const data = Wallpapers.getCrop(wrapper.currentScreen.name);
 							const hasCrop = data && (Math.abs(data.x) > 0.001 || Math.abs(data.y) > 0.001 || Math.abs(data.width - 1.0) > 0.001 || Math.abs(data.height - 1.0) > 0.001);
@@ -357,8 +393,7 @@ Item {
 						width: Math.round(baseWidth / zoom)
 
 						Behavior on color {
-							CAnim {
-							}
+							CAnim {}
 						}
 
 						Component.onCompleted: {
@@ -434,9 +469,10 @@ Item {
 				}
 
 				anchors.fill: parent
-				cursorShape: pressed ? Qt.ClosedHandCursor : insideCropRect(mouseX, mouseY) ? Qt.OpenHandCursor : Qt.PointingHandCursor
+				cursorShape: wrapper.isVideo ? Qt.ArrowCursor : pressed ? Qt.ClosedHandCursor : insideCropRect(mouseX, mouseY) ? Qt.OpenHandCursor : Qt.PointingHandCursor
 				hoverEnabled: true
 				preventStealing: true
+				enabled: !wrapper.isVideo
 
 				onPositionChanged: mouse => {
 					if (pressed) {

Modules/Settings/Content.qml

@@ -38,6 +38,7 @@ Item {
 	}
 
 	BlobInvertedRect {
+		id: blobRect
 		anchors.fill: parent
 		borderBottom: Tokens.padding.small
 		borderLeft: navPane.width + navPane.anchors.margins * 2
@@ -65,6 +66,7 @@ Item {
 		anchors.bottom: parent.bottom
 		anchors.left: navPane.right
 		anchors.leftMargin: navPane.anchors.margins + anchors.margins
+		anchors.bottomMargin: blobRect.borderBottom
 		anchors.margins: Tokens.padding.extraLarge
 		anchors.right: parent.right
 		anchors.top: parent.top

Modules/Settings/Pages.qml

@@ -38,7 +38,6 @@ Item {
 		id: container
 
 		anchors.fill: parent
-		layer.enabled: opacity < 1
 		objectName: "PageContainer"
 
 		Component.onCompleted: root.loadPage(root.sState.currentPageIdx)

Modules/Settings/Pages/Wallpaper/WallpaperSelect.qml

@@ -50,11 +50,12 @@ PageBase {
 				}
 
 				WallItem {
-					required property FileSystemEntry modelData
+					id: wallItem
+					required property WallpaperEntry modelData
 
 					enabled: modelData
 					opacity: modelData ? 1 : 0
-					source: String(modelData?.path ?? "")
+					source: String(modelData?.thumbnailPath ?? "")
 
 					onClicked: {
 						Wallpapers.setWallpaper(modelData.path);

Modules/Settings/Pages/WallpaperPage.qml

@@ -13,6 +13,42 @@ import qs.Services
 PageBase {
 	id: root
 
+	readonly property list<MenuItem> wallTransitions: [
+		MenuItem {
+			text: "Bowtie"
+		},
+		MenuItem {
+			text: "Fade"
+		},
+		MenuItem {
+			text: "LinearBlur"
+		},
+		MenuItem {
+			text: "WindowSlices"
+		},
+		MenuItem {
+			text: "WipeRight"
+		},
+		MenuItem {
+			text: "WipeDown"
+		},
+		MenuItem {
+			text: "TilesWave"
+		},
+		MenuItem {
+			text: "SplitSlideInHorizontal"
+		},
+		MenuItem {
+			text: "Hexagonalize"
+		},
+		MenuItem {
+			text: "DoomMelt"
+		},
+		MenuItem {
+			text: "Random"
+		}
+	]
+
 	title: qsTr("Wallpaper & style")
 
 	ColumnLayout {
@@ -73,6 +109,18 @@ PageBase {
 			onToggled: Config.background.enabled = checked
 		}
 
+		SelectRow {
+			Layout.topMargin: Tokens.spacing.extraSmall / 2 - parent.spacing
+			active: root.wallTransitions[Config.background.wallTransition]
+			menuItems: root.wallTransitions
+			menuOnTop: true
+			settingAnchor: "style-wallpaper-transition"
+			subtext: qsTr("Currently selected: %1").arg(active.text)
+			text: qsTr("Wallpaper transition")
+
+			onSelected: item => Config.background.wallTransition = root.wallTransitions.indexOf(item)
+		}
+
 		ToggleRow {
 			Layout.topMargin: Tokens.spacing.extraSmall / 2 - parent.spacing
 			checked: Colors.transparency.enabled

Modules/Sidebar/Chat/ChatContent.qml

@@ -3,6 +3,7 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import QtQuick.Layouts
+import ZShell.Services
 import ZShell.Components
 import ZShell.Config
 import ZShell.Llm
@@ -90,7 +91,9 @@ Item {
 	signal requestClose
 
 	readonly property bool atNewestEnd: !listLoader.item || listLoader.item.contentY < 4
+	readonly property bool importing: importIds.length > 0
 
+	property var importIds: []
 	property var pendingAttachments: []
 
 	function attachFiles(): void {
@@ -436,7 +439,7 @@ Item {
 			width: attachments.cellWidth
 			height: width
 			opacity: modelData ? 1 : 0
-			CustomClippingRect {
+			ClipRect {
 				anchors.fill: parent
 				anchors.margins: Tokens.spacing.extraSmall
 
@@ -541,7 +544,7 @@ Item {
 		bg.border.color: Colors.palette.m3outlineVariant
 		bg.color: Colors.tPalette.m3surfaceContainerLowest
 		fastGlow: LlmClient.busy
-		glow.opacity: input.activeFocus && (!LlmClient.busy || ChatState.isWindow)
+		glow.opacity: !ChatState.narrowSidebarExpanded ? (input.activeFocus && (!LlmClient.busy || ChatState.isWindow) ? 1 : 0) : 0
 		font: Tokens.font.body.small
 		implicitHeight: Math.min(root.height / 5, contentHeight + topPadding + bottomPadding)
 		focus: true
@@ -578,4 +581,52 @@ Item {
 				root.send(text);
 		}
 	}
+
+	Connections {
+		target: DropImporter
+
+		function onImportFinished(id: int, paths: var, errors: var): void {
+			if (!root.importIds.includes(id))
+				return;
+			root.importIds = root.importIds.filter(i => i !== id);
+
+			if (paths.length > 0) {
+				const added = root.chatData.addAttachments(paths);
+				root.pendingAttachments = root.pendingAttachments.concat(added);
+			}
+			for (const e of errors)
+				console.warn("Drop import:", e);
+		}
+	}
+
+	DropArea {
+		id: dropArea
+
+		anchors.fill: parent
+
+		onEntered: drag => {
+			drag.accepted = drag.hasUrls || drag.hasText || drag.hasHtml || drag.formats.some(f => f.startsWith("image/"));
+		}
+
+		onDropped: drop => {
+			const formats = drop.formats;
+			const urls = drop.hasUrls ? drop.urls : [];
+			const text = drop.hasText ? drop.text : "";
+			const html = drop.hasHtml ? drop.html : "";
+
+			const imgFormat = formats.find(f => f.startsWith("image/"));
+			const raw = imgFormat ? drop.getDataAsArrayBuffer(imgFormat) : new ArrayBuffer(0);
+
+			switch (DropImporter.decide(urls, text, html, raw.byteLength > 0)) {
+			case DropImporter.Attach:
+				root.importIds = [...root.importIds, DropImporter.importAttachments(urls, html, raw)];
+				break;
+			case DropImporter.InsertText:
+				input.insert(input.cursorPosition, text || urls.map(u => u.toString()).join("\n"));
+				root.focusInput();
+				break;
+			}
+			drop.acceptProposedAction();
+		}
+	}
 }

Modules/Sidebar/Chat/ChatDelegate.qml

@@ -91,6 +91,50 @@ CustomRect {
 
 		opacity: root.slim ? 0 : 1
 
+		state: titleText.readOnly ? "static" : "editing"
+
+		states: [
+			State {
+				name: "static"
+				PropertyChanges {
+					staticText.opacity: 1
+				}
+				PropertyChanges {
+					titleText.opacity: 0
+				}
+			},
+			State {
+				name: "editing"
+				PropertyChanges {
+					staticText.opacity: 0
+				}
+				PropertyChanges {
+					titleText.opacity: 1
+				}
+			}
+		]
+
+		transitions: [
+			// Going static: titleText fades out (animated), staticText snaps in
+			Transition {
+				to: "static"
+				Anim {
+					target: titleText
+					property: "opacity"
+					type: Anim.SlowEffects
+				}
+			},
+			// Going editing: staticText fades out (animated), titleText snaps in
+			Transition {
+				to: "editing"
+				Anim {
+					target: staticText
+					property: "opacity"
+					type: Anim.SlowEffects
+				}
+			}
+		]
+
 		Behavior on opacity {
 			Anim {
 				type: Anim.DefaultEffects
@@ -106,7 +150,7 @@ CustomRect {
 			color: Colors.layer(Colors.palette.m3surfaceContainerHighest, 1)
 			implicitHeight: titleText.implicitHeight + Tokens.padding.extraSmall * 2
 			radius: Tokens.rounding.full
-			implicitWidth: titleText.implicitWidth + Tokens.padding.large * 2
+			implicitWidth: titleText.width + Tokens.padding.large * 2
 			opacity: titleText.readOnly ? 0 : 1
 
 			Behavior on opacity {
@@ -122,11 +166,6 @@ CustomRect {
 			anchors.right: parent.right
 			implicitHeight: titleText.implicitHeight + Tokens.padding.small * 2
 
-			layer.enabled: true
-			layer.effect: OpacityMask {
-				maskSource: fadeMask
-			}
-
 			TextFieldBase {
 				id: titleText
 
@@ -134,10 +173,12 @@ CustomRect {
 				anchors.leftMargin: readOnly ? 0 : Tokens.padding.large
 				anchors.top: parent.top
 				anchors.topMargin: readOnly ? Tokens.padding.small : Tokens.padding.extraSmall * 2
+				width: Math.min(implicitWidth, parent.width - Tokens.padding.large * 2)
 				font: Tokens.font.body.medium
 				text: root.modelData.title || qsTr("New chat")
 				readOnly: true
 				color: Colors.palette.m3onSurface
+				opacity: 0
 
 				Behavior on anchors.leftMargin {
 					Anim {}
@@ -146,6 +187,11 @@ CustomRect {
 					Anim {}
 				}
 
+				function cancelTitleEdit(): void {
+					text = root.modelData.title;
+					readOnly = true;
+				}
+
 				onEditingFinished: root.modelData.title = text
 				onReadOnlyChanged: {
 					if (!readOnly) {
@@ -156,27 +202,24 @@ CustomRect {
 					}
 				}
 			}
+
+			CustomText {
+				id: staticText
+
+				anchors.left: parent.left
+				anchors.leftMargin: titleText.readOnly ? 0 : Tokens.padding.large
+				anchors.top: parent.top
+				anchors.topMargin: titleText.readOnly ? Tokens.padding.small : Tokens.padding.extraSmall * 2
+				anchors.right: parent.right
+				font: titleText.font
+				text: titleText.text
+				elide: CustomText.ElideRight
+
+				Behavior on anchors.leftMargin {
+					Anim {}
 				}
-
-		CustomRect {
-			id: fadeMask
-
-			anchors.fill: titleWrapper
-
-			layer.enabled: true
-			visible: false
-
-			gradient: Gradient {
-				orientation: Gradient.Horizontal
-
-				GradientStop {
-					color: Qt.rgba(1, 1, 1, 1.0)
-					position: 0.85
-				}
-
-				GradientStop {
-					color: Qt.rgba(1, 1, 1, 0)
-					position: 1.0
+				Behavior on anchors.topMargin {
+					Anim {}
 				}
 			}
 		}
@@ -323,7 +366,13 @@ CustomRect {
 			inactiveColor: Colors.layer(Colors.palette.m3surfaceContainerHighest, 3)
 			inactiveOnColor: Colors.palette.m3onSurfaceVariant
 
-			onClicked: root.remove(root.modelData)
+			onClicked: {
+				if (!titleText.readOnly) {
+					titleText.cancelTitleEdit();
+					return;
+				}
+				root.remove(root.modelData);
+			}
 		}
 
 		IconButton {
@@ -366,7 +415,10 @@ CustomRect {
 		}
 
 		StateLayer {
-			onClicked: root.expanded = !root.expanded
+			onClicked: {
+				root.expanded = !root.expanded;
+				titleText.readOnly = true;
+			}
 		}
 
 		MaterialIcon {

Modules/Sidebar/Chat/ChatList.qml

@@ -140,7 +140,7 @@ Item {
 		label.transform: Rotation {
 			origin.y: fabRoot.label.height / 2
 			origin.x: fabRoot.label.width / 2
-			angle: ChatState.fabExpanded && (ChatState.narrowSidebarExpanded && !ChatState.isWide || !ChatState.isWindow) ? 135 : 0
+			angle: ChatState.fabExpanded && (ChatState.narrowSidebarExpanded || !ChatState.isWide || !ChatState.isWindow) ? 135 : 0
 
 			Behavior on angle {
 				Anim {}
@@ -148,8 +148,9 @@ Item {
 		}
 
 		onClicked: {
-			if (root.slim && !ChatState.narrowSidebarExpanded) {
+			if ((root.slim && !ChatState.narrowSidebarExpanded) || ChatState.shrinkSidebarOverride) {
 				root.requestExpand();
+				ChatState.shrinkSidebarOverride = false;
 				return;
 			}
 
@@ -183,6 +184,10 @@ Item {
 					name: "pop out in window"
 					icon: "open_in_new"
 				}
+				ListElement {
+					name: "shrink sidebar"
+					icon: "left_panel_close"
+				}
 			}
 
 			CustomRect {
@@ -196,7 +201,18 @@ Item {
 
 				radius: sLayer.pressed ? Tokens.rounding.small : implicitHeight / 2
 				color: Colors.palette.m3primaryContainer
-				visible: !(modelData.name === "pop out in window" && ChatState.isWindow)
+				visible: {
+					const n = modelData.name;
+					const w = ChatState.isWindow;
+					const wide = ChatState.isWide;
+
+					if (n === "pop out in window" && w)
+						return false;
+					if (n === "shrink sidebar" && (!w || !wide))
+						return false;
+					else
+						return true;
+				}
 				clip: true
 
 				Behavior on radius {
@@ -297,6 +313,8 @@ Item {
 							root.newChatRequest();
 						else if (name === "pop out in window")
 							Detach.create();
+						else if (name === "shrink sidebar")
+							ChatState.shrinkSidebarOverride = true;
 
 						ChatState.fabExpanded = false;
 					}

Modules/Sidebar/Chat/ChatState.qml

@@ -19,7 +19,7 @@ Singleton {
 	property bool settledSlim: false
 	property bool settledWide: false
 	property bool narrowSidebarExpanded: false
-	property bool windowIsWide: false
+	property bool shrinkSidebarOverride: false
 	property ShellScreen screen
 	property bool sidebarVisible: ShellState.forActive().sidebar
 
@@ -28,6 +28,9 @@ Singleton {
 		root.currentIdx = -1;
 	}
 
+	onIsWideChanged: if (isWide)
+		narrowSidebarExpanded = false
+
 	onSidebarVisibleChanged: if (!sidebarVisible)
 		fabExpanded = false
 }

Modules/Sidebar/Chat/Content/ApprovalPrompt.qml

@@ -337,7 +337,7 @@ Item {
 										}
 									}
 
-									CustomClippingRect {
+									Item {
 										id: expandedTool
 
 										anchors.top: collapsedRow.bottom
@@ -348,8 +348,16 @@ Item {
 										anchors.topMargin: Tokens.spacing.medium
 
 										implicitHeight: fullToolCall.implicitHeight + fullToolCall.anchors.margins * 2
+										clip: true
+
+										CustomRect {
+											id: bg
+
+											anchors.fill: parent
+
 											radius: Tokens.rounding.medium
 											color: Colors.palette.m3surfaceContainerLow
+										}
 
 										CustomText {
 											id: fullToolCall

Modules/Sidebar/Chat/Content/ChatHost.qml

@@ -59,7 +59,6 @@ Item {
 		id: container
 
 		anchors.fill: parent
-		layer.enabled: opacity < 1
 		objectName: "ConversationContainer"
 
 		Component.onCompleted: {

Modules/Sidebar/Chat/Content/CodeBlockView.qml

@@ -220,9 +220,8 @@ CustomRect {
 
 			Layout.alignment: Qt.AlignVCenter
 			color: root.codeHeaderColor
-			font: Tokens.font.label.small
+			font: Tokens.font.label.builders.small.capitalization(Font.Capitalize).build()
 			text: CodeIcons.name(root.language)
-			visible: root.language.length > 0
 		}
 
 		Item {
@@ -252,7 +251,7 @@ CustomRect {
 		}
 	}
 
-	CustomClippingRect {
+	CustomRect {
 		id: codeRect
 
 		anchors.left: parent.left
@@ -265,6 +264,7 @@ CustomRect {
 		implicitWidth: codeText.implicitWidth + codeFlick.anchors.margins * 2
 		implicitHeight: codeText.implicitHeight + codeFlick.anchors.margins * 2
 		color: CodeColors.active.bg
+		clip: true
 
 		Flickable {
 			id: codeFlick
@@ -272,6 +272,9 @@ CustomRect {
 			anchors.fill: parent
 			anchors.margins: Tokens.padding.small
 
+			boundsBehavior: Flickable.StopAtBounds
+			contentWidth: codeText.implicitWidth
+
 			CustomScrollBar.horizontal: CustomScrollBar {
 				flickable: codeFlick
 				parent: codeFlick.parent
@@ -280,16 +283,13 @@ CustomRect {
 				anchors.right: parent.right
 			}
 
-			TextAreaBase.flickable: TextAreaBase {
+			CustomText {
 				id: codeText
 
 				color: CodeColors.active.normal
-				layer.enabled: true
-				clip: false
 				font: Tokens.font.mono.small
-				textFormat: root.colored ? Text.RichText : Text.PlainText
+				textFormat: Text.RichText
 				text: root.colored ? root.html : root.plainForDisplay(root.code)
-				readOnly: true
 			}
 		}
 	}

Modules/Sidebar/Chat/Content/CodeIcons.qml

@@ -66,378 +66,380 @@ Singleton {
 	readonly property string graphql: "M 18.39 96.852 l -4.6 -2.657 L 65.04 5.434 l 4.597 2.656 z m 0 0 M 12.734 87.105 H 115.23 v 5.31 H 12.734 z m 0 0 M 66.031 119.688 L 14.766 90.09 l 2.656 -4.602 l 51.266 29.602 z m 0 0 M 110.566 42.543 L 59.301 12.941 l 2.656 -4.597 l 51.266 29.597 z m 0 0 M 17.434 42.523 l -2.657 -4.601 l 51.27 -29.598 l 2.656 4.598 z m 0 0 M 109.621 96.852 L 58.375 8.09 l 4.598 -2.656 l 51.25 88.761 z m 0 0 M 16.8 34.398 h 5.313 v 59.204 h -5.312 z m 0 0 M 105.887 34.398 h 5.312 v 59.204 h -5.312 z m 0 0 M 65.129 117.441 l -2.32 -4.02 l 44.586 -25.745 l 2.32 4.02 z m 0 0 M 118.238 95.328 c -3.07 5.344 -9.918 7.168 -15.261 4.098 c -5.344 -3.074 -7.168 -9.922 -4.098 -15.266 c 3.074 -5.344 9.922 -7.168 15.266 -4.097 c 5.375 3.105 7.199 9.921 4.093 15.265 M 29.09 43.84 c -3.074 5.344 -9.922 7.168 -15.266 4.097 c -5.344 -3.074 -7.168 -9.921 -4.097 -15.265 c 3.074 -5.344 9.921 -7.168 15.265 -4.098 c 5.344 3.106 7.168 9.922 4.098 15.266 M 9.762 95.328 c -3.075 -5.344 -1.25 -12.16 4.093 -15.266 c 5.344 -3.07 12.16 -1.246 15.266 4.098 c 3.07 5.344 1.246 12.16 -4.098 15.266 c -5.375 3.07 -12.191 1.246 -15.261 -4.098 M 98.91 43.84 c -3.07 -5.344 -1.246 -12.16 4.098 -15.266 c 5.344 -3.07 12.16 -1.246 15.265 4.098 c 3.07 5.344 1.247 12.16 -4.097 15.266 c -5.344 3.07 -12.192 1.246 -15.266 -4.098 M 64 126.656 a 11.158 11.158 0 0 1 -11.168 -11.168 A 11.158 11.158 0 0 1 64 104.32 a 11.158 11.158 0 0 1 11.168 11.168 c 0 6.145 -4.992 11.168 -11.168 11.168 M 64 23.68 a 11.158 11.158 0 0 1 -11.168 -11.168 A 11.158 11.158 0 0 1 64 1.344 a 11.158 11.158 0 0 1 11.168 11.168 A 11.158 11.158 0 0 1 64 23.68"
 
 	function path(language) {
-        const key = language.toLowerCase()
+		const key = language.toLowerCase();
 
 		switch (key) {
 		case "c":
-            return c
+			return c;
 		case "cpp":
-            return cpp
+			return cpp;
 		case "csharp":
-            return csharp
+			return csharp;
 		case "python":
-            return python
+			return python;
 		case "rust":
-            return rust
+			return rust;
 		case "javascript":
-            return javascript
+			return javascript;
 		case "typescript":
-            return typescript
+			return typescript;
 		case "bash":
-            return bash
+			return bash;
 		case "zsh":
-            return zsh
+			return zsh;
 		case "powershell":
-            return powershell
+			return powershell;
 		case "cmake":
-            return cmake
+			return cmake;
 		case "lua":
-            return lua
+			return lua;
 		case "java":
-            return java
+			return java;
 		case "kotlin":
-            return kotlin
+			return kotlin;
 		case "swift":
-            return swift
+			return swift;
 		case "go":
-            return go
+			return go;
 		case "dart":
-            return dart
+			return dart;
 		case "php":
-            return php
+			return php;
 		case "ruby":
-            return ruby
+			return ruby;
 		case "scala":
-            return scala
+			return scala;
 		case "haskell":
-            return haskell
+			return haskell;
 		case "elixir":
-            return elixir
+			return elixir;
 		case "erlang":
-            return erlang
+			return erlang;
 		case "clojure":
-            return clojure
+			return clojure;
 		case "r":
-            return r
+			return r;
 		case "perl":
-            return perl
+			return perl;
 		case "zig":
-            return zig
+			return zig;
 		case "nim":
-            return nim
+			return nim;
 		case "ocaml":
-            return ocaml
+			return ocaml;
 		case "fsharp":
-            return fsharp
+			return fsharp;
 		case "visualbasic":
-            return visualbasic
+			return visualbasic;
 		case "fortran":
-            return fortran
+			return fortran;
 		case "crystal":
-            return crystal
+			return crystal;
 		case "gleam":
-            return gleam
+			return gleam;
 		case "julia":
-            return julia
+			return julia;
 		case "objectivec":
-            return objectivec
+			return objectivec;
 		case "vala":
-            return vala
+			return vala;
 		case "groovy":
-            return groovy
+			return groovy;
 		case "racket":
-            return racket
+			return racket;
 		case "haxe":
-            return haxe
+			return haxe;
 		case "purescript":
-            return purescript
+			return purescript;
 		case "delphi":
-            return delphi
+			return delphi;
 		case "coffeescript":
-            return coffeescript
+			return coffeescript;
 		case "elm":
-            return elm
+			return elm;
 		case "awk":
-            return awk
+			return awk;
 		case "matlab":
-            return matlab
+			return matlab;
 		case "solidity":
-            return solidity
+			return solidity;
 		case "wasm":
-            return wasm
+			return wasm;
 		case "vim":
-            return vim
+			return vim;
 		case "sql":
-            return sql
+			return sql;
 		case "json":
-            return json
+			return json;
 		case "yaml":
-            return yaml
+			return yaml;
 		case "xml":
-            return xml
+			return xml;
 		case "html":
-            return html
+			return html;
 		case "css":
-            return css
+			return css;
 		case "sass":
-            return sass
+			return sass;
 		case "markdown":
-            return markdown
+			return markdown;
 		case "docker":
-            return docker
+			return docker;
 		case "latex":
-            return latex
+			return latex;
 		case "graphql":
-            return graphql
+			return graphql;
 		case "cpp":
-            return cpp
+			return cpp;
 		case "cc":
-            return cpp
+			return cpp;
 		case "cxx":
-            return cpp
+			return cpp;
 		case "cs":
-            return csharp
+			return csharp;
 		case "js":
-            return javascript
+			return javascript;
 		case "jsx":
-            return javascript
+			return javascript;
 		case "ts":
-            return typescript
+			return typescript;
 		case "tsx":
-            return typescript
+			return typescript;
 		case "py":
-            return python
+			return python;
 		case "sh":
-            return bash
+			return bash;
 		case "shell":
-            return bash
+			return bash;
 		case "ps1":
-            return powershell
+			return powershell;
 		case "vb":
-            return visualbasic
+			return visualbasic;
 		case "objective-c":
-            return objectivec
+			return objectivec;
 		case "obj-c":
-            return objectivec
+			return objectivec;
 		case "groovyscript":
-            return groovy
+			return groovy;
 		case "pascal":
-            return delphi
+			return delphi;
 		case "coffee":
-            return coffeescript
+			return coffeescript;
 		case "mysql":
-            return sql
+			return sql;
 		case "postgres":
-            return sql
+			return sql;
 		case "postgresql":
-            return sql
+			return sql;
 		case "sqlite":
-            return sql
+			return sql;
 		case "yml":
-            return yaml
+			return yaml;
 		case "htm":
-            return html
+			return html;
 		case "scss":
-            return sass
+			return sass;
 		case "md":
-            return markdown
+			return markdown;
 		case "dockerfile":
-            return docker
+			return docker;
 		case "docker-compose":
-            return docker
+			return docker;
 		case "tex":
-            return latex
+			return latex;
 		case "gql":
-            return graphql
+			return graphql;
 		default:
-            return ""
+			return "";
 		}
 	}
 
 	function name(language) {
 		switch (language.toLowerCase()) {
 		case "c":
-            return "C"
+			return "C";
 		case "cpp":
-            return "C++"
+			return "C++";
 		case "csharp":
-            return "C#"
+			return "C#";
 		case "python":
-            return "Python"
+			return "Python";
 		case "rust":
-            return "Rust"
+			return "Rust";
 		case "javascript":
-            return "JavaScript"
+			return "JavaScript";
 		case "typescript":
-            return "TypeScript"
+			return "TypeScript";
 		case "bash":
-            return "Bash"
+			return "Bash";
 		case "zsh":
-            return "Zsh"
+			return "Zsh";
 		case "powershell":
-            return "PowerShell"
+			return "PowerShell";
 		case "cmake":
-            return "CMake"
+			return "CMake";
 		case "lua":
-            return "Lua"
+			return "Lua";
 		case "java":
-            return "Java"
+			return "Java";
 		case "kotlin":
-            return "Kotlin"
+			return "Kotlin";
 		case "swift":
-            return "Swift"
+			return "Swift";
 		case "go":
-            return "Go"
+			return "Go";
 		case "dart":
-            return "Dart"
+			return "Dart";
 		case "php":
-            return "PHP"
+			return "PHP";
 		case "ruby":
-            return "Ruby"
+			return "Ruby";
 		case "scala":
-            return "Scala"
+			return "Scala";
 		case "haskell":
-            return "Haskell"
+			return "Haskell";
 		case "elixir":
-            return "Elixir"
+			return "Elixir";
 		case "erlang":
-            return "Erlang"
+			return "Erlang";
 		case "clojure":
-            return "Clojure"
+			return "Clojure";
 		case "r":
-            return "R"
+			return "R";
 		case "perl":
-            return "Perl"
+			return "Perl";
 		case "zig":
-            return "Zig"
+			return "Zig";
 		case "nim":
-            return "Nim"
+			return "Nim";
 		case "ocaml":
-            return "OCaml"
+			return "OCaml";
 		case "fsharp":
-            return "F#"
+			return "F#";
 		case "visualbasic":
-            return "Visual Basic"
+			return "Visual Basic";
 		case "fortran":
-            return "Fortran"
+			return "Fortran";
 		case "crystal":
-            return "Crystal"
+			return "Crystal";
 		case "gleam":
-            return "Gleam"
+			return "Gleam";
 		case "julia":
-            return "Julia"
+			return "Julia";
 		case "objectivec":
-            return "Objective-C"
+			return "Objective-C";
 		case "vala":
-            return "Vala"
+			return "Vala";
 		case "groovy":
-            return "Groovy"
+			return "Groovy";
 		case "racket":
-            return "Racket"
+			return "Racket";
 		case "haxe":
-            return "Haxe"
+			return "Haxe";
 		case "purescript":
-            return "PureScript"
+			return "PureScript";
 		case "delphi":
-            return "Delphi"
+			return "Delphi";
 		case "coffeescript":
-            return "CoffeeScript"
+			return "CoffeeScript";
 		case "elm":
-            return "Elm"
+			return "Elm";
 		case "awk":
-            return "AWK"
+			return "AWK";
 		case "matlab":
-            return "MATLAB"
+			return "MATLAB";
 		case "solidity":
-            return "Solidity"
+			return "Solidity";
 		case "wasm":
-            return "Wasm"
+			return "Wasm";
 		case "vim":
-            return "Vim"
+			return "Vim";
 		case "sql":
-            return "SQL"
+			return "SQL";
 		case "json":
-            return "JSON"
+			return "JSON";
 		case "yaml":
-            return "YAML"
+			return "YAML";
 		case "xml":
-            return "XML"
+			return "XML";
 		case "html":
-            return "HTML"
+			return "HTML";
 		case "css":
-            return "CSS"
+			return "CSS";
 		case "sass":
-            return "Sass"
+			return "Sass";
 		case "markdown":
-            return "Markdown"
+			return "Markdown";
 		case "docker":
-            return "Docker"
+			return "Docker";
 		case "latex":
-            return "LaTeX"
+			return "LaTeX";
 		case "graphql":
-            return "GraphQL"
+			return "GraphQL";
 		case "cpp":
-            return "C++"
+			return "C++";
 		case "cc":
-            return "C++"
+			return "C++";
 		case "cxx":
-            return "C++"
+			return "C++";
 		case "cs":
-            return "C#"
+			return "C#";
 		case "js":
-            return "JavaScript"
+			return "JavaScript";
 		case "jsx":
-            return "JavaScript"
+			return "JavaScript";
 		case "ts":
-            return "TypeScript"
+			return "TypeScript";
 		case "tsx":
-            return "TypeScript"
+			return "TypeScript";
 		case "py":
-            return "Python"
+			return "Python";
 		case "sh":
-            return "Bash"
+			return "Bash";
 		case "shell":
-            return "Bash"
+			return "Bash";
 		case "ps1":
-            return "PowerShell"
+			return "PowerShell";
 		case "vb":
-            return "Visual Basic"
+			return "Visual Basic";
 		case "objective-c":
-            return "Objective-C"
+			return "Objective-C";
 		case "obj-c":
-            return "Objective-C"
+			return "Objective-C";
 		case "groovyscript":
-            return "Groovy"
+			return "Groovy";
 		case "pascal":
-            return "Delphi"
+			return "Delphi";
 		case "coffee":
-            return "CoffeeScript"
+			return "CoffeeScript";
 		case "mysql":
-            return "SQL"
+			return "SQL";
 		case "postgres":
-            return "SQL"
+			return "SQL";
 		case "postgresql":
-            return "SQL"
+			return "SQL";
 		case "sqlite":
-            return "SQL"
+			return "SQL";
 		case "yml":
-            return "YAML"
+			return "YAML";
 		case "htm":
-            return "HTML"
+			return "HTML";
 		case "scss":
-            return "Sass"
+			return "Sass";
 		case "md":
-            return "Markdown"
+			return "Markdown";
 		case "dockerfile":
-            return "Docker"
+			return "Docker";
 		case "docker-compose":
-            return "Docker"
+			return "Docker";
 		case "tex":
-            return "LaTeX"
+			return "LaTeX";
 		case "gql":
-            return "GraphQL"
+			return "GraphQL";
+		case "":
+			return "Code";
 		default:
-            return language
+			return language;
 		}
 	}
 }

Modules/Sidebar/Chat/Content/ProcessBlock.qml

@@ -125,7 +125,7 @@ Item {
 		current: root.current
 	}
 
-	CustomClippingRect {
+	Item {
 		id: expandedRect
 
 		anchors.left: parent.left
@@ -133,11 +133,19 @@ Item {
 		anchors.top: layout.bottom
 		anchors.bottom: parent.bottom
 		anchors.topMargin: Tokens.spacing.small
-		color: Colors.palette.m3surfaceContainerLow
 		implicitHeight: expandedContent.contentHeight + expandedContent.anchors.margins * 2
 		opacity: root.expanded ? 1 : 0
-		radius: Tokens.rounding.medium
 		visible: opacity > 0
+		clip: true
+
+		CustomRect {
+			id: bg
+
+			anchors.fill: parent
+
+			radius: Tokens.rounding.medium
+			color: Colors.palette.m3surfaceContainerLow
+		}
 
 		Behavior on opacity {
 			Anim {}

Modules/Sidebar/Chat/SidebarView.qml

@@ -21,12 +21,8 @@ Item {
 	property bool chatOpen: ChatState.chatSession !== null
 
 	readonly property bool isWide: root.width >= root.breakpoint
-
-	readonly property bool showList: isWide || !chatOpen
-	readonly property bool showContent: !isWide && chatOpen
-
-	function openConversation(conv: ChatSession, index: int): void {
-	}
+	readonly property bool wideExpandedSidebar: isWide && !ChatState.shrinkSidebarOverride
+	readonly property bool narrowExpandedSidebar: !isWide && ChatState.narrowSidebarExpanded
 
 	BlobGroup {
 		id: blobGroup
@@ -54,9 +50,9 @@ Item {
 		anchors.left: parent.left
 		anchors.bottom: parent.bottom
 		anchors.margins: Tokens.padding.medium
-		implicitWidth: root.isWide || ChatState.narrowSidebarExpanded ? Config.sidebar.sizes.width : root.iconSize
+		implicitWidth: root.wideExpandedSidebar || root.narrowExpandedSidebar ? Config.sidebar.sizes.width : root.iconSize
 		highlight: true
-		slim: !root.isWide && !ChatState.narrowSidebarExpanded
+		slim: !root.wideExpandedSidebar && !root.narrowExpandedSidebar
 		z: 1
 
 		Behavior on implicitWidth {
@@ -86,13 +82,13 @@ Item {
 		}
 	}
 
-	CustomClippingRect {
+	Item {
 		anchors.fill: parent
 		anchors.leftMargin: invertedRect.borderLeft
 		anchors.topMargin: invertedRect.borderTop
 		anchors.bottomMargin: invertedRect.borderBottom
 		anchors.rightMargin: invertedRect.borderRight
-		radius: invertedRect.radius
+		clip: true
 
 		children: [contentArea, dim]
 	}
@@ -100,9 +96,10 @@ Item {
 	CustomRect {
 		id: dim
 		anchors.fill: parent
+		radius: invertedRect.radius
 
 		color: Colors.palette.m3shadow
-		opacity: ChatState.narrowSidebarExpanded && !root.isWide ? 0.3 : 0
+		opacity: root.narrowExpandedSidebar ? 0.3 : 0
 		z: 1
 
 		Behavior on opacity {
@@ -155,7 +152,7 @@ Item {
 			id: dimArea
 			anchors.fill: parent
 			preventStealing: true
-			enabled: !root.isWide && ChatState.narrowSidebarExpanded
+			enabled: root.narrowExpandedSidebar
 			cursorShape: undefined
 
 			onClicked: {
@@ -175,12 +172,6 @@ Item {
 		}
 	}
 
-	Binding {
-		target: ChatState
-		property: "windowIsWide"
-		value: root.showList
-	}
-
 	Binding {
 		target: ChatState
 		property: "isWide"

Modules/Sidebar/NotifActionList.qml

@@ -17,76 +17,6 @@ Item {
 
 	Layout.fillWidth: true
 	implicitHeight: flickable.contentHeight
-	layer.enabled: true
-	layer.smooth: true
-
-	layer.effect: Mask {
-		maskSource: gradientMask
-	}
-
-	Item {
-		id: gradientMask
-
-		anchors.fill: parent
-		layer.enabled: true
-		visible: false
-
-		Rectangle {
-			anchors.fill: parent
-
-			gradient: Gradient {
-				orientation: Gradient.Horizontal
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 0)
-					position: 0
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 1)
-					position: 0.1
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 1)
-					position: 0.9
-				}
-
-				GradientStop {
-					color: Qt.rgba(0, 0, 0, 0)
-					position: 1
-				}
-			}
-		}
-
-		Rectangle {
-			anchors.bottom: parent.bottom
-			anchors.left: parent.left
-			anchors.top: parent.top
-			implicitWidth: parent.width / 2
-			opacity: flickable.contentX > 0 ? 0 : 1
-
-			Behavior on opacity {
-				Anim {
-					type: Anim.DefaultEffects
-				}
-			}
-		}
-
-		Rectangle {
-			anchors.bottom: parent.bottom
-			anchors.right: parent.right
-			anchors.top: parent.top
-			implicitWidth: parent.width / 2
-			opacity: flickable.contentX < flickable.contentWidth - parent.width ? 0 : 1
-
-			Behavior on opacity {
-				Anim {
-					type: Anim.DefaultEffects
-				}
-			}
-		}
-	}
 
 	CustomFlickable {
 		id: flickable

Modules/Sidebar/NotifGroup.qml

@@ -112,7 +112,7 @@ CustomRect {
 				}
 			}
 
-			CustomClippingRect {
+			ClipRect {
 				anchors.fill: parent
 				color: root.urgency === NotificationUrgency.Critical ? Colors.palette.m3error : root.urgency === NotificationUrgency.Low ? Colors.layer(Colors.palette.m3surfaceContainerHigh, 3) : Colors.palette.m3secondaryContainer
 				radius: Tokens.rounding.full

Plugins/CMakeLists.txt

@@ -20,6 +20,14 @@ pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client)
 pkg_check_modules(EGL REQUIRED IMPORTED_TARGET egl)
 pkg_check_modules(WAYLAND_EGL REQUIRED IMPORTED_TARGET wayland-egl)
 pkg_check_modules(GL REQUIRED IMPORTED_TARGET gl)
+pkg_check_modules(MPV REQUIRED IMPORTED_TARGET mpv)
+
+pkg_check_modules(AVCODEC REQUIRED IMPORTED_TARGET libavcodec)
+pkg_check_modules(AVFORMAT REQUIRED IMPORTED_TARGET libavformat)
+pkg_check_modules(AVUTIL REQUIRED IMPORTED_TARGET libavutil)
+pkg_check_modules(LIBVA QUIET IMPORTED_TARGET libva)
+
+find_package(CUDAToolkit QUIET)
 pkg_check_modules(Qalculate IMPORTED_TARGET libqalculate REQUIRED)
 pkg_check_modules(Pipewire IMPORTED_TARGET libpipewire-0.3 REQUIRED)
 pkg_check_modules(Aubio IMPORTED_TARGET aubio REQUIRED)

Plugins/ZShell/CMakeLists.txt

@@ -37,6 +37,7 @@ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES
 add_subdirectory(Settings)
 add_subdirectory(Models)
 add_subdirectory(Internal)
+add_subdirectory(Wallpaper)
 add_subdirectory(Services)
 add_subdirectory(Components)
 add_subdirectory(Blobs)

Plugins/ZShell/Config/background.hpp

@@ -1,7 +1,10 @@
 #pragma once
-#include "common.hpp"
+
 #include <qqmlintegration.h>
 
+#include "common.hpp"
+#include "enums.hpp"
+
 namespace ZShell::config {
 
 class Background : public settings::ObjectNode {
@@ -9,6 +12,8 @@ class Background : public settings::ObjectNode {
 
 	CONFIG_PROPERTY(bool, enabled, true)
 	CONFIG_PROPERTY(int, wallFadeDuration, 300)
+	CONFIG_ENUM_PROPERTY(
+		WallpaperTransition, wallTransition, WallpaperTransition::Fade)
 };
 
 } // namespace ZShell::config

Plugins/ZShell/Config/enums.hpp

@@ -23,6 +23,19 @@ ENUM(NotifsFullscreen, On, Off)
 ENUM(TemperatureUnit, Auto, Celsius, Fahrenheit, Kelvin)
 ENUM(DataUnit, Binary, Decimal)
 ENUM(ClockFormat, Auto, TwelveHour, TwentyFourHour)
+ENUM(
+	WallpaperTransition,
+	Bowtie,
+	Fade,
+	LinearBlur,
+	WindowSlices,
+	WipeRight,
+	WipeDown,
+	TilesWave,
+	SplitSlideInHorizontal,
+	Hexagonalize,
+	DoomMelt,
+	Random)
 
 #undef ENUM
 

Plugins/ZShell/Config/fontbuilder.cpp

@@ -52,7 +52,7 @@ FontBuilder FontBuilder::letterSpacing(qreal spacing, bool absolute) {
 	return *this;
 }
 
-FontBuilder FontBuilder::capitalisation(QFont::Capitalization cap) {
+FontBuilder FontBuilder::capitalization(QFont::Capitalization cap) {
 	m_font.setCapitalization(cap);
 	return *this;
 }

Plugins/ZShell/Config/fontbuilder.hpp

@@ -23,7 +23,7 @@ class FontBuilder {
 	[[nodiscard]] Q_INVOKABLE FontBuilder
 	letterSpacing(qreal spacing, bool absolute = true);
 	[[nodiscard]] Q_INVOKABLE FontBuilder
-	capitalisation(QFont::Capitalization cap);
+	capitalization(QFont::Capitalization cap);
 	[[nodiscard]] Q_INVOKABLE FontBuilder vaxis(const QString& tag, float value);
 	[[nodiscard]] Q_INVOKABLE FontBuilder vaxes(const QVariantMap& axes);
 	[[nodiscard]] Q_INVOKABLE QFont build() const;

Plugins/ZShell/HyprPlugins/main.cpp

@@ -14,9 +14,10 @@
 #include <hyprland/src/plugins/PluginAPI.hpp>
 #include <hyprland/src/render/OpenGL.hpp>
 #include <hyprland/src/render/Renderer.hpp>
+#include <hyprland/src/render/Context.hpp>
 #undef private
 
-#include <hyprland/src/managers/EventManager.hpp>
+#include <hyprland/src/ipc/s2/S2.hpp>
 
 extern "C" {
 #include <lua.h>
@@ -27,6 +28,7 @@ extern "C" {
 
 using ZShell::services::kelvinToGain;
 
+using Render::CRenderContext;
 using Render::IFramebuffer;
 using Render::GL::CHyprOpenGLImpl;
 using Render::GL::g_pHyprOpenGL;
@@ -149,25 +151,14 @@ static bool gainIsNeutral(const std::array<float, 3>& gain) {
 }
 
 static CFunctionHook* g_pBeginHook = nullptr;
-using origBegin = void (*)(
+using origBegin = bool (*)(
 	CHyprOpenGLImpl*,
+	CRenderContext&,
 	PHLMONITOR,
 	const CRegion&,
 	SP<IFramebuffer>,
 	std::optional<CRegion>);
 
-static CFunctionHook* g_pSaveMirrorHook = nullptr;
-using origSaveMirror = bool (*)(CHyprOpenGLImpl*, const CBox&);
-
-static bool hkSaveBufferForMirror(CHyprOpenGLImpl* thisptr, const CBox& box) {
-	const bool saved = thisptr->m_applyFinalShader;
-	thisptr->m_applyFinalShader = false;
-	const bool result = (*reinterpret_cast<origSaveMirror>(
-		g_pSaveMirrorHook->m_original))(thisptr, box);
-	thisptr->m_applyFinalShader = saved;
-	return result;
-}
-
 static void installShader() {
 	auto* gl = g_pHyprOpenGL.get();
 	if (!gl) return;
@@ -198,34 +189,33 @@ static void setUniformGain(const std::array<float, 3>& gain) {
 	shader->setUniformFloat3(SHADER_TINT, gain[0], gain[1], gain[2]);
 }
 
-static void hkBegin(
+static bool hkBegin(
 	CHyprOpenGLImpl* thisptr,
+	CRenderContext& ctx,
 	PHLMONITOR mon,
 	const CRegion& damage,
 	SP<IFramebuffer> fb,
 	std::optional<CRegion> finalDamage) {
-	(*reinterpret_cast<origBegin>(
-		g_pBeginHook->m_original))(thisptr, mon, damage, fb, finalDamage);
+	const bool ok = (*reinterpret_cast<origBegin>(
+		g_pBeginHook->m_original))(thisptr, ctx, mon, damage, fb, finalDamage);
+	if (!ok) return false;
 
-	if (fb) {
-		auto* renderer = g_pHyprRenderer.get();
-		if (renderer) renderer->m_renderData.blockScreenShader = true;
-	}
+	if (fb) ctx.m_data.blockScreenShader = true;
 
-	if (!g_active) return;
+	if (!g_active) return true;
 
 	auto* gl = g_pHyprOpenGL.get();
-	if (!gl) return;
+	if (!gl) return true;
 
 	if (gl->m_finalScreenShader.get() && gl->m_finalScreenShader->program() < 1)
 		installShader();
 	if (!gl->m_finalScreenShader.get() ||
 		gl->m_finalScreenShader->program() < 1)
-		return;
+		return true;
 
 	if (g_transition.active) {
 		auto* monPtr = mon.get();
-		if (!monPtr) return;
+		if (!monPtr) return true;
 		const float elapsed =
 			std::chrono::duration<float>(
 				std::chrono::steady_clock::now() - g_transition.start)
@@ -265,6 +255,7 @@ static void hkBegin(
 	} else if (g_uniformMode) {
 		setUniformGain(g_currentGain);
 	}
+	return true;
 }
 
 static constexpr int KELVIN_MIN = 2000;
@@ -333,9 +324,10 @@ static int luaNightlightState(lua_State* L) {
 }
 
 static void postStateEvent(bool enabled, bool animating) {
-	if (!g_pEventManager) return;
-	g_pEventManager->postEvent(
-		SHyprIPCEvent{
+	auto& sock = IPC::Socket2::sock();
+	if (!sock) return;
+	sock->postEvent(
+		IPC::Socket2::SEvent{
 			.event = "zshell-nightlight",
 			.data = std::format(
 				"{},{},{},{}",
@@ -377,31 +369,6 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
 		throw std::runtime_error("[zshell-nightlight] version mismatch");
 	}
 
-	static const auto SAVEMIRROR_METHODS =
-		HyprlandAPI::findFunctionsByName(PHANDLE, "saveBufferForMirror");
-	const SFunctionMatch* saveMirrorTarget = findExactMethod(
-		SAVEMIRROR_METHODS,
-		manglePrefix("CHyprOpenGLImpl", "saveBufferForMirror"));
-
-	if (saveMirrorTarget) {
-		g_pSaveMirrorHook = HyprlandAPI::createFunctionHook(
-			PHANDLE,
-			saveMirrorTarget->address,
-			reinterpret_cast<void*>(&hkSaveBufferForMirror));
-		if (g_pSaveMirrorHook && g_pSaveMirrorHook->hook())
-			dlog(
-				"saveBufferForMirror hook installed: " +
-				saveMirrorTarget->signature);
-	}
-
-	if (!g_pSaveMirrorHook)
-		HyprlandAPI::addNotification(
-			PHANDLE,
-			"[zshell-nightlight] WARNING: couldn't hook saveBufferForMirror — "
-			"captures may still show the nightlight",
-			CHyprColor{1.f, 0.6f, 0.2f, 1.f},
-			8000);
-
 	static const auto METHODS =
 		HyprlandAPI::findFunctionsByName(PHANDLE, "begin");
 	const SFunctionMatch* target =

Plugins/ZShell/Internal/CMakeLists.txt

@@ -1,8 +1,3 @@
-wl_proto(wlp-layer-shell wlr-layer-shell-unstable-v1 "${CMAKE_CURRENT_SOURCE_DIR}/protocols")
-wl_proto(wlp-viewporter viewporter "${WAYLAND_PROTOCOLS}/stable/viewporter")
-wl_proto(wlp-fractional-scale fractional-scale-v1 "${WAYLAND_PROTOCOLS}/staging/fractional-scale")
-wl_proto(wlp-xdg-shell xdg-shell "${WAYLAND_PROTOCOLS}/stable/xdg-shell")
-
 qml_module(ZShell-internal
 	URI ZShell.Internal
 	INCLUDE_PREFIX internal
@@ -13,10 +8,6 @@ qml_module(ZShell-internal
 		circularindicatormanager.hpp circularindicatormanager.cpp
 		circularbuffer.hpp circularbuffer.cpp
 		arcgauge.hpp arcgauge.cpp
-		wallpaperimage.hpp wallpaperimage.cpp
-		wallpaperservice.hpp wallpaperservice.cpp
-		wallpapersurface.hpp wallpapersurface.cpp
-		wallpaperobject.hpp wallpaperobject.cpp
 		lidwatcher.hpp lidwatcher.cpp
 		visualizerbars.hpp visualizerbars.cpp
 		linearindicatormanager.hpp linearindicatormanager.cpp
@@ -27,16 +18,14 @@ qml_module(ZShell-internal
 		Qt::Gui
 		Qt::Quick
 		Qt::Concurrent
+		Qt::Sql
 		Qt::Core
 		Qt::Network
 		Qt::DBus
 		Qt::CanvasPainter
 		Qt::GuiPrivate
-		wlp-layer-shell
-		wlp-xdg-shell
-		wlp-viewporter
-		wlp-fractional-scale
 		PkgConfig::EGL
 		PkgConfig::WAYLAND_EGL
 		PkgConfig::GL
+		ZShell-config
 )

Plugins/ZShell/Internal/wallpaperservice.cpp

@@ -1,743 +0,0 @@
-#define EGL_EGLEXT_PROTOTYPES
-#define GL_GLEXT_PROTOTYPES
-
-#include "wallpaperservice.hpp"
-
-#include <EGL/eglext.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
-
-#include <fcntl.h>
-#include <poll.h>
-#include <unistd.h>
-
-#include <QDebug>
-#include <QGuiApplication>
-#include <QImageReader>
-#include <QScreen>
-
-#include <qguiapplication_platform.h>
-
-#include <private/qwaylandscreen_p.h>
-
-#include <cstring>
-
-namespace ZShell::internal {
-
-namespace {
-
-const char* kVertexShader = R"(
-#version 300 es
-void main() {
-	// The corners are (-1,-1), (3,-1) and (-1,3), which cover the whole buffer.
-	vec2 corner = vec2(float((gl_VertexID << 1) & 2), float(gl_VertexID & 2));
-	gl_Position = vec4(corner * 2.0 - 1.0, 0.0, 1.0);
-}
-)";
-
-const char* kFragmentShader = R"(
-#version 300 es
-precision highp float;
-uniform sampler2D source;
-uniform vec2 size;
-uniform vec4 crop;
-out vec4 outColor;
-void main() {
-	// The pixels are stored top-down, so the fragment coordinate is flipped.
-	vec2 p = vec2(gl_FragCoord.x, size.y - gl_FragCoord.y) / size;
-	outColor = texture(source, crop.xy + p * crop.zw);
-}
-)";
-
-constexpr int kWaitTimeoutMs = 20;
-
-void logShader(uint32_t object, bool program) {
-	int ok = 0;
-	if (program)
-		glGetProgramiv(object, GL_LINK_STATUS, &ok);
-	else
-		glGetShaderiv(object, GL_COMPILE_STATUS, &ok);
-
-	if (ok) return;
-
-	char info[512] = {};
-	if (program)
-		glGetProgramInfoLog(object, int(sizeof(info)), nullptr, info);
-	else
-		glGetShaderInfoLog(object, int(sizeof(info)), nullptr, info);
-
-	qWarning() << "WallpaperService:" << (program ? "linking" : "compiling")
-			   << "failed:" << info;
-}
-
-QVariantMap cropFor(const QVariantMap& crops, const QString& screen) {
-	QVariantMap crop = crops.value(screen).toMap();
-
-	if (crop.isEmpty()) {
-		crop.insert("x", 0.0);
-		crop.insert("y", 0.0);
-		crop.insert("width", 1.0);
-		crop.insert("height", 1.0);
-		crop.insert("zoom", 1.0);
-	}
-
-	return crop;
-}
-
-} // namespace
-
-WallpaperService::WallpaperService(QObject* parent) : QObject(parent) {}
-
-WallpaperService::~WallpaperService() {
-	m_stop = true;
-	wake();
-
-	if (m_thread.joinable()) m_thread.join();
-
-	for (auto* surface : m_surfaces)
-		delete surface;
-	m_surfaces.clear();
-
-	if (m_eglDisplay != EGL_NO_DISPLAY && m_context != EGL_NO_CONTEXT) {
-		if (eglMakeCurrent(
-				m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, m_context)) {
-			if (m_texture) glDeleteTextures(1, &m_texture);
-			if (m_program) glDeleteProgram(m_program);
-		}
-
-		eglDestroyContext(m_eglDisplay, m_context);
-	}
-
-	if (m_queue) wl_event_queue_destroy(m_queue);
-
-	if (m_wake[0] >= 0) {
-		close(m_wake[0]);
-		close(m_wake[1]);
-	}
-
-	if (m_layerShell) m_layerShell->destroy();
-	if (m_viewporter) m_viewporter->destroy();
-	if (m_scaleManager) m_scaleManager->destroy();
-	if (m_registry) wl_registry_destroy(m_registry);
-}
-
-QString WallpaperService::path() const {
-	std::lock_guard<std::recursive_mutex> lock(m_mutex);
-	return m_path;
-}
-
-void WallpaperService::setPath(const QString& path) {
-	if (m_path == path) return;
-
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-		m_path = path;
-
-		m_forceDecode = true;
-		m_imageChanged = true;
-	}
-
-	emit pathChanged();
-
-	start();
-	queueAll();
-}
-
-void WallpaperService::addScreen(const QString& screen) {
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-		if (m_screens.contains(screen)) return;
-
-		m_screens.append(screen);
-	}
-
-	start();
-
-	queueAll();
-}
-
-void WallpaperService::removeScreen(const QString& screen) {
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-		if (!m_screens.removeOne(screen)) return;
-	}
-
-	queueAll();
-}
-
-const QVariantMap& WallpaperService::crops() const {
-	std::lock_guard<std::recursive_mutex> lock(m_mutex);
-	return m_crops;
-}
-
-void WallpaperService::setCrops(const QVariantMap& crops) {
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-		if (m_crops == crops) return;
-
-		m_crops = crops;
-	}
-
-	emit cropsChanged();
-	queueAll();
-}
-
-void WallpaperService::setCrop(const QString& screen, const QVariantMap& crop) {
-	WallpaperSurface* surface = nullptr;
-
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-		if (m_crops.value(screen) == crop) return;
-
-		m_crops.insert(screen, crop);
-
-		for (auto* candidate : m_surfaces) {
-			if (candidate->screen() == screen) {
-				surface = candidate;
-				break;
-			}
-		}
-	}
-
-	emit cropsChanged();
-
-	if (surface) queue(surface);
-}
-
-void WallpaperService::redraw() {
-	queueAll();
-}
-
-void WallpaperService::start() {
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-		if (started || m_path.isEmpty() || m_screens.isEmpty()) return;
-
-		started = true;
-	}
-
-	auto* interface =
-		qApp->nativeInterface<QNativeInterface::QWaylandApplication>();
-	if (!interface) {
-		qWarning() << "WallpaperService: this is not a Wayland session";
-		return;
-	}
-
-	m_display = interface->display();
-	m_compositor = interface->compositor();
-	if (!m_display || !m_compositor) return;
-
-	m_queue = wl_display_create_queue(m_display);
-	if (!m_queue) return;
-
-	if (pipe2(m_wake, O_CLOEXEC) < 0) {
-		qWarning() << "WallpaperService: could not make the pipe to wake on";
-		return;
-	}
-
-	bindGlobals();
-
-	if (!setupGl()) return;
-
-	m_drawing = true;
-	m_thread = std::thread([this] { loop(); });
-
-	wake();
-}
-
-void WallpaperService::wake() {
-	if (m_wake[1] < 0) return;
-
-	char byte = 0;
-
-	if (::write(m_wake[1], &byte, 1) < 0)
-		qWarning() << "WallpaperService: could not wake the drawing thread";
-}
-
-void WallpaperService::queue(WallpaperSurface* surface) {
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-		m_pending.push_back(surface);
-	}
-
-	wake();
-}
-
-void WallpaperService::queueAll() {
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-		for (auto* surface : m_surfaces)
-			m_pending.push_back(surface);
-	}
-
-	wake();
-}
-
-void WallpaperService::loop() {
-	while (!m_stop) {
-		present();
-
-		if (wl_display_prepare_read(m_display) == 0) {
-			wl_display_flush(m_display);
-
-			struct pollfd fds[2] = {
-				{wl_display_get_fd(m_display), POLLIN, 0},
-				{m_wake[0], POLLIN, 0},
-			};
-
-			int ready = poll(fds, 2, kWaitTimeoutMs);
-
-			if (ready > 0 && fds[0].revents) {
-				wl_display_read_events(m_display);
-				continue;
-			}
-
-			if (ready > 0 && fds[1].revents) {
-				char byte = 0;
-				::read(m_wake[0], &byte, 1);
-			}
-
-			wl_display_cancel_read(m_display);
-			continue;
-		}
-
-		struct pollfd fds[1] = {{m_wake[0], POLLIN, 0}};
-
-		if (poll(fds, 1, kWaitTimeoutMs) <= 0) continue;
-
-		char byte = 0;
-		::read(m_wake[0], &byte, 1);
-	}
-}
-
-void WallpaperService::present() {
-	wl_display_dispatch_queue_pending(m_display, m_queue);
-
-	addSurfaces();
-
-	ensureDecodeSize();
-
-	std::vector<WallpaperSurface*> pending;
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-		pending.swap(m_pending);
-	}
-
-	for (auto* surface : pending)
-		drawSurface(surface);
-}
-
-void WallpaperService::addSurfaces() {
-	if (!started || !m_layerShell || !m_viewporter || !m_scaleManager) return;
-
-	QList<WallpaperSurface*> gone;
-	QList<QString> needed;
-
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-		QList<WallpaperSurface*> kept;
-		for (auto* surface : m_surfaces) {
-			if (m_screens.contains(surface->screen()))
-				kept.append(surface);
-			else
-				gone.append(surface);
-		}
-
-		m_surfaces = kept;
-
-		for (const auto& screen : m_screens) {
-			bool exists = false;
-			for (auto* surface : m_surfaces) {
-				if (surface->screen() == screen) {
-					exists = true;
-					break;
-				}
-			}
-
-			if (!exists) needed.append(screen);
-		}
-	}
-
-	for (auto* surface : gone)
-		delete surface;
-
-	for (const auto& screen : needed)
-		addSurface(screen);
-}
-
-void WallpaperService::registryGlobal(
-	void* data,
-	struct wl_registry* registry,
-	uint32_t name,
-	const char* interface,
-	uint32_t version) {
-	auto* service = static_cast<WallpaperService*>(data);
-
-	void* proxy = nullptr;
-
-	if (strcmp(interface, "zwlr_layer_shell_v1") == 0) {
-		proxy = new QtWayland::zwlr_layer_shell_v1(
-			registry, int(name), int(version));
-	} else if (strcmp(interface, "wp_viewporter") == 0) {
-		proxy = new QtWayland::wp_viewporter(registry, int(name), int(version));
-	} else if (strcmp(interface, "wp_fractional_scale_manager_v1") == 0) {
-		proxy = new QtWayland::wp_fractional_scale_manager_v1(
-			registry, int(name), int(version));
-	} else {
-		return;
-	}
-
-	service->storeGlobal(interface, proxy);
-
-	service->queueAll();
-}
-
-void WallpaperService::storeGlobal(const char* interface, void* proxy) {
-	std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-	if (strcmp(interface, "zwlr_layer_shell_v1") == 0)
-		m_layerShell = static_cast<QtWayland::zwlr_layer_shell_v1*>(proxy);
-	else if (strcmp(interface, "wp_viewporter") == 0)
-		m_viewporter = static_cast<QtWayland::wp_viewporter*>(proxy);
-	else if (strcmp(interface, "wp_fractional_scale_manager_v1") == 0)
-		m_scaleManager =
-			static_cast<QtWayland::wp_fractional_scale_manager_v1*>(proxy);
-}
-
-void WallpaperService::bindGlobals() {
-	m_registry = wl_display_get_registry(m_display);
-
-	static const struct wl_registry_listener listener = {
-		registryGlobal,
-		nullptr,
-	};
-
-	wl_registry_add_listener(m_registry, &listener, this);
-}
-
-bool WallpaperService::setupGl() {
-	const char* extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
-	if (extensions && strstr(extensions, "EGL_EXT_platform_wayland")) {
-		m_eglDisplay =
-			eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, m_display, nullptr);
-	} else {
-		m_eglDisplay =
-			eglGetDisplay(reinterpret_cast<EGLNativeDisplayType>(m_display));
-	}
-
-	if (m_eglDisplay == EGL_NO_DISPLAY) {
-		qWarning() << "WallpaperService: no EGL display";
-		return false;
-	}
-
-	EGLint major = 0, minor = 0;
-	if (!eglInitialize(m_eglDisplay, &major, &minor)) {
-		qWarning() << "WallpaperService: eglInitialize failed";
-		return false;
-	}
-
-	const EGLint configAttributes[] = {
-		EGL_SURFACE_TYPE,
-		EGL_WINDOW_BIT,
-		EGL_RENDERABLE_TYPE,
-		EGL_OPENGL_ES2_BIT,
-		EGL_RED_SIZE,
-		8,
-		EGL_GREEN_SIZE,
-		8,
-		EGL_BLUE_SIZE,
-		8,
-		EGL_ALPHA_SIZE,
-		8,
-		EGL_NONE};
-
-	EGLint count = 0;
-	if (!eglChooseConfig(m_eglDisplay, configAttributes, &m_config, 1, &count) ||
-		count == 0) {
-		qWarning() << "WallpaperService: no EGL config for window surfaces";
-		return false;
-	}
-
-	const EGLint contextAttributes[] = {EGL_CONTEXT_MAJOR_VERSION, 3, EGL_NONE};
-	m_context = eglCreateContext(
-		m_eglDisplay, m_config, EGL_NO_CONTEXT, contextAttributes);
-	if (m_context == EGL_NO_CONTEXT) {
-		qWarning() << "WallpaperService: eglCreateContext failed";
-		return false;
-	}
-
-	return true;
-}
-
-uint32_t WallpaperService::createProgram() {
-	uint32_t vertex = glCreateShader(GL_VERTEX_SHADER);
-	glShaderSource(vertex, 1, &kVertexShader, nullptr);
-	glCompileShader(vertex);
-	logShader(vertex, false);
-
-	uint32_t fragment = glCreateShader(GL_FRAGMENT_SHADER);
-	glShaderSource(fragment, 1, &kFragmentShader, nullptr);
-	glCompileShader(fragment);
-	logShader(fragment, false);
-
-	uint32_t program = glCreateProgram();
-	glAttachShader(program, vertex);
-	glAttachShader(program, fragment);
-	glLinkProgram(program);
-	logShader(program, true);
-
-	if (glGetUniformLocation(program, "size") < 0 ||
-		glGetUniformLocation(program, "crop") < 0) {
-		qWarning() << "WallpaperService: the program does not have the "
-					  "uniforms it needs";
-		glDeleteProgram(program);
-		return 0;
-	}
-
-	m_sizeUniform = glGetUniformLocation(program, "size");
-	m_cropUniform = glGetUniformLocation(program, "crop");
-
-	glDeleteShader(vertex);
-	glDeleteShader(fragment);
-	return program;
-}
-
-void WallpaperService::uploadImage() {
-	if (m_image.isNull()) return;
-
-	if (m_texture == 0) {
-		glGenTextures(1, &m_texture);
-		glBindTexture(GL_TEXTURE_2D, m_texture);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	} else {
-		glBindTexture(GL_TEXTURE_2D, m_texture);
-	}
-
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-	glTexImage2D(
-		GL_TEXTURE_2D,
-		0,
-		GL_RGBA8,
-		m_image.width(),
-		m_image.height(),
-		0,
-		GL_RGBA,
-		GL_UNSIGNED_BYTE,
-		m_image.constBits());
-}
-
-bool WallpaperService::decode(const QString& path) {
-	if (path.isEmpty()) return false;
-
-	QImageReader reader(path);
-	reader.setAutoTransform(true);
-
-	QSize size = reader.size();
-	if (size.isValid()) m_sourceSize = size;
-
-	if (!m_decodeSize.isEmpty() && !m_sourceSize.isEmpty())
-		reader.setScaledSize(
-			m_sourceSize.scaled(m_decodeSize, Qt::KeepAspectRatioByExpanding));
-
-	QImage image = reader.read();
-	if (image.isNull()) {
-		qWarning() << "WallpaperService: could not read the image" << path;
-		return false;
-	}
-
-	m_image = image.convertToFormat(QImage::Format_RGBA8888);
-	return !m_image.isNull();
-}
-
-bool WallpaperService::ensureDecodeSize() {
-	QSize largest;
-	QString path;
-
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-		largest = largestBufferSize();
-		if (largest.isEmpty()) return false;
-
-		if (!m_forceDecode && !m_decodeSize.isEmpty() &&
-			qint64(largest.width()) * largest.height() <=
-				qint64(m_decodeSize.width()) * m_decodeSize.height())
-			return false;
-
-		QSize target =
-			m_sourceSize.isEmpty()
-				? largest
-				: m_sourceSize.scaled(largest, Qt::KeepAspectRatioByExpanding);
-
-		if (!m_forceDecode && !m_image.isNull() && target == m_image.size())
-			return false;
-
-		m_forceDecode = false;
-		m_decodeSize = largest;
-		path = m_path;
-	}
-
-	if (!decode(path)) return false;
-
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-		m_imageChanged = true;
-	}
-
-	return true;
-}
-
-QSize WallpaperService::largestBufferSize() {
-	QSize largest;
-
-	for (auto* surface : m_surfaces) {
-		QSize buffer = surface->bufferSize();
-		if (buffer.isEmpty()) continue;
-
-		if (largest.isEmpty() || qint64(buffer.width()) * buffer.height() >
-									 qint64(largest.width()) * largest.height())
-			largest = buffer;
-	}
-
-	return largest;
-}
-
-QRectF WallpaperService::sourceRect(
-	const QVariantMap& crops, const QString& screen, const QSize& size) const {
-	QVariantMap crop = cropFor(crops, screen);
-
-	QRectF rect(
-		crop.value("x", 0.0).toDouble(),
-		crop.value("y", 0.0).toDouble(),
-		crop.value("width", 1.0).toDouble(),
-		crop.value("height", 1.0).toDouble());
-
-	if (size.isEmpty() || rect.isEmpty() || m_image.isNull()) return rect;
-
-	qreal imageWidth = qreal(m_image.width());
-	qreal imageHeight = qreal(m_image.height());
-
-	QRectF pixels(
-		rect.x() * imageWidth,
-		rect.y() * imageHeight,
-		rect.width() * imageWidth,
-		rect.height() * imageHeight);
-
-	qreal targetRatio = qreal(size.width()) / qreal(size.height());
-	qreal rectRatio = pixels.width() / pixels.height();
-
-	if (rectRatio > targetRatio) {
-		qreal newWidth = pixels.height() * targetRatio;
-		pixels.setX(pixels.x() + (pixels.width() - newWidth) / 2.0);
-		pixels.setWidth(newWidth);
-	} else if (rectRatio < targetRatio) {
-		qreal newHeight = pixels.width() / targetRatio;
-		pixels.setY(pixels.y() + (pixels.height() - newHeight) / 2.0);
-		pixels.setHeight(newHeight);
-	}
-
-	return QRectF(
-		pixels.x() / imageWidth,
-		pixels.y() / imageHeight,
-		pixels.width() / imageWidth,
-		pixels.height() / imageHeight);
-}
-
-void WallpaperService::drawSurface(WallpaperSurface* surface) {
-	EGLSurface target = surface->eglSurface();
-	if (m_context == EGL_NO_CONTEXT || target == EGL_NO_SURFACE ||
-		surface->bufferSize().isEmpty())
-		return;
-
-	if (!eglMakeCurrent(m_eglDisplay, target, target, m_context)) {
-		qWarning() << "WallpaperService: the context cannot be made current";
-		return;
-	}
-
-	QVariantMap crops;
-	QSize size;
-	bool upload = false;
-
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-
-		crops = m_crops;
-		size = surface->bufferSize();
-
-		upload = m_imageChanged;
-		m_imageChanged = false;
-	}
-
-	if (size.isEmpty()) return;
-
-	if (m_program == 0) m_program = createProgram();
-	if (m_texture == 0 || upload) uploadImage();
-
-	if (m_program == 0 || m_texture == 0 || m_image.isNull()) return;
-
-	glUseProgram(m_program);
-	glBindTexture(GL_TEXTURE_2D, m_texture);
-
-	glUniform2f(
-		GLint(m_sizeUniform), GLfloat(size.width()), GLfloat(size.height()));
-
-	QRectF rect = sourceRect(crops, surface->screen(), size);
-	glUniform4f(
-		GLint(m_cropUniform),
-		GLfloat(rect.x()),
-		GLfloat(rect.y()),
-		GLfloat(rect.width()),
-		GLfloat(rect.height()));
-
-	glViewport(0, 0, size.width(), size.height());
-	glDrawArrays(GL_TRIANGLES, 0, 3);
-
-	if (!eglSwapBuffers(m_eglDisplay, target))
-		qWarning() << "WallpaperService: eglSwapBuffers failed";
-}
-
-void WallpaperService::addSurface(const QString& screen) {
-	if (!m_layerShell || !m_viewporter || !m_scaleManager) return;
-
-	QScreen* qscreen = nullptr;
-	for (auto* candidate : QGuiApplication::screens()) {
-		if (candidate->name() == screen) {
-			qscreen = candidate;
-			break;
-		}
-	}
-
-	if (!qscreen) {
-		qWarning() << "WallpaperService:" << screen << "is not a screen";
-		return;
-	}
-
-	auto* waylandScreen =
-		dynamic_cast<QtWaylandClient::QWaylandScreen*>(qscreen->handle());
-	if (!waylandScreen || !waylandScreen->output()) {
-		qWarning() << "WallpaperService:" << screen
-				   << "is not a Wayland screen";
-		return;
-	}
-
-	wl_surface* wlSurface = wl_compositor_create_surface(m_compositor);
-	if (!wlSurface) return;
-
-	auto* surface =
-		new WallpaperSurface(this, wlSurface, waylandScreen->output(), screen);
-
-	{
-		std::lock_guard<std::recursive_mutex> lock(m_mutex);
-		m_surfaces.append(surface);
-	}
-}
-
-} // namespace ZShell::internal

Plugins/ZShell/Internal/wallpaperservice.hpp

@@ -1,147 +0,0 @@
-#pragma once
-
-#include <EGL/egl.h>
-
-#include <cstdint>
-#include <mutex>
-#include <thread>
-#include <vector>
-
-#include <QImage>
-#include <QList>
-#include <QRectF>
-#include <QSize>
-#include <QString>
-#include <QStringList>
-#include <QVariantMap>
-#include <QtQml/qqml.h>
-#include <qtmetamacros.h>
-
-#include <qwayland-wlr-layer-shell-unstable-v1.h>
-#include <wayland-client-protocol.h>
-
-#include "wallpapersurface.hpp"
-
-namespace ZShell::internal {
-
-class WallpaperSurface;
-
-class WallpaperService : public QObject {
-	Q_OBJECT
-	QML_ELEMENT
-
-	Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged REQUIRED)
-	Q_PROPERTY(QVariantMap crops READ crops WRITE setCrops NOTIFY cropsChanged)
-
-	public:
-	explicit WallpaperService(QObject* parent = nullptr);
-	~WallpaperService() override;
-
-	[[nodiscard]] QString path() const;
-	void setPath(const QString& path);
-
-	void addScreen(const QString& screen);
-	void removeScreen(const QString& screen);
-
-	[[nodiscard]] const QVariantMap& crops() const;
-	void setCrops(const QVariantMap& crops);
-
-	Q_INVOKABLE void redraw();
-
-	Q_INVOKABLE void setCrop(const QString& screen, const QVariantMap& crop);
-
-	signals:
-	void pathChanged();
-	void cropsChanged();
-
-	private:
-	friend class WallpaperSurface;
-
-	void bindGlobals();
-	static void registryGlobal(
-		void* data,
-		struct wl_registry* registry,
-		uint32_t name,
-		const char* interface,
-		uint32_t version);
-
-	void storeGlobal(const char* interface, void* proxy);
-
-	[[nodiscard]] bool setupGl();
-	[[nodiscard]] uint32_t createProgram();
-
-	void uploadImage();
-
-	bool decode(const QString& path);
-
-	bool ensureDecodeSize();
-
-	[[nodiscard]] QSize largestBufferSize();
-
-	void queue(WallpaperSurface* surface);
-	void queueAll();
-
-	void startDrawing();
-	void loop();
-
-	void present();
-
-	void drawSurface(WallpaperSurface* surface);
-
-	void wake();
-
-	[[nodiscard]] wl_event_queue* eventQueue() const { return m_queue; }
-
-	[[nodiscard]] QRectF sourceRect(
-		const QVariantMap& crops,
-		const QString& screen,
-		const QSize& size) const;
-
-	void start();
-
-	void addSurfaces();
-	void addSurface(const QString& screen);
-
-	QString m_path;
-	QStringList m_screens;
-	QVariantMap m_crops;
-
-	QImage m_image;
-
-	QSize m_sourceSize;
-	QSize m_decodeSize;
-
-	wl_display* m_display = nullptr;
-	wl_registry* m_registry = nullptr;
-	wl_compositor* m_compositor = nullptr;
-	QtWayland::zwlr_layer_shell_v1* m_layerShell = nullptr;
-	QtWayland::wp_viewporter* m_viewporter = nullptr;
-	QtWayland::wp_fractional_scale_manager_v1* m_scaleManager = nullptr;
-
-	EGLDisplay m_eglDisplay = EGL_NO_DISPLAY;
-	EGLConfig m_config = nullptr;
-	EGLContext m_context = EGL_NO_CONTEXT;
-	uint32_t m_texture = 0;
-	uint32_t m_program = 0;
-	int m_sizeUniform = -1;
-	int m_cropUniform = -1;
-
-	QList<WallpaperSurface*> m_surfaces;
-
-	std::thread m_thread;
-	mutable std::recursive_mutex m_mutex;
-	std::vector<WallpaperSurface*> m_pending;
-	wl_event_queue* m_queue = nullptr;
-
-	int m_wake[2] = {-1, -1};
-
-	bool m_stop = false;
-	bool m_drawing = false;
-
-	bool started = false;
-
-	bool m_forceDecode = false;
-	bool m_imageChanged = false;
-};
-
-} // namespace ZShell::internal