Merge branch 'main' into feat/reposition-bar

Modules/SysTray/TrayWidget.qml

@@ -4,9 +4,10 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell.Services.SystemTray
 import qs.Components
-import qs.Config
+import ZShell.Config
 import qs.Modules.SysTray.Widgets
 import qs.Modules
+import qs.Services
 
 GridLayout {
 	id: root
@@ -15,8 +16,8 @@ GridLayout {
 	readonly property alias items: repeater
 	required property GridLayout loader
 	required property Wrapper popouts
-	readonly property real shortSize: Config.bar.height + Appearance.padding.smallest * 2
-	readonly property real size: horizontal ? sysTray.implicitWidth + sysTrayMod.implicitWidth + Appearance.padding.small : sysTray.implicitHeight + sysTrayMod.implicitHeight + Appearance.padding.small
+	readonly property real shortSize: Config.bar.height + Tokens.padding.smallest * 2
+	readonly property real size: horizontal ? sysTray.implicitWidth + sysTrayMod.implicitWidth + Tokens.padding.small : sysTray.implicitHeight + sysTrayMod.implicitHeight + Tokens.padding.small
 
 	function closestRowChild(row, x) {
 		let child = row.childAt(x, row.height / 2);
@@ -83,21 +84,21 @@ GridLayout {
 		return null;
 	}
 
-	columnSpacing: Appearance.padding.small
+	columnSpacing: Tokens.padding.small
 	columns: horizontal ? -1 : 1
 	height: horizontal ? shortSize : size
-	rowSpacing: Appearance.padding.small
+	rowSpacing: Tokens.padding.small
 	width: horizontal ? size : shortSize
 
 	CustomClippingRect {
 		id: sysTray
 
 		Layout.fillHeight: true
-		bottomRightRadius: Appearance.rounding.smallest / 2
-		color: DynamicColors.tPalette.m3surfaceContainer
-		implicitWidth: sysRow.width + Appearance.padding.small * 2
-		radius: Appearance.rounding.full
-		topRightRadius: Appearance.rounding.smallest / 2
+		bottomRightRadius: Tokens.rounding.smallest / 2
+		color: Colors.tPalette.m3surfaceContainer
+		implicitWidth: sysRow.width + Tokens.padding.small * 2
+		radius: Tokens.rounding.full
+		topRightRadius: Tokens.rounding.smallest / 2
 
 		GridLayout {
 			id: sysRow
@@ -108,9 +109,9 @@ GridLayout {
 			anchors.left: root.horizontal ? undefined : parent.left
 			anchors.right: root.horizontal ? undefined : parent.right
 			anchors.verticalCenter: root.horizontal ? parent.verticalCenter : undefined
-			columnSpacing: Appearance.spacing.small / 2
+			columnSpacing: Tokens.spacing.small / 2
 			columns: root.horizontal ? -1 : 1
-			rowSpacing: Appearance.spacing.small / 2
+			rowSpacing: Tokens.spacing.small / 2
 
 			Repeater {
 				id: repeater
@@ -139,19 +140,19 @@ GridLayout {
 
 		Layout.fillHeight: root.horizontal
 		Layout.fillWidth: !root.horizontal
-		bottomLeftRadius: Appearance.rounding.smallest / 2
-		color: DynamicColors.tPalette.m3surfaceContainer
-		implicitHeight: root.horizontal ? sysIcons.implicitHeight : sysIcons.implicitHeight + Appearance.padding.smaller + Appearance.padding.normal
-		implicitWidth: root.horizontal ? sysIcons.implicitWidth + Appearance.padding.smaller + Appearance.padding.normal : sysIcons.implicitWidth
-		radius: Appearance.rounding.full
-		topLeftRadius: Appearance.rounding.smallest / 2
+		bottomLeftRadius: Tokens.rounding.smallest / 2
+		color: Colors.tPalette.m3surfaceContainer
+		implicitHeight: root.horizontal ? sysIcons.implicitHeight : sysIcons.implicitHeight + Tokens.padding.smaller + Tokens.padding.normal
+		implicitWidth: root.horizontal ? sysIcons.implicitWidth + Tokens.padding.smaller + Tokens.padding.normal : sysIcons.implicitWidth
+		radius: Tokens.rounding.full
+		topLeftRadius: Tokens.rounding.smallest / 2
 
 		StatusIcons {
 			id: sysIcons
 
 			anchors.fill: parent
-			anchors.leftMargin: Appearance.padding.smaller
-			anchors.rightMargin: Appearance.padding.normal
+			anchors.leftMargin: Tokens.padding.smaller
+			anchors.rightMargin: Tokens.padding.normal
 			horizontal: root.horizontal
 		}
 	}