From e693857c39ae35f9956105bbadb176f7e14ef746 Mon Sep 17 00:00:00 2001
From: purian23 <purian23@gmail.com>
Date: Fri, 29 Aug 2025 23:53:38 -0400
Subject: [PATCH] Enchance nightMode toggle indicators

---
 Modules/ControlCenter/ControlCenterPopout.qml | 14 +++++++++++++-
 Modules/Settings/PersonalizationTab.qml       |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Modules/ControlCenter/ControlCenterPopout.qml b/Modules/ControlCenter/ControlCenterPopout.qml
index 5c3dbad7..995652a9 100644
--- a/Modules/ControlCenter/ControlCenterPopout.qml
+++ b/Modules/ControlCenter/ControlCenterPopout.qml
@@ -792,10 +792,22 @@ DankPopout {
                         width: (parent.width - Theme.spacingM) / 2
                         iconName: DisplayService.nightModeEnabled ? "nightlight" : "dark_mode"
                         text: "Night Mode"
-                        secondaryText: DisplayService.nightModeEnabled ? "On" : "Off"
+                        secondaryText: SessionData.nightModeAutoEnabled ? "Auto" : (DisplayService.nightModeEnabled ? "On" : "Off")
                         isActive: DisplayService.nightModeEnabled
                         enabled: DisplayService.automationAvailable
                         onClicked: DisplayService.toggleNightMode()
+
+                        DankIcon {
+                            anchors.top: parent.top
+                            anchors.right: parent.right
+                            anchors.topMargin: Theme.spacingS
+                            anchors.rightMargin: Theme.spacingS
+                            name: "schedule"
+                            size: 12
+                            color: Theme.primary
+                            visible: SessionData.nightModeAutoEnabled
+                            opacity: 0.8
+                        }
                     }
 
                     ToggleButton {
diff --git a/Modules/Settings/PersonalizationTab.qml b/Modules/Settings/PersonalizationTab.qml
index 2894d8d8..fb1d24be 100644
--- a/Modules/Settings/PersonalizationTab.qml
+++ b/Modules/Settings/PersonalizationTab.qml
@@ -667,6 +667,9 @@ Item {
                         checked: SessionData.nightModeAutoEnabled
                         onToggled: (checked) => {
                             SessionData.setNightModeAutoEnabled(checked);
+                            if (checked && !DisplayService.nightModeEnabled) {
+                                DisplayService.toggleNightMode();
+                            }
                         }
 
                         Connections {