Merge branch 'main' into feat/reposition-bar

Modules/WindowTitle.qml

@@ -2,14 +2,15 @@ pragma ComponentBehavior: Bound
 
 import QtQuick
 import qs.Components
-import qs.Config
+import ZShell.Config
 import qs.Helpers
+import qs.Services
 
 Item {
 	id: root
 
 	required property var bar
-	property color color: DynamicColors.palette.m3primary
+	property color color: Colors.palette.m3primary
 	property Title current: text1
 	required property bool horizontal
 	// readonly property int maxWidth: 300
@@ -28,16 +29,13 @@ Item {
 		enabled: !root.horizontal
 
 		Anim {
-			duration: MaterialEasing.expressiveEffectsTime
-			easing.bezierCurve: MaterialEasing.expressiveEffects
+			type: Anim.DefaultEffects
 		}
 	}
 	Behavior on implicitWidth {
 		enabled: root.horizontal
 
 		Anim {
-			duration: MaterialEasing.expressiveEffectsTime
-			easing.bezierCurve: MaterialEasing.expressiveEffects
 		}
 	}
 
@@ -55,7 +53,7 @@ Item {
 		elide: Qt.ElideRight
 		elideWidth: root.maxSize - (root.horizontal ? root.current.anchors.leftMargin : 0)
 		font.family: "Rubik"
-		font.pointSize: Appearance.font.size.normal
+		font.pointSize: Tokens.font.size.normal
 		text: Hypr.activeToplevel?.title ?? qsTr("Desktop")
 
 		onElideWidthChanged: root.current.text = elidedText
@@ -71,9 +69,9 @@ Item {
 
 		anchors.horizontalCenter: root.horizontal ? undefined : parent.horizontalCenter
 		anchors.left: root.horizontal ? parent.left : undefined
-		anchors.leftMargin: root.horizontal ? Appearance.spacing.small : 0
+		anchors.leftMargin: root.horizontal ? Tokens.spacing.small : 0
 		anchors.top: root.horizontal ? undefined : parent.top
-		anchors.topMargin: root.horizontal ? 0 : Appearance.spacing.small
+		anchors.topMargin: root.horizontal ? 0 : Tokens.spacing.small
 		anchors.verticalCenter: root.horizontal ? parent.verticalCenter : undefined
 		color: root.color
 		font.family: metrics.font.family