1 files changed, 20 insertions, 19 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
index 744b187f..edce57e3 100644
--- a/accounts/gkleen@sif/shell/quickshell/Clock.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -43,10 +43,9 @@ Item {
 
         Custom.Chrono {
           id: chrono
-          format: "W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}"
-        }
 
-        text: chrono.date
+          onDateChanged: clock.text = format("W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}")
+        }
 
         font.pointSize: 10
         font.family: "Fira Sans"
@@ -79,7 +78,7 @@ Item {
     color: "black"
 
     onVisibleChanged: {
-      yearCalendar.year = systemClock.date.getFullYear();
+      yearCalendar.year = chrono.date.getFullYear();
       clockMouseArea.angleRem = 0;
     }
 
@@ -117,7 +116,7 @@ Item {
           }
 
           GridLayout {
-            property int year: systemClock.date.getFullYear()
+            property int year: chrono.date.getFullYear()
 
             id: yearCalendar
 
@@ -128,12 +127,6 @@ Item {
             Layout.alignment: Qt.AlignHCenter
             Layout.fillWidth: false
 
-            SystemClock {
-              id: systemClock
-
-              precision: SystemClock.Minutes
-            }
-
             Repeater {
               model: 12
 
@@ -169,17 +162,25 @@ Item {
                   Layout.column: 1
                   Layout.fillWidth: true
 
-                  delegate: Text {
+                  delegate: WrapperItem {
                     required property string shortName
 
-                    font.pointSize: 10
-                    font.family: "Fira Mono"
+                    width: dowLabel.contentWidth + 6
 
-                    text: shortName
-                    color: "#ffcc66"
+                    Text {
+                      id: dowLabel
 
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
+                      anchors.fill: parent
+
+                      font.pointSize: 10
+                      font.family: "Fira Sans"
+
+                      text: parent.shortName
+                      color: "#ffcc66"
+
+                      horizontalAlignment: Text.AlignHCenter
+                      verticalAlignment: Text.AlignVCenter
+                    }
                   }
                 }
 
@@ -244,7 +245,7 @@ Item {
                       font.family: "Fira Sans"
                       font.features: { "tnum": 1 }
 
-                      property bool today: systemClock.date.getFullYear() == model.year && systemClock.date.getMonth() == model.month && systemClock.date.getDate() == model.day
+                      property bool today: chrono.date.getFullYear() == model.year && chrono.date.getMonth() == model.month && chrono.date.getDate() == model.day
 
                       text: model.day
                       color: today ? "#ff6699" : "white"