v1.8.5

Fixed a glitch when labels for disabled controls got too dark color.

Form1.resx

@@ -134,7 +134,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAs
-        CgAAAk1TRnQBSQFMAgEBAwEAAfABAAHwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBAwEAATABAQEwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -188,7 +188,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
-        bAAAAk1TRnQBSQFMAgEBAwEAAVgBAwFYAQMBQAEAAUABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgEAAEB
+        bAAAAk1TRnQBSQFMAgEBAwEAAZgBAwGYAQMBQAEAAUABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgEAAEB
         AgABQAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wCVAAQBBAL4AAQBBALoAAMDAQQDDQERAxUBHAEV
         ARYBFQEdARUBFgEVAR0BFQEWARUBHQMWAR4DFAEbAwwBDwMCAQP/AM0AAwUBBgMUARsDJQE3AzQBVAM+
         AWsDRAF7A0gBhANJAYgDSgGJA0kBhQNGAX0DPwFtAzYBVwMnAToCFgEVAR0DBgEHwAADBQEGAxQBGwMl
@@ -369,7 +369,7 @@
         AZgBEAH/AQYBmAEQAf8BBgGYARAB/wFdAWEBXQHRAxMBGkQAAx0BKQFYAVoBWAG6AVgBWgFYAboBWAFa
         AVgBugFYAVoBWAG6AUsBTAFLAY//ABkAAz8BbQJXAVYBtQJWAVUBrgJXAVYBtQM/AWwoAAJDAUIBdQJj
         AV8B2gJpAWAB6AJlAVwB5wJlAVwB5wJlAVwB5wJlAVwB5wJlAVwB5wJlAVwB5wJqAWEB5gJpAWAB6AJf
-        ASEB+wHUAXgBAAH/AdQBeAEAAf8B1AF4AQAB/wHUAXgBAAH/AoABawH+AmwBYQHrAmoBYQHmAmUBXAHn
+        ASEB+wHUAXgBAAH/AdQBeAEAAf8B1AF4AQAB/wHUAXgBAAH/AoABcwH+AmwBYQHrAmoBYQHmAmUBXAHn
         AmUBXAHnAmUBXAHnAmUBXAHnAmUBXAHnAmUBXAHnAmkBYAHoAmUBXgHiA04BmAMMAQ8kAAI5ATgBXQJX
         AVYBtQJWAVUBrgJXAVUBtANEAXsYAAM/AW0CVwFWAbUCVgFVAa4CVwFWAbUDPwFsQAADOgFgATYBQwH0
         Af8BNgFDAfQB/wE2AUMB9AH/ATYBQwH0Af8BNgFDAfQB/wE2AUMB9AH/ATYBQwH0Af8BNgFDAfQB/wE2
@@ -425,7 +425,7 @@
         AZgBEAH/AQYBmAEQAf8BBgGYARAB/wFdAWEBXQHRAxMBGjAAAw4BEgFVAVYBVQGuAVgBWgFYAboBWAFa
         AVgBugFYAVoBWAG6AVABUQFQAZ0DAwEE/wAVAAM/AWwCWQFWAbYCVgFVAa4CVwFWAbUCQAE/AW4oAAM9
         AWcCYQFdAdECZgFfAeUCYwFbAeQCYwFbAeQCYwFbAeQCYwFbAeQCYwFbAeQCYwFbAeQCYwFbAeQCagFh
-        AeYBfQF3AU0B+gHUAXgBAAH/AdQBeAEAAf8B1AF4AQAB/wHUAXgBAAH/AoABawH+AmMBWgHpAmUBYAHj
+        AeYBfQF3AU0B+gHUAXgBAAH/AdQBeAEAAf8B1AF4AQAB/wHUAXgBAAH/AoABcwH+AmMBWgHpAmUBYAHj
         AmMBWwHkAmMBWwHkAmMBWwHkAmMBWwHkAmMBWwHkAmMBWwHkAmYBXwHlAmQBYAHbA0sBjAMJAQskAAM6
         AWACVwFWAbUCVgFVAa4CVwFWAbUDRAF6GAADPwFsAlkBVgG2AlYBVQGuAlcBVgG1AkABPwFuQAADAwEE
         AlMBVQGqATYBQwH0Af8BNgFDAfQB/wE2AUMB9AH/ATYBQwH0Af8BNgFDAfQB/wE2AUMB9AH/ATYBQwH0

SourceFiles/DarkModeCS.cs

@@ -361,6 +361,12 @@ public void ThemeControl(Control control)
 				//SetRoundBorders(tb, 4, OScolors.SurfaceDark, 1);
 				control.GetType().GetProperty("BorderStyle")?.SetValue(control, BStyle);
 			}
+			if (control is NumericUpDown)
+			{
+				//Mode = IsDarkMode ? "DarkMode_CFD" : "ClearMode_CFD";
+				Mode = IsDarkMode ? "DarkMode_ItemsView" : "ClearMode_ItemsView";
+				SetWindowTheme(control.Handle, Mode, null);
+			}
 			if (control is Button)
 			{
 				var button = control as Button;
@@ -392,7 +398,7 @@ public void ThemeControl(Control control)
 			if (control is GroupBox)
 			{
 				control.GetType().GetProperty("BackColor")?.SetValue(control, control.Parent.BackColor);
-				control.GetType().GetProperty("ForeColor")?.SetValue(control, OScolors.TextInactive);
+				control.GetType().GetProperty("ForeColor")?.SetValue(control, OScolors.TextActive);
 			}
 			if (control is TableLayoutPanel)
 			{
@@ -460,10 +466,36 @@ public void ThemeControl(Control control)
 			if (control is CheckBox)
 			{
 				control.GetType().GetProperty("BackColor")?.SetValue(control, control.Parent.BackColor);
+				control.ForeColor = control.Enabled ? OScolors.TextActive : OScolors.TextInactive;
+				if (!control.Enabled && this.IsDarkMode)
+				{
+					control.Paint += (object sender, PaintEventArgs e) =>
+					{
+
+						var radio = (sender as CheckBox);
+						Brush B = new SolidBrush(control.ForeColor);
+
+						e.Graphics.DrawString(radio.Text, radio.Font,
+							B, new System.Drawing.PointF(17, 1));
+					};
+				}
 			}
 			if (control is RadioButton)
 			{
 				control.GetType().GetProperty("BackColor")?.SetValue(control, control.Parent.BackColor);
+				control.ForeColor = control.Enabled ? OScolors.TextActive : OScolors.TextInactive;
+				if (!control.Enabled && this.IsDarkMode)
+				{
+					control.Paint += (object sender, PaintEventArgs e) =>
+					{
+
+						var radio = (sender as RadioButton);
+						Brush B = new SolidBrush(control.ForeColor);
+
+						e.Graphics.DrawString(radio.Text, radio.Font,
+							B, new System.Drawing.PointF(15, 1));
+					};
+				}				
 			}			
 			if (control is MenuStrip)
 			{
@@ -656,6 +688,8 @@ public void ThemeControl(Control control)
 				// Recursively process its children
 				ThemeControl(childControl);
 			}
+
+
 		}
 
 		/// <summary>Returns Windows Color Mode for Applications.