Store current accent HSL values as POD

Author: krlvm

AccentColorizer/AccentColorHelper.cpp

@@ -3,16 +3,15 @@
 #include <cmath>
 
 COLORREF g_dwAccent;
-int g_hslAccentH;
-double g_hslAccentS;
-double g_oldhslAccentS;
+//
+hsl_t g_hslAccent;
+hsl_t g_hslDefaultAccent;
+//
 double g_balance1hslAccentS;
 double g_balance2hslAccentS;
-double g_hslAccentL;
+//
 double g_oldhslAccentL;
-double g_defaulthslAccentH;
-double g_defaulthslAccentS;
-double g_defaulthslAccentL;
+double g_oldhslAccentS;
 
 bool UpdateAccentColor()
 {
@@ -29,24 +28,24 @@ bool UpdateAccentColor()
 	}
 
 	if (accentColorChanges >= 1) {
-		g_oldhslAccentS = g_hslAccentS;
+		g_oldhslAccentS = g_hslAccent.s;
 		if (g_oldhslAccentS <= 0.0666) {
 			g_oldhslAccentS = 0.0666;
 		}
 	}
 	else g_oldhslAccentS = 1;
 
 	if (accentColorChanges >= 1) {
-		g_oldhslAccentL = g_hslAccentL;
+		g_oldhslAccentL = g_hslAccent.l;
 	}
 	else g_oldhslAccentL = 0;
 
 	g_dwAccent = dwAccent;
 	if ((double)GetRValue(dwAccent) == (double)GetGValue(dwAccent) && (double)GetGValue(dwAccent) == (double)GetBValue(dwAccent)) {
-		g_hslAccentH = 210.0;
+		g_hslAccent.h = 210.0;
 	}
 	else {
-		g_hslAccentH = rgb2hsl({
+		g_hslAccent.h = rgb2hsl({
 			(double)GetRValue(dwAccent) / 255,
 			(double)GetGValue(dwAccent) / 255,
 			(double)GetBValue(dwAccent) / 255 }).h;
@@ -61,36 +60,36 @@ bool UpdateAccentColor()
 
 	g_dwAccent = dwAccent;
 	if ((double)GetRValue(dwAccent) == (double)GetGValue(dwAccent) && (double)GetGValue(dwAccent) == (double)GetBValue(dwAccent)) {
-		g_hslAccentS = 0.0667;
+		g_hslAccent.s = 0.0667;
 	}
 	else {
-		g_hslAccentS = pow(double(rgb2hsl({
+		g_hslAccent.s = pow(double(rgb2hsl({
 			(double)GetRValue(dwAccent) / 254.999999999,
 			(double)GetGValue(dwAccent) / 254.999999999,
 			(double)GetBValue(dwAccent) / 254.999999999 }).s), double(0.85));
 	}
 
 
-	g_balance1hslAccentS = g_hslAccentS;
-	g_balance2hslAccentS = (1 - g_hslAccentS);
+	g_balance1hslAccentS = g_hslAccent.s;
+	g_balance2hslAccentS = (1 - g_hslAccent.s);
 
-	g_defaulthslAccentH = 207;
-	g_defaulthslAccentS = 1;
-	g_defaulthslAccentL = (double)(rgb2hsl({
+	g_hslDefaultAccent.h = 207;
+	g_hslDefaultAccent.s = 1;
+	g_hslDefaultAccent.l = (double)(rgb2hsl({
 		(double)0 / 254.999999999,
 		(double)120 / 254.999999999,
 		(double)215 / 254.999999999 }).l);
 
-	if (g_hslAccentS < 0.0666) {
-		g_hslAccentS = 0.0666;
+	if (g_hslAccent.s < 0.0666) {
+		g_hslAccent.s = 0.0666;
 	}
 	if (accentColorChanges >= 1) {
-		if (g_hslAccentS > 1) {
-			g_hslAccentS = g_balance1hslAccentS + g_balance2hslAccentS;
+		if (g_hslAccent.s > 1) {
+			g_hslAccent.s = g_balance1hslAccentS + g_balance2hslAccentS;
 		}
 	}
 
-	g_hslAccentL = ((double)(rgb2hsl({
+	g_hslAccent.l = ((double)(rgb2hsl({
 		(double)GetRValue(dwAccent) / 254.999999999,
 		(double)GetGValue(dwAccent) / 254.999999999,
 		(double)GetBValue(dwAccent) / 254.999999999 }).l) - 

AccentColorizer/AccentColorHelper.h

@@ -1,17 +1,18 @@
 #pragma once
 #include "framework.h"
+#include "ColorHelper.h"
 
 extern COLORREF g_dwAccent;
-extern int g_hslAccentH;
-extern double g_hslAccentS;
-extern double g_oldhslAccentS;
+//
+extern hsl_t g_hslAccent;
+extern hsl_t g_hslDefaultAccent;
+//
 extern double g_balance1hslAccentS;
 extern double g_balance2hslAccentS;
-extern double g_hslAccentL;
+//
 extern double g_oldhslAccentL;
-extern double g_defaulthslAccentH;
-extern double g_defaulthslAccentS;
-extern double g_defaulthslAccentL;
+extern double g_oldhslAccentS;
+//
 extern int accentColorChanges;
 
 bool UpdateAccentColor();

AccentColorizer/StyleModifier.cpp

@@ -17,13 +17,13 @@ void StandardBitmapPixelHandler(int& r, int& g, int& b, int& a)
 	rgb_t rgbVal = { r, g, b };
 	hsl_t hslVal = rgb2hsl(rgbVal);
 
-	hslVal.h = g_defaulthslAccentH;
-	hslVal.s = (double)hslVal.s * (double)(1 / (double)g_oldhslAccentS) * (double)g_defaulthslAccentS;
+	hslVal.h = g_hslDefaultAccent.h;
+	hslVal.s = hslVal.s * (1.0 / g_oldhslAccentS) * g_hslDefaultAccent.s;
 
-	hslVal.l = hslVal.l - (g_oldhslAccentL * hslVal.s * (a / static_cast<double>(255))) + (g_hslAccentL * hslVal.s * (a / static_cast<double>(255))) - (g_defaulthslAccentL * hslVal.s);
+	hslVal.l = hslVal.l - (g_oldhslAccentL * hslVal.s * (a / static_cast<double>(255))) + (g_hslAccent.l * hslVal.s * (a / static_cast<double>(255))) - (g_hslDefaultAccent.l * hslVal.s);
 
-	hslVal.h = g_hslAccentH;
-	hslVal.s = (double)hslVal.s * (double)g_hslAccentS;
+	hslVal.h = g_hslAccent.h;
+	hslVal.s = hslVal.s * g_hslAccent.s;
 
 	rgbVal = hsl2rgb(hslVal);
 
@@ -37,8 +37,8 @@ void StandardColorHandler(int& r, int& g, int& b) // dummy code
 	rgb_t rgbVal = { 255, 128, 128 };
 	hsl_t hslVal = rgb2hsl(rgbVal);
 
-	hslVal.h = g_hslAccentH;
-	hslVal.s = hslVal.s * (1 / g_oldhslAccentS) * g_hslAccentS;
+	hslVal.h = g_hslAccent.h;
+	hslVal.s = hslVal.s * (1 / g_oldhslAccentS) * g_hslAccent.s;
 
 	rgbVal = hsl2rgb(hslVal);
 }

AccentColorizer/SysColorsModifier.cpp

@@ -37,13 +37,13 @@ void ModifySysColors()
 		};
 		hslVal = rgb2hsl(rgbVal);
 
-		hslVal.h = g_defaulthslAccentH;
-		hslVal.s = (double)hslVal.s * (double)(1 / (double)g_oldhslAccentS) * (double)g_defaulthslAccentS;
+		hslVal.h = g_hslDefaultAccent.h;
+		hslVal.s = hslVal.s * (1 / g_oldhslAccentS) * g_hslDefaultAccent.s;
 
-		hslVal.l = hslVal.l - (g_oldhslAccentL * hslVal.s) + (g_hslAccentL * hslVal.s) -  (g_defaulthslAccentL * hslVal.s);
+		hslVal.l = hslVal.l - (g_oldhslAccentL * hslVal.s) + (g_hslAccent.l * hslVal.s) -  (g_hslDefaultAccent.l * hslVal.s);
 
-		hslVal.h = g_hslAccentH;
-		hslVal.s = (double)hslVal.s * (double)g_hslAccentS;
+		hslVal.h = g_hslAccent.h;
+		hslVal.s = hslVal.s * g_hslAccent.s;