From b8051ce2cf4b6ea448c801b6d3f80e79a8c8d63a Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Sun, 2 Nov 2025 01:07:42 +0100
Subject: [PATCH] make bg clock color match pixel more

---
 .../background/cookieClock/CookieClock.qml    | 38 +++++++++----------
 .../background/cookieClock/MinuteHand.qml     |  4 +-
 .../cookieClock/dateIndicator/BubbleDate.qml  |  4 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/dots/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml b/dots/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml
index 07f83401d..a730535ec 100644
--- a/dots/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml
+++ b/dots/.config/quickshell/ii/modules/background/cookieClock/CookieClock.qml
@@ -20,12 +20,12 @@ Item {
     property real implicitSize: 230
 
     property color colShadow: Appearance.colors.colShadow
-    property color colBackground: Appearance.colors.colSecondaryContainer
-    property color colOnBackground: ColorUtils.mix(Appearance.colors.colSecondary, Appearance.colors.colSecondaryContainer, 0.15)
-    property color colBackgroundInfo: ColorUtils.mix(Appearance.colors.colPrimary, Appearance.colors.colSecondaryContainer, 0.55)
+    property color colBackground: Appearance.colors.colPrimaryContainer
+    property color colOnBackground: ColorUtils.mix(Appearance.colors.colSecondary, Appearance.colors.colPrimaryContainer, 0.15)
+    property color colBackgroundInfo: ColorUtils.mix(Appearance.colors.colPrimary, Appearance.colors.colPrimaryContainer, 0.55)
     property color colHourHand: Appearance.colors.colPrimary
-    property color colMinuteHand: Appearance.colors.colSecondary
-    property color colSecondHand: Appearance.colors.colTertiary
+    property color colMinuteHand: Appearance.colors.colTertiary
+    property color colSecondHand: Appearance.colors.colPrimary
 
     readonly property list<string> clockNumbers: DateTime.time.split(/[: ]/)
     readonly property int clockHour: parseInt(clockNumbers[0]) % 12
@@ -157,23 +157,10 @@ Item {
         }
     }
 
-    // Hour hand
-    FadeLoader {
-        anchors.fill: parent
-        z: 1
-        shown: Config.options.background.clock.cookie.hourHandStyle !== "hide"
-        sourceComponent: HourHand {
-            clockHour: root.clockHour
-            clockMinute: root.clockMinute
-            style: Config.options.background.clock.cookie.hourHandStyle
-            color: root.colHourHand
-        }
-    }
-
     // Minute hand
     FadeLoader {
         anchors.fill: parent
-        z: 2
+        z: 1
         shown: Config.options.background.clock.cookie.minuteHandStyle !== "hide"
         sourceComponent: MinuteHand {
             anchors.fill: parent
@@ -183,6 +170,19 @@ Item {
         }
     }
 
+    // Hour hand
+    FadeLoader {
+        anchors.fill: parent
+        z: item?.style === "hollow" ? 0 : 2
+        shown: Config.options.background.clock.cookie.hourHandStyle !== "hide"
+        sourceComponent: HourHand {
+            clockHour: root.clockHour
+            clockMinute: root.clockMinute
+            style: Config.options.background.clock.cookie.hourHandStyle
+            color: root.colHourHand
+        }
+    }
+
     // Second hand
     FadeLoader {
         id: secondHandLoader
diff --git a/dots/.config/quickshell/ii/modules/background/cookieClock/MinuteHand.qml b/dots/.config/quickshell/ii/modules/background/cookieClock/MinuteHand.qml
index 764c14f2b..5ca0f2ee1 100644
--- a/dots/.config/quickshell/ii/modules/background/cookieClock/MinuteHand.qml
+++ b/dots/.config/quickshell/ii/modules/background/cookieClock/MinuteHand.qml
@@ -11,7 +11,7 @@ Item {
     property string style: "medium"
     property real handLength: 95
     property real handWidth: style === "bold" ? 20 : style === "medium" ? 12 : 5
-    property color color: Appearance.colors.colSecondary
+    property color color: Appearance.colors.colTertiary
 
     rotation: -90 + (360 / 60) * root.clockMinute
     Behavior on rotation {
@@ -34,7 +34,7 @@ Item {
         height: root.handWidth
         
         radius: root.style === "classic" ? 2 : root.handWidth / 2
-        color: Appearance.colors.colSecondary
+        color: root.color
 
         Behavior on height {
             animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
diff --git a/dots/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/BubbleDate.qml b/dots/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/BubbleDate.qml
index 3a7313600..1c75c355b 100644
--- a/dots/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/BubbleDate.qml
+++ b/dots/.config/quickshell/ii/modules/background/cookieClock/dateIndicator/BubbleDate.qml
@@ -19,7 +19,7 @@ Item {
         // sides: root.isMonth ? 1 : 4
         shape: root.isMonth ? MaterialShape.Shape.Pill : MaterialShape.Shape.Pentagon
         anchors.centerIn: parent
-        color: root.isMonth ? Appearance.colors.colPrimaryContainer : Appearance.colors.colTertiaryContainer
+        color: root.isMonth ? Appearance.colors.colSecondaryContainer : Appearance.colors.colTertiaryContainer
         implicitSize: targetSize
     }
 
@@ -27,7 +27,7 @@ Item {
         id: bubbleText
         z: 6
         anchors.centerIn: parent
-        color: root.isMonth ? Appearance.colors.colPrimary : Appearance.colors.colTertiary
+        color: root.isMonth ? Appearance.colors.colOnSecondaryContainer : Appearance.colors.colOnTertiaryContainer
         font {
             family: Appearance.font.family.expressive
             pixelSize: 30