From 8e8b6145008234323a51b5bd607c3a194a73cc29 Mon Sep 17 00:00:00 2001
From: Natalie Clarius <natalie_clarius@yahoo.de>
Date: Sun, 28 Aug 2022 09:41:43 +0200
Subject: [PATCH] plugins/nightcolor: add configurable day temperature

BUG: 390021
---
 src/plugins/nightcolor/constants.h             | 2 +-
 src/plugins/nightcolor/nightcolormanager.cpp   | 5 +++--
 src/plugins/nightcolor/nightcolormanager.h     | 6 +++---
 src/plugins/nightcolor/nightcolorsettings.kcfg | 3 +++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/plugins/nightcolor/constants.h b/src/plugins/nightcolor/constants.h
index 685a755479..4a15f4cd35 100644
--- a/src/plugins/nightcolor/constants.h
+++ b/src/plugins/nightcolor/constants.h
@@ -14,7 +14,7 @@ namespace KWin
 
 static const int MSC_DAY = 86400000;
 static const int MIN_TEMPERATURE = 1000;
-static const int NEUTRAL_TEMPERATURE = 6500;
+static const int DEFAULT_DAY_TEMPERATURE = 6500;
 static const int DEFAULT_NIGHT_TEMPERATURE = 4500;
 static const int FALLBACK_SLOW_UPDATE_TIME = 1800000; /* 30 minutes */
 
diff --git a/src/plugins/nightcolor/nightcolormanager.cpp b/src/plugins/nightcolor/nightcolormanager.cpp
index 110f363e27..7d7e310480 100644
--- a/src/plugins/nightcolor/nightcolormanager.cpp
+++ b/src/plugins/nightcolor/nightcolormanager.cpp
@@ -266,7 +266,8 @@ void NightColorManager::readConfig()
         break;
     }
 
-    m_nightTargetTemp = qBound(MIN_TEMPERATURE, s->nightTemperature(), NEUTRAL_TEMPERATURE);
+    m_dayTargetTemp = qBound(MIN_TEMPERATURE, s->dayTemperature(), DEFAULT_DAY_TEMPERATURE);
+    m_nightTargetTemp = qBound(MIN_TEMPERATURE, s->nightTemperature(), DEFAULT_DAY_TEMPERATURE);
 
     double lat, lng;
     auto correctReadin = [&lat, &lng]() {
@@ -628,7 +629,7 @@ bool NightColorManager::daylight() const
 int NightColorManager::currentTargetTemp() const
 {
     if (!m_running) {
-        return NEUTRAL_TEMPERATURE;
+        return DEFAULT_DAY_TEMPERATURE;
     }
 
     if (m_mode == NightColorMode::Constant) {
diff --git a/src/plugins/nightcolor/nightcolormanager.h b/src/plugins/nightcolor/nightcolormanager.h
index 8206a9a87a..0b865ba81a 100644
--- a/src/plugins/nightcolor/nightcolormanager.h
+++ b/src/plugins/nightcolor/nightcolormanager.h
@@ -300,9 +300,9 @@ private:
     QTimer *m_quickAdjustTimer = nullptr;
     QTimer *m_previewTimer = nullptr;
 
-    int m_currentTemp = NEUTRAL_TEMPERATURE;
-    int m_targetTemperature = NEUTRAL_TEMPERATURE;
-    int m_dayTargetTemp = NEUTRAL_TEMPERATURE;
+    int m_currentTemp = DEFAULT_DAY_TEMPERATURE;
+    int m_targetTemperature = DEFAULT_DAY_TEMPERATURE;
+    int m_dayTargetTemp = DEFAULT_DAY_TEMPERATURE;
     int m_nightTargetTemp = DEFAULT_NIGHT_TEMPERATURE;
 
     int m_inhibitReferenceCount = 0;
diff --git a/src/plugins/nightcolor/nightcolorsettings.kcfg b/src/plugins/nightcolor/nightcolorsettings.kcfg
index dc4c931c75..0b7b7ba0bf 100644
--- a/src/plugins/nightcolor/nightcolorsettings.kcfg
+++ b/src/plugins/nightcolor/nightcolorsettings.kcfg
@@ -17,6 +17,9 @@
             </choices>
             <default>NightColorMode::Automatic</default>
         </entry>
+        <entry name="DayTemperature" type="Int">
+            <default>6500</default>
+        </entry>
         <entry name="NightTemperature" type="Int">
             <default>4500</default>
         </entry>