1 files changed, 38 insertions, 27 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
index 55fabd1c..edce57e3 100644
--- a/accounts/gkleen@sif/shell/quickshell/Clock.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -7,6 +7,8 @@ import QtQuick.Layouts
 import Quickshell.Widgets
 
 Item {
+  id: clockItem
+
   width: clock.contentWidth
   height: parent.height
   anchors.verticalCenter: parent.verticalCenter
@@ -30,22 +32,25 @@ Item {
 
     onWheel: event => scrollYear(event)
 
-    Text {
-      id: clock
-      color: "white"
+    Item {
+      anchors.fill: parent
 
-      anchors.verticalCenter: parent.verticalCenter
+      Text {
+        id: clock
+        color: "white"
 
-      Custom.Chrono {
-        id: chrono
-        format: "W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}"
-      }
+        anchors.verticalCenter: parent.verticalCenter
 
-      text: chrono.date
+        Custom.Chrono {
+          id: chrono
+
+          onDateChanged: clock.text = format("W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}")
+        }
 
-      font.pointSize: 10
-      font.family: "Fira Sans"
-      font.features: { "tnum": 1 }
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        font.features: { "tnum": 1 }
+      }
     }
   }
 
@@ -73,8 +78,7 @@ Item {
     color: "black"
 
     onVisibleChanged: {
-      const d = new Date();
-      yearCalendar.year = d.getFullYear();
+      yearCalendar.year = chrono.date.getFullYear();
       clockMouseArea.angleRem = 0;
     }
 
@@ -112,7 +116,7 @@ Item {
           }
 
           GridLayout {
-            property int year: { const d = new Date(); return d.getFullYear(); }
+            property int year: chrono.date.getFullYear()
 
             id: yearCalendar
 
@@ -146,10 +150,7 @@ Item {
                   font.pointSize: 10
                   font.family: "Fira Sans"
 
-                  text: {
-                    const date = Date.fromLocaleDateString(Qt.locale(), `${yearCalendar.year}-${monthCalendar.month + 1}-01`, "yyyy-M-dd");
-                    return date.toLocaleString(Qt.locale("en_DK"), "MMMM")
-                  }
+                  text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM")
 
                   color: "#ffead3"
                 }
@@ -161,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
+                    }
                   }
                 }
 
@@ -236,8 +245,10 @@ Item {
                       font.family: "Fira Sans"
                       font.features: { "tnum": 1 }
 
+                      property bool today: chrono.date.getFullYear() == model.year && chrono.date.getMonth() == model.month && chrono.date.getDate() == model.day
+
                       text: model.day
-                      color: model.today ? "#ff6699" : "white"
+                      color: today ? "#ff6699" : "white"
 
                       horizontalAlignment: Text.AlignRight
                       verticalAlignment: Text.AlignVCenter