fix: support 24h lock clock

This commit is contained in:
Soramane 2026-05-29 00:50:14 +08:00
parent 5b68e921aa
commit d741ca28d7

View file

@ -1,3 +1,5 @@
pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import Caelestia.Config import Caelestia.Config
import qs.components import qs.components
@ -39,7 +41,7 @@ Item {
text: Time.minuteStr text: Time.minuteStr
color: Colours.palette.m3secondary color: Colours.palette.m3secondary
font: Tokens.font.headline.builders.large.scale(3.8 * root.centerScale).width(30).build() font: Tokens.font.headline.builders.large.scale((GlobalConfig.services.useTwelveHourClock ? 3.8 : 7) * root.centerScale).width(30).build()
TextMetrics { TextMetrics {
id: minuteMetrics id: minuteMetrics
@ -49,11 +51,15 @@ Item {
} }
} }
StyledRect { Loader {
anchors.left: minutes.left anchors.left: minutes.left
anchors.leftMargin: minuteMetrics.tightBoundingRect.x anchors.leftMargin: minuteMetrics.tightBoundingRect.x
y: hourMetrics.tightBoundingRect.height - implicitHeight y: hourMetrics.tightBoundingRect.height - implicitHeight
active: GlobalConfig.services.useTwelveHourClock
asynchronous: true
sourceComponent: StyledRect {
color: Colours.tPalette.m3surfaceContainerHigh color: Colours.tPalette.m3surfaceContainerHigh
radius: Tokens.rounding.large radius: Tokens.rounding.large
@ -83,4 +89,5 @@ Item {
} }
} }
} }
}
} }