1 files changed, 214 insertions, 115 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
index 3e0f8200..4644d5e7 100644
--- a/accounts/gkleen@sif/shell/quickshell/Clock.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -4,182 +4,281 @@ import Quickshell
 import Custom as Custom
 import QtQuick.Controls
 import QtQuick.Layouts
+import Quickshell.Widgets
 
 Item {
+  id: clockItem
+
+  property bool calendarPopup: true
+
   width: clock.contentWidth
   height: parent.height
   anchors.verticalCenter: parent.verticalCenter
 
-  MouseArea {
+  WrapperMouseArea {
     id: clockMouseArea
 
     anchors.fill: parent
     hoverEnabled: true
-    enabled: true
-  }
+    enabled: clockItem.calendarPopup
 
-  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
 
-    font.pointSize: 10
-    font.family: "Fira Sans"
-    font.features: { "tnum": 1 }
-  }
+          onDateChanged: clock.text = format("W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}")
+        }
 
-  PopupWindow {
-    anchor {
-      item: clockMouseArea
-      edges: Edges.Bottom
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        font.features: { "tnum": 1 }
+      }
     }
-    visible: clockMouseArea.containsMouse
+  }
 
-    implicitWidth: yearCalendar.implicitWidth + 16
-    implicitHeight: yearCalendar.implicitHeight + 16
-    color: "black"
+  Loader {
+    id: tooltipLoader
 
-    GridLayout {
-      property int year: { const d = new Date(); return d.getFullYear(); }
+    active: false
 
-      id: yearCalendar
+    Connections {
+      target: clockMouseArea
+      function onContainsMouseChanged() {
+       if (clockMouseArea.containsMouse)
+         tooltipLoader.active = true;
+      }
+    }
 
-      columns: 3
-      columnSpacing: 16
-      rowSpacing: 16
+    sourceComponent: PopupWindow {
+      id: tooltip
 
-      anchors.centerIn: parent
+      property bool nextVisible: clockMouseArea.containsMouse || tooltipMouseArea.containsMouse
 
-      Repeater {
-        model: 12
+      anchor {
+        item: clockMouseArea
+        edges: Edges.Bottom | Edges.Left
+      }
+      visible: false
 
-        GridLayout {
-          columns: 2
+      onNextVisibleChanged: hangTimer.restart()
 
-          required property int index
-          property int month: index
+      Timer {
+        id: hangTimer
+        interval: 100
+        onTriggered: tooltip.visible = tooltip.nextVisible
+      }
 
-          id: monthCalendar
+      implicitWidth: clockTooltipContent.width
+      implicitHeight: clockTooltipContent.height
+      color: "black"
 
-          Layout.alignment: Qt.AlignTop | Qt.AlignRight
-          Layout.fillWidth: false
+      onVisibleChanged: {
+        yearCalendar.year = chrono.date.getFullYear();
+        yearCalendar.angleRem = 0;
+      }
 
-          Text {
-            Layout.column: 1
-            Layout.fillWidth: true
+      WrapperMouseArea {
+        id: tooltipMouseArea
 
-            horizontalAlignment: Text.AlignHCenter
+        hoverEnabled: true
+        enabled: true
 
-            font.pointSize: 10
-            font.family: "Fira Sans"
+        onWheel: event => yearCalendar.scrollYear(event)
 
-            text: {
-              const date = Date.fromLocaleDateString(Qt.locale(), `${yearCalendar.year}-${monthCalendar.month + 1}-01`, "yyyy-M-dd");
-              return date.toLocaleString(Qt.locale("en_DK"), "MMMM")
-            }
+        anchors.fill: parent
 
-            color: "#ffead3"
-          }
+        WrapperItem {
+          id: clockTooltipContent
+
+          margin: 8
 
-          DayOfWeekRow {
-            locale: grid.locale
+          ColumnLayout {
+            anchors.centerIn: parent
 
-            Layout.row: 1
-            Layout.column: 1
-            Layout.fillWidth: true
+            Text {
+              id: yearLabel
 
-            delegate: Text {
-              required property string shortName
+              horizontalAlignment: Text.AlignHCenter
 
-              font.pointSize: 10
-              font.family: "Fira Mono"
+              font.pointSize: 14
+              font.family: "Fira Sans"
+              font.features: { "tnum": 1 }
+              color: "white"
 
-              text: shortName
-              color: "#ffcc66"
+              text: yearCalendar.year
 
-              horizontalAlignment: Text.AlignRight
-              verticalAlignment: Text.AlignVCenter
+              Layout.fillWidth: true
+              Layout.bottomMargin: 8
             }
-          }
 
-          WeekNumberColumn {
-            month: grid.month
-            year: grid.year
-            locale: grid.locale
+            GridLayout {
+              property int year: chrono.date.getFullYear()
 
-            Layout.fillHeight: true
+              id: yearCalendar
 
-            delegate: Text {
-              required property int weekNumber
+              columns: 3
+              columnSpacing: 16
+              rowSpacing: 16
 
-              opacity: {
-                const simple = new Date(weekNumber == 1 && monthCalendar.month == 12 ? yearCalendar.year + 1 : yearCalendar.year, 0, 1 + (weekNumber - 1) * 7);
-                const dayOfWeek = simple.getDay();
-                const isoWeekStart = simple;
+              Layout.alignment: Qt.AlignHCenter
+              Layout.fillWidth: false
 
-                isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1);
-                if (dayOfWeek > 4) {
-                    isoWeekStart.setDate(isoWeekStart.getDate() + 7);
-                }
+              property real angleRem: 0
+              property real sensitivity: 1 / 120
 
-                for (let i = 0; i < 7; i++) {
-                  const dayInWeek = isoWeekStart;
-                  dayInWeek.setDate(dayInWeek.getDate() + i);
-                  if (dayInWeek.getMonth() == monthCalendar.month)
-                    return 1;
-                }
+              function scrollYear(event) {
+                angleRem += event.angleDelta.y;
+                const d = Math.round(angleRem * sensitivity);
+                yearCalendar.year += d;
+                angleRem -= d / sensitivity;
+              }
 
-                return 0;
+              Connections {
+                target: clockMouseArea
+                function onWheel(event) { yearCalendar.scrollYear(event); }
               }
 
-              font.pointSize: 10
-              font.family: "Fira Sans"
-              font.features: { "tnum": 1 }
+              Repeater {
+                model: 12
 
-              text: weekNumber
-              color: "#99ffdd"
+                GridLayout {
+                  columns: 2
 
-              horizontalAlignment: Text.AlignRight
-              verticalAlignment: Text.AlignVCenter
-            }
-          }
+                  required property int index
+                  property int month: index
+
+                  id: monthCalendar
+
+                  Layout.alignment: Qt.AlignTop | Qt.AlignRight
+                  Layout.fillWidth: false
 
-          MonthGrid {
-            id: grid
+                  Text {
+                    Layout.column: 1
+                    Layout.fillWidth: true
 
-            year: yearCalendar.year
-            month: monthCalendar.month
-            locale: Qt.locale("en_DK")
+                    horizontalAlignment: Text.AlignHCenter
 
-            Layout.fillWidth: true
-            Layout.fillHeight: true
+                    font.pointSize: 10
+                    font.family: "Fira Sans"
 
-            delegate: Text {
-                required property var model
+                    text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM")
 
-                opacity: model.month === monthCalendar.month ? 1 : 0
+                    color: "#ffead3"
+                  }
 
-                font.pointSize: 10
-                font.family: "Fira Sans"
-                font.features: { "tnum": 1 }
+                  DayOfWeekRow {
+                    locale: grid.locale
 
-                text: model.day
-                color: model.today ? "#ff6699" : "white"
+                    Layout.row: 1
+                    Layout.column: 1
+                    Layout.fillWidth: true
 
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
+                    delegate: WrapperItem {
+                      required property string shortName
+
+                      width: dowLabel.contentWidth + 6
+
+                      Text {
+                        id: dowLabel
+
+                        anchors.fill: parent
+
+                        font.pointSize: 10
+                        font.family: "Fira Sans"
+
+                        text: parent.shortName
+                        color: "#ffcc66"
+
+                        horizontalAlignment: Text.AlignHCenter
+                        verticalAlignment: Text.AlignVCenter
+                      }
+                    }
+                  }
+
+                  WeekNumberColumn {
+                    month: grid.month
+                    year: grid.year
+                    locale: grid.locale
+
+                    Layout.fillHeight: true
+
+                    delegate: Text {
+                      required property int weekNumber
+
+                      opacity: {
+                        const simple = new Date(weekNumber == 1 && monthCalendar.month == 12 ? yearCalendar.year + 1 : yearCalendar.year, 0, 1 + (weekNumber - 1) * 7);
+                        const dayOfWeek = simple.getDay();
+                        const isoWeekStart = simple;
+
+                        isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1);
+                        if (dayOfWeek > 4) {
+                            isoWeekStart.setDate(isoWeekStart.getDate() + 7);
+                        }
+
+                        for (let i = 0; i < 7; i++) {
+                          const dayInWeek = new Date(isoWeekStart);
+                          dayInWeek.setDate(dayInWeek.getDate() + i);
+                          if (dayInWeek.getMonth() == monthCalendar.month)
+                            return 1;
+                        }
+
+                        return 0;
+                      }
+
+                      font.pointSize: 10
+                      font.family: "Fira Sans"
+                      font.features: { "tnum": 1 }
+
+                      text: weekNumber
+                      color: "#99ffdd"
+
+                      horizontalAlignment: Text.AlignRight
+                      verticalAlignment: Text.AlignVCenter
+                    }
+                  }
+
+                  MonthGrid {
+                    id: grid
+
+                    year: yearCalendar.year
+                    month: monthCalendar.month
+                    locale: Qt.locale("en_DK")
+
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+
+                    delegate: Text {
+                        required property var model
+
+                        opacity: model.month === monthCalendar.month ? 1 : 0
+
+                        font.pointSize: 10
+                        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: today ? "#ff6699" : "white"
+
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                    }
+                  }
+                }
+              }
             }
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}