Merge branch 'main' into feat/fullscreen-reveal-bar

Modules/Bar/Bar.qml

@@ -4,7 +4,7 @@ import Quickshell
 import QtQuick
 import QtQuick.Layouts
 import qs.Modules
-import qs.Config
+import ZShell.Config
 import qs.Modules.SysTray
 import qs.Modules.Network
 import qs.Modules.Updates
@@ -69,13 +69,13 @@ RowLayout {
 		}
 	}
 
-	spacing: Appearance.spacing.small
+	spacing: Tokens.spacing.small
 
 	Repeater {
 		id: repeater
 
 		model: ScriptModel {
-			values: Config.bar.entries.filter(e => e.enabled)
+			values: Config.bar.entries.values.filter(e => e.enabled)
 		}
 
 		DelegateChooser {
@@ -216,7 +216,7 @@ RowLayout {
 		required property var modelData
 
 		Layout.alignment: Qt.AlignVCenter
-		Layout.leftMargin: index === 0 ? root.vPadding : (entryId === "statusIcons") ? -root.spacing + Appearance.spacing.extraSmall : 0
+		Layout.leftMargin: index === 0 ? root.vPadding : (entryId === "statusIcons") ? -root.spacing + Tokens.spacing.extraSmall : 0
 		Layout.rightMargin: index === repeater.count - 1 ? root.vPadding : 0
 		children: item
 		implicitHeight: item?.implicitHeight ?? 0

Modules/Bar/BarLoader.qml

@@ -6,7 +6,7 @@ import QtQuick
 import QtQuick.Layouts
 import qs.Components
 import qs.Modules
-import qs.Config
+import ZShell.Config
 import qs.Helpers
 import qs.Modules.SysTray
 import qs.Modules.SysTray.Widgets
@@ -19,7 +19,7 @@ Item {
 	readonly property int exclusiveZone: Config.bar.autoHide ? Config.bar.border : contentHeight
 	required property bool fullscreen
 	property bool isHovered
-	readonly property int padding: Math.max(Appearance.padding.smaller, Config.bar.border)
+	readonly property int padding: Math.max(Tokens.padding.smaller, Config.bar.border)
 	required property Wrapper popouts
 	required property ClipWrapper popoutsWrapper
 	required property ShellScreen screen
@@ -48,8 +48,6 @@ Item {
 			to: "visible"
 
 			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
 				property: "implicitHeight"
 				target: root
 			}
@@ -59,8 +57,6 @@ Item {
 			to: ""
 
 			Anim {
-				duration: MaterialEasing.expressiveEffectsTime
-				easing.bezierCurve: MaterialEasing.expressiveEffects
 				property: "implicitHeight"
 				target: root
 			}

Modules/Bar/Border.qml

@@ -3,8 +3,9 @@ pragma ComponentBehavior: Bound
 import Quickshell
 import QtQuick
 import QtQuick.Effects
-import qs.Config
+import ZShell.Config
 import qs.Components
+import qs.Services
 
 Item {
 	id: root
@@ -17,7 +18,7 @@ Item {
 	CustomRect {
 		anchors.fill: parent
 		anchors.margins: -1
-		color: DynamicColors.palette.m3surface
+		color: Colors.palette.m3surface
 		layer.enabled: true
 
 		layer.effect: MultiEffect {