nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: improve clock (again)

Browse source
This commit is contained in:
2 * r + 2 * t 2026-05-06 19:08:29 +10:00
parent 1efb0be5ae
commit 6b79abf330
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/bar/components/Clock.qml
View file

@ -57,7 +57,10 @@ StyledRect {
StyledText { StyledText {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: Time.hourStr 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 color: root.colour
TextMetrics { TextMetrics {
@ -69,10 +72,13 @@ StyledRect {
} }
StyledText { StyledText {
Layout.topMargin: -parent.spacing - 2 Layout.topMargin: -parent.spacing - 4
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: Time.minuteStr 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 color: root.colour
TextMetrics { TextMetrics {
@ -84,7 +90,7 @@ StyledRect {
} }
Loader { Loader {
Layout.topMargin: -parent.spacing - 1 Layout.topMargin: -parent.spacing - 4
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
asynchronous: true asynchronous: true
active: GlobalConfig.services.useTwelveHourClock active: GlobalConfig.services.useTwelveHourClock