From 6b79abf3305d34740ed5566ed0e031accf21a037 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 6 May 2026 19:08:29 +1000 Subject: [PATCH] fix: improve clock (again) --- modules/bar/components/Clock.qml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml index 3b5f4072..7e86ac47 100644 --- a/modules/bar/components/Clock.qml +++ b/modules/bar/components/Clock.qml @@ -57,7 +57,10 @@ StyledRect { StyledText { Layout.alignment: Qt.AlignHCenter text: Time.hourStr - font: root.font.width(Math.min(120, Math.max(hourMetrics.width, minMetrics.width) / hourMetrics.width * 100)).build() + font: { + const scale = text === "11" ? 1.15 : Math.min(1.05, Math.max(hourMetrics.width, minMetrics.width) / hourMetrics.width); + return root.font.width(scale * 100).letterSpacing(scale).build(); + } color: root.colour TextMetrics { @@ -69,10 +72,13 @@ StyledRect { } StyledText { - Layout.topMargin: -parent.spacing - 2 + Layout.topMargin: -parent.spacing - 4 Layout.alignment: Qt.AlignHCenter text: Time.minuteStr - font: root.font.width(Math.min(120, Math.max(hourMetrics.width, minMetrics.width) / minMetrics.width * 100)).build() + font: { + const scale = text === "11" ? 1.15 : Math.min(1.05, Math.max(hourMetrics.width, minMetrics.width) / minMetrics.width); + return root.font.width(scale * 100).letterSpacing(scale).build(); + } color: root.colour TextMetrics { @@ -84,7 +90,7 @@ StyledRect { } Loader { - Layout.topMargin: -parent.spacing - 1 + Layout.topMargin: -parent.spacing - 4 Layout.alignment: Qt.AlignHCenter asynchronous: true active: GlobalConfig.services.useTwelveHourClock