Merge branch 'main' into feat/reposition-bar

Drawers/Exclusions.qml

@@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound
 
 import Quickshell
 import QtQuick
-import qs.Config
+import ZShell.Config
 import qs.Components
 
 Scope {

Drawers/Interactions.qml

@@ -1,7 +1,7 @@
 import Quickshell
 import QtQuick
 import qs.Components
-import qs.Config
+import ZShell.Config
 import qs.Helpers
 import qs.Modules as BarPopouts
 

Drawers/Panels.qml

@@ -14,7 +14,7 @@ import qs.Modules.Settings as Settings
 import qs.Modules.Drawing as Drawing
 import qs.Modules.Dock as Dock
 import qs.Modules.Clipboard as Clipboard
-import qs.Config
+import ZShell.Config
 
 Item {
 	id: root
@@ -112,7 +112,7 @@ Item {
 		id: toasts
 
 		anchors.bottom: sidebar.visible ? parent.bottom : utilities.top
-		anchors.margins: Appearance.padding.normal
+		anchors.margins: Tokens.padding.normal
 		anchors.right: sidebar.left
 	}
 
@@ -161,8 +161,8 @@ Item {
 
 		Behavior on offsetScale {
 			Anim {
-				duration: Appearance.anim.durations.expressiveDefaultSpatial
-				easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+				duration: Tokens.anim.durations.expressiveDefaultSpatial
+				easing.bezierCurve: Tokens.anim.curves.expressiveDefaultSpatial
 			}
 		}
 

Drawers/Windows.qml

@@ -11,9 +11,10 @@ import ZShell.Blobs
 import qs.Daemons
 import qs.Components
 import qs.Modules.Bar
-import qs.Config
+import ZShell.Config
 import qs.Helpers
 import qs.Drawers
+import qs.Services
 
 CustomWindow {
 	id: root
@@ -51,7 +52,7 @@ CustomWindow {
 	property var root: Quickshell.shellDir
 	readonly property real sdfBorderOffset: 2 * fsTransitionProg
 	readonly property real shadowOpacity: 0.7 * (1 - fsTransitionProg)
-	property color surfaceColor: DynamicColors.tPalette.m3surface
+	property color surfaceColor: Colors.tPalette.m3surface
 
 	WlrLayershell.exclusionMode: ExclusionMode.Ignore
 	WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.settings ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
@@ -187,7 +188,7 @@ CustomWindow {
 
 		layer.effect: MultiEffect {
 			blurMax: 32
-			shadowColor: Qt.alpha(DynamicColors.palette.m3shadow, Math.max(0, root.shadowOpacity))
+			shadowColor: Qt.alpha(Colors.palette.m3shadow, Math.max(0, root.shadowOpacity))
 			shadowEnabled: true
 		}
 
@@ -218,7 +219,7 @@ CustomWindow {
 			implicitHeight: panels.dashboard.height * (geometry.horizontal ? 1 + extraExtent : 1)
 			implicitWidth: panels.dashboard.width * (geometry.horizontal ? 1 : 1 + extraExtent)
 			panel: panels.dashboardWrapper
-			radius: Appearance.rounding.normal
+			radius: Tokens.rounding.normal
 			x: panels.dashboardWrapper.x + panels.dashboard.x + geometry.insetLeft(root.borderThickness) - (geometry.horizontal ? 0 : panels.dashboard.width * extraExtent)
 			y: panels.dashboardWrapper.y + panels.dashboard.y + geometry.insetTop(root.borderThickness) - (geometry.horizontal ? panels.dashboard.height * extraExtent : 0)
 		}
@@ -231,7 +232,7 @@ CustomWindow {
 			deformAmount: 0.06
 			implicitHeight: panels.launcher.height * (1 + extraHeight)
 			panel: panels.launcher
-			radius: Appearance.rounding.smallest + 5
+			radius: Tokens.rounding.smallest + 5
 			y: panels.launcher.y + geometry.insetTop(root.borderThickness)
 		}
 
@@ -260,7 +261,7 @@ CustomWindow {
 			id: notifsBg
 
 			panel: panels.notifications
-			radius: Appearance.rounding.normal
+			radius: Tokens.rounding.normal
 		}
 
 		PanelBg {
@@ -281,7 +282,7 @@ CustomWindow {
 			implicitHeight: panels.popouts.height * (geometry.horizontal ? 1 + extraExtent : 1)
 			implicitWidth: panels.popouts.width * (geometry.horizontal ? 1 : 1 + extraExtent)
 			panel: panels.popoutsWrapper
-			radius: panels.popouts.current?.panelRadius ?? Appearance.rounding.normal
+			radius: panels.popouts.current?.panelRadius ?? Tokens.rounding.normal
 			x: panels.popoutsWrapper.x + panels.popouts.x + geometry.insetLeft(root.borderThickness) - (geometry.horizontal ? 0 : panels.popouts.width * extraExtent)
 			y: panels.popoutsWrapper.y + panels.popouts.y + geometry.insetTop(root.borderThickness) - (geometry.barOnTop ? panels.popouts.height * extraExtent : 0)
 
@@ -298,7 +299,7 @@ CustomWindow {
 			implicitHeight: panels.resources.height
 			implicitWidth: panels.resources.width
 			panel: panels.resourcesWrapper
-			radius: Appearance.rounding.large
+			radius: Tokens.rounding.large
 			x: panels.resourcesWrapper.x + panels.resources.x + geometry.insetLeft(root.borderThickness)
 			y: panels.resourcesWrapper.y + panels.resources.y + geometry.insetTop(root.borderThickness)
 		}
@@ -308,7 +309,7 @@ CustomWindow {
 
 			deformAmount: 0.03
 			panel: panels.settings
-			radius: Appearance.rounding.large + Appearance.padding.normal
+			radius: Tokens.rounding.large + Tokens.padding.normal
 		}
 
 		PanelBg {
@@ -316,7 +317,7 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.dock
-			radius: Appearance.rounding.normal
+			radius: Tokens.rounding.normal
 		}
 
 		PanelBg {
@@ -324,7 +325,7 @@ CustomWindow {
 
 			deformAmount: 0.08
 			panel: panels.drawing
-			radius: Appearance.rounding.normal
+			radius: Tokens.rounding.normal
 		}
 
 		PanelBg {
@@ -455,7 +456,7 @@ CustomWindow {
 		group: blobGroup
 		implicitHeight: panel.height
 		implicitWidth: panel.width
-		radius: Appearance.rounding.smallest
+		radius: Tokens.rounding.smallest
 		x: panel.x + geometry.insetLeft(root.borderThickness)
 		y: panel.y + geometry.insetTop(root.borderThickness)
 	}