1 files changed, 17 insertions, 6 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
index 4644d5e7..b7004528 100644
--- a/accounts/gkleen@sif/shell/quickshell/Clock.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -73,11 +73,15 @@ Item {
       Timer {
         id: hangTimer
         interval: 100
-        onTriggered: tooltip.visible = tooltip.nextVisible
+        onTriggered: {
+          tooltip.visible = tooltip.nextVisible;
+          if (!tooltip.visible)
+            tooltipLoader.active = false;
+        }
       }
 
-      implicitWidth: clockTooltipContent.width
-      implicitHeight: clockTooltipContent.height
+      implicitWidth: tooltipLayout.childrenRect.width + 16
+      implicitHeight: tooltipLayout.childrenRect.height + 16
       color: "black"
 
       onVisibleChanged: {
@@ -95,13 +99,20 @@ Item {
 
         anchors.fill: parent
 
-        WrapperItem {
+        Item {
           id: clockTooltipContent
 
-          margin: 8
+          anchors.fill: parent
 
           ColumnLayout {
-            anchors.centerIn: parent
+            id: tooltipLayout
+
+            anchors {
+              left: parent.left
+              top: parent.top
+              leftMargin: 8
+              topMargin: 8
+            }
 
             Text {
               id: yearLabel