summaryrefslogtreecommitdiff
path: root/modules/background/DesktopClock.qml
diff options
context:
space:
mode:
Diffstat (limited to 'modules/background/DesktopClock.qml')
-rw-r--r--modules/background/DesktopClock.qml23
1 files changed, 14 insertions, 9 deletions
diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml
index a6b05c2..77fe447 100644
--- a/modules/background/DesktopClock.qml
+++ b/modules/background/DesktopClock.qml
@@ -79,7 +79,7 @@ Item {
spacing: Appearance.spacing.small
StyledText {
- text: Time.format(Config.services.useTwelveHourClock ? "hh" : "HH")
+ text: Time.hourStr
font.pointSize: Appearance.font.size.extraLarge * 3 * root.scale
font.weight: Font.Bold
color: root.safePrimary
@@ -94,19 +94,24 @@ Item {
}
StyledText {
- text: Time.format("mm")
+ text: Time.minuteStr
font.pointSize: Appearance.font.size.extraLarge * 3 * root.scale
font.weight: Font.Bold
color: root.safeSecondary
}
- StyledText {
- visible: Config.services.useTwelveHourClock
- text: Time.format("A")
- font.pointSize: Appearance.font.size.large * root.scale
- color: root.safeSecondary
+ Loader {
Layout.alignment: Qt.AlignTop
Layout.topMargin: Appearance.padding.large * 1.4 * root.scale
+
+ active: Config.services.useTwelveHourClock
+ visible: active
+
+ sourceComponent: StyledText {
+ text: Time.amPmStr
+ font.pointSize: Appearance.font.size.large * root.scale
+ color: root.safeSecondary
+ }
}
}
@@ -155,10 +160,10 @@ Item {
easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
}
}
-
+
Behavior on implicitWidth {
Anim {
duration: Appearance.anim.durations.small
}
}
-} \ No newline at end of file
+}