Have Theme Take Priority

rcmaehl · Jul 11, 2021 · 5252e01 · 5252e01
1 parent 1843260
commit 5252e01
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ WhyNot.txt
 WhyNotWin11_stripped.au3
 del.au3
 Config/config.st
+theme.def
diff --git a/ExampleTheme.def b/ExampleTheme.def
@@ -1,5 +1,6 @@
+#Rename file to theme.def
 [Colors]
-Background=
-Text=
-Sidebar=
-Footer=
+Background=0xFFFFFF
+Text=0x000000
+Sidebar=0xF7A8B8
+Footer=0x55CDFC
diff --git a/includes/_Theming.au3 b/includes/_Theming.au3
@@ -104,6 +104,11 @@ Func _SetTheme()
 	$aColors[3] = 0xF2F2F2 ; Footer
 
 	Select
+		Case FileExists(@ScriptDir & "\theme.def")
+			$aColors[0] = IniRead(@ScriptDir & "\theme.def", "Colors", "Background", $aColors[0])
+			$aColors[1] = IniRead(@ScriptDir & "\theme.def", "Colors", "Text", $aColors[1])
+			$aColors[2] = IniRead(@ScriptDir & "\theme.def", "Colors", "Sidebar", $aColors[2])
+			$aColors[3] = IniRead(@ScriptDir & "\theme.def", "Colors", "Footer", $aColors[3])
 		Case $dWindow = 0x000000
 			ContinueCase
 		Case $dWindow = 0xFFFFFF And Not $bLTheme
@@ -118,11 +123,6 @@ Func _SetTheme()
 			$aColors[3] = $dWindow + 0xF2F2F3
 		Case $bLTheme
 			;;;
-		Case FileExists(@ScriptDir & "\theme.def")
-			$aColors[0] = IniRead(@ScriptDir & "\theme.def", "Colors", "Background", $aColors[0])
-			$aColors[1] = IniRead(@ScriptDir & "\theme.def", "Colors", "Text", $aColors[1])
-			$aColors[2] = IniRead(@ScriptDir & "\theme.def", "Colors", "Sidebar", $aColors[2])
-			$aColors[3] = IniRead(@ScriptDir & "\theme.def", "Colors", "Footer", $aColors[3])
 		Case Else
 			;;;
 	EndSelect