From 61fec4b53d9318a21d5ed2df92c354bde325d4a1 Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Sat, 11 Oct 2025 11:20:15 +0200
Subject: [PATCH] background clock: hour marks: put in loader, reduce behavior
 spam

---
 .../background/cookieClock/CookieClock.qml    | 17 +++---
 .../background/cookieClock/HourMarks.qml      | 52 +++++--------------
 .../cookieClock/minuteMarks/MinuteMarks.qml   |  4 +-
 3 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml b/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml
index f090a8d2b..22bc6005b 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml
+++ b/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml
@@ -29,7 +29,7 @@ Item {
     property real secondDotSize: 20
     property real secondHandWidth: 2
     property real secondHandLength: 100
-    property real hourLineSize: 5
+    property real hourLineSize: 4
     property real minuteLineSize: 2
     property real hourNumberSize: 36
     property real dateSquareSize: 64
@@ -75,17 +75,18 @@ Item {
     // Hour/minutes numbers/dots/lines
     MinuteMarks {
         anchors.fill: parent
-        hourDotSize: root.hourDotSize
-        hourNumberSize: root.hourNumberSize
         color: root.colOnBackground
     }
 
-    HourMarks {
+    FadeLoader {
+        id: hourMarksLoader
         anchors.centerIn: parent
-        implicitSize: root.hourMarkSize
-        markLength: root.hourDotSize
-        color: root.colTimeIndicators
-        colOnBackground: root.colOnBackground
+        shown: Config.options.background.clock.cookie.hourMarks
+        sourceComponent: HourMarks {
+            implicitSize: root.hourMarkSize * (1.75 - 0.75 * hourMarksLoader.opacity)
+            color: root.colTimeIndicators
+            colOnBackground: root.colOnBackground
+        }
     }
 
     // Number column in the middle
diff --git a/.config/quickshell/ii/modules/background/cookieClock/HourMarks.qml b/.config/quickshell/ii/modules/background/cookieClock/HourMarks.qml
index 31d7280e8..c20b14a60 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/HourMarks.qml
+++ b/.config/quickshell/ii/modules/background/cookieClock/HourMarks.qml
@@ -9,70 +9,42 @@ import QtQuick
 Item {
     id: root
     property real implicitSize: 135
-    property real markLength: 10
+    property real markLength: 12
+    property real markWidth: 4
     property color color: Appearance.colors.colOnSecondaryContainer
     property color colOnBackground: Appearance.colors.colSecondaryContainer
-
-    property bool isEnabled: Config.options.background.clock.cookie.hourMarks
+    property real padding: 10
 
     Rectangle {
-        opacity: root.isEnabled ? 1.0 : 0 
-        z: 0
         color: root.color
         anchors.centerIn: parent
-        implicitWidth: root.isEnabled ? root.implicitSize : root.implicitSize * 1.75
-        implicitHeight: root.isEnabled ? root.implicitSize : root.implicitSize * 1.75 // Not using implicitHeight to allow smooth transition
-        radius: implicitWidth / 2
-        Behavior on opacity {
-            animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
-        }
-        Behavior on implicitWidth {
-            animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
-        }
-        Behavior on implicitHeight {
-            animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
-        }
-    }
+        implicitWidth: root.implicitSize
+        implicitHeight: root.implicitSize
+        radius: width / 2
 
-    // Hour mark lines
-    Rectangle {
-        id: glowLines
-        z: 1
-        anchors.centerIn: parent
+        // Hour mark lines
         Repeater {
             model: 12
+
             Item {
                 required property int index
                 anchors.fill: parent
-
                 rotation: 360 / 12 * index 
-                opacity: root.isEnabled ? 1.0 : 0
-
-                Behavior on opacity {
-                    animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
-                }
 
                 Rectangle {
                     anchors {
                         left: parent.left
                         verticalCenter: parent.verticalCenter
-                        leftMargin: root.isEnabled ? 50 : 75
+                        leftMargin: root.padding
                     }
                     implicitWidth: root.markLength
-                    implicitHeight: implicitWidth / 2 
+                    implicitHeight: root.markWidth
 
-                    radius: implicitWidth / 2
+                    radius: width / 2
                     color: root.colOnBackground
-                    opacity: root.isEnabled ? 0.5 : 0
-
-                    Behavior on opacity {
-                        animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
-                    }
-                    Behavior on anchors.leftMargin {
-                        animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
-                    }
                 }
             }
         }
     }
+
 }
diff --git a/.config/quickshell/ii/modules/background/cookieClock/minuteMarks/MinuteMarks.qml b/.config/quickshell/ii/modules/background/cookieClock/minuteMarks/MinuteMarks.qml
index a1f28c7bb..100e72284 100644
--- a/.config/quickshell/ii/modules/background/cookieClock/minuteMarks/MinuteMarks.qml
+++ b/.config/quickshell/ii/modules/background/cookieClock/minuteMarks/MinuteMarks.qml
@@ -7,8 +7,6 @@ import QtQuick
 Item {
     id: root
 
-    property int hourDotSize: 16
-    property int hourNumberSize: 80
     property color color: Appearance.colors.colOnSecondaryContainer
     property string style: Config.options.background.clock.cookie.dialNumberStyle // "dots", "numbers", "full", "hide"
     property string dateStyle : Config.options.background.clock.cookie.dateStyle
@@ -30,7 +28,7 @@ Item {
         anchors.fill: parent
         shown: root.style === "numbers"
         sourceComponent: BigHourNumbers {
-            numberSize: root.hourNumberSize
+            numberSize: 80
             color: root.color
             margins: 70 - bigHourNumbersLoader.opacity * 40
         }