Merge branch 'main' into module/wifi

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
 
 RowLayout {
 	id: root
@@ -44,10 +45,10 @@ RowLayout {
 	function getHoveredSubItem(localX, localY) {
 		let modPos = mapToItem(sysTrayMod, localX, localY);
 		if (sysTrayMod.contains(Qt.point(modPos.x, modPos.y))) {
-			let modRowPos = sysTrayMod.mapToItem(sysModRow, modPos.x, modPos.y);
-			let child = closestRowChild(sysModRow, modRowPos.x);
+			let modRowPos = sysTrayMod.mapToItem(sysIcons, modPos.x, modPos.y);
+			let child = closestRowChild(sysIcons, modRowPos.x);
 			if (child) {
-				if (child.objectName === "audioWidget" && Config.bar.popouts.audio)
+				if (child.objectName === "audio" && Config.bar.popouts.audio)
 					return {
 						id: "audio",
 						item: child
@@ -57,7 +58,12 @@ RowLayout {
 						id: "network",
 						item: child
 					};
-				if (child.objectName === "upowerWidget" && Config.bar.popouts.upower)
+				if (child.objectName === "microphone" && Config.bar.popouts.audio)
+					return {
+						id: "audio",
+						item: child
+					};
+				if (child.objectName === "upower" && Config.bar.popouts.upower)
 					return {
 						id: "upower",
 						item: child
@@ -85,19 +91,19 @@ RowLayout {
 		return null;
 	}
 
-	height: Config.bar.height + Appearance.padding.smallest * 2
-	spacing: Appearance.padding.small
-	width: sysTray.implicitWidth + sysTrayMod.implicitWidth + Appearance.padding.small
+	height: Config.bar.height + Tokens.padding.smallest * 2
+	spacing: Tokens.padding.small
+	width: sysTray.implicitWidth + sysTrayMod.implicitWidth + Tokens.padding.small
 
 	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
 
 		Row {
 			id: sysRow
@@ -131,43 +137,18 @@ RowLayout {
 		id: sysTrayMod
 
 		Layout.fillHeight: true
-		bottomLeftRadius: Appearance.rounding.smallest / 2
-		color: DynamicColors.tPalette.m3surfaceContainer
-		implicitWidth: sysModRow.implicitWidth + Appearance.padding.smaller + Appearance.padding.normal
-		radius: Appearance.rounding.full
-		topLeftRadius: Appearance.rounding.smallest / 2
+		bottomLeftRadius: Tokens.rounding.smallest / 2
+		color: Colors.tPalette.m3surfaceContainer
+		implicitWidth: sysIcons.implicitWidth + Tokens.padding.smaller + Tokens.padding.normal
+		radius: Tokens.rounding.full
+		topLeftRadius: Tokens.rounding.smallest / 2
 
-		RowLayout {
-			id: sysModRow
+		StatusIcons {
+			id: sysIcons
 
 			anchors.fill: parent
-			anchors.leftMargin: Appearance.padding.smaller
-			anchors.rightMargin: Appearance.padding.normal
-
-			AudioWidget {
-				Layout.fillHeight: true
-				Layout.rightMargin: hasContent ? Appearance.spacing.extraSmall / 2 : 0
-				objectName: "audioWidget"
-
-				Behavior on Layout.rightMargin {
-					Anim {
-						type: Anim.FastEffects
-					}
-				}
-			}
-
-			NetworkWidget {
-				objectName: "networkWidget"
-			}
-
-			BluetoothWidget {
-				objectName: "bluetoothWidget"
-			}
-
-			UPowerWidget {
-				Layout.fillHeight: true
-				objectName: "upowerWidget"
-			}
+			anchors.leftMargin: Tokens.padding.smaller
+			anchors.rightMargin: Tokens.padding.normal
 		}
 	}
 }