Merge branch 'main' into feat/reposition-bar

Modules/Workspaces.qml

@@ -5,13 +5,14 @@ import QtQuick.Controls
 import QtQuick.Effects
 import Quickshell
 import Quickshell.Hyprland
-import qs.Config
+import ZShell.Config
 import qs.Components
+import qs.Services
 
 Item {
 	id: root
 
-	property real activeWorkspaceMargin: Math.ceil(Appearance.padding.small / 2)
+	property real activeWorkspaceMargin: Math.ceil(Tokens.padding.small / 2)
 	readonly property int effectiveActiveWorkspaceId: monitor?.activeWorkspace?.id ?? 1
 	required property bool horizontal
 	readonly property HyprlandMonitor monitor: Hyprland.monitorFor(root.screen)
@@ -49,7 +50,7 @@ Item {
 		anchors.right: root.horizontal ? parent.right : undefined
 		anchors.top: root.horizontal ? undefined : parent.top
 		anchors.verticalCenter: root.horizontal ? parent.verticalCenter : undefined
-		color: DynamicColors.tPalette.m3surfaceContainer
+		color: Colors.tPalette.m3surfaceContainer
 		implicitHeight: root.horizontal ? root.implicitHeight : 0
 		implicitWidth: root.horizontal ? 0 : root.implicitWidth
 		radius: height / 2
@@ -86,7 +87,7 @@ Item {
 
 						CustomText {
 							anchors.centerIn: parent
-							color: DynamicColors.palette.m3onSecondaryContainer
+							color: Colors.palette.m3onSecondaryContainer
 							elide: Text.ElideRight
 							horizontalAlignment: Text.AlignHCenter
 							text: button.modelData.name
@@ -112,10 +113,10 @@ Item {
 			anchors.horizontalCenter: root.horizontal ? undefined : parent.horizontalCenter
 			anchors.verticalCenter: root.horizontal ? parent.verticalCenter : undefined
 			clip: true
-			color: DynamicColors.palette.m3primary
+			color: Colors.palette.m3primary
 			implicitHeight: root.horizontal ? indicatorThickness : indicatorLength
 			implicitWidth: root.horizontal ? indicatorLength : indicatorThickness
-			radius: Appearance.rounding.full
+			radius: Tokens.rounding.full
 			x: root.horizontal ? indicatorPosition : 0
 			y: root.horizontal ? 0 : indicatorPosition
 
@@ -126,11 +127,11 @@ Item {
 			}
 
 			Coloriser {
-				colorizationColor: DynamicColors.palette.m3onPrimary
+				colorizationColor: Colors.palette.m3onPrimary
 				implicitHeight: grid.height
 				implicitWidth: grid.width
 				source: grid
-				sourceColor: DynamicColors.palette.m3onSurface
+				sourceColor: Colors.palette.m3onSurface
 				x: root.horizontal ? -indicator.x + 3 : 0
 				y: root.horizontal ? 0 : -indicator.y + 3
 			}