Merge branch 'main' into feat/llm-chat-tab

Modules/Bar/Components/Clock.qml

@@ -13,7 +13,8 @@ import qs.Services
 WidgetBase {
 	id: root
 
-	readonly property color contentColor: visibilities.dashboard ? Colors.palette.m3onPrimary : Colors.palette.m3onSurface
+	readonly property font font: Tokens.font.clock.family(Config.appearance.font.family.clock).build()
+	readonly property color contentColor: Colors.palette.m3onSurface
 	readonly property string effectiveFormat: {
 		let fmt = Config.general.dateFormat;
 		if (!root.horizontal)
@@ -45,9 +46,8 @@ WidgetBase {
 	required property GridLayout loader
 	required property Wrapper popouts
 	readonly property real size: horizontal ? timeText.contentWidth + Tokens.padding.medium * 2 : verticalColumn.implicitHeight + Tokens.padding.medium * 2
-	required property PersistentProperties visibilities
+	required property ScreenState screenState
 
-	color: visibilities.dashboard ? Colors.palette.m3primary : Colors.tPalette.m3surfaceContainer
 	implicitHeight: horizontal ? baseSize : size
 	implicitWidth: horizontal ? size : baseSize
 	radius: Tokens.rounding.full
@@ -57,7 +57,7 @@ WidgetBase {
 
 		anchors.centerIn: parent
 		color: root.contentColor
-		font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
+		font: root.font
 		height: implicitHeight
 		text: Time.dateStr
 		visible: root.horizontal
@@ -83,7 +83,7 @@ WidgetBase {
 
 				Layout.alignment: Qt.AlignHCenter
 				color: root.contentColor
-				font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
+				font: root.font
 				text: Qt.formatDateTime(Time.date, modelData)
 
 				Behavior on color {
@@ -112,7 +112,7 @@ WidgetBase {
 
 				Layout.alignment: Qt.AlignHCenter
 				color: root.contentColor
-				font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
+				font: root.font
 				text: {
 					if (modelData.includes("h"))
 						return Time.hourStr;
@@ -132,7 +132,7 @@ WidgetBase {
 		CustomText {
 			Layout.alignment: Qt.AlignHCenter
 			color: root.contentColor
-			font.family: Config.appearance.font.family.clock // qmllint disable incompatible-type
+			font: root.font
 			text: Qt.formatDateTime(Time.date, "AP")
 			visible: Config.services.useTwelveHourClock && root.formatParts.timeTokens.length > 0
 
@@ -141,13 +141,4 @@ WidgetBase {
 			}
 		}
 	}
-
-	StateLayer {
-		acceptedButtons: Qt.LeftButton
-		color: root.contentColor
-
-		onClicked: {
-			root.visibilities.dashboard = !root.visibilities.dashboard;
-		}
-	}
 }