From 1ab9e0a01ade0fa8539c66a5555f83715f8178fe Mon Sep 17 00:00:00 2001
From: Cynthia Foxwell <gamers@riseup.net>
Date: Sat, 4 Mar 2023 12:26:23 -0700
Subject: [PATCH] revert, make its own config var

---
 src/Bar.ahk    | 30 +++++++++++++++---------------
 src/Config.ahk | 17 +++++++++--------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/Bar.ahk b/src/Bar.ahk
index a7d122a..4452d72 100644
--- a/src/Bar.ahk
+++ b/src/Bar.ahk
@@ -176,14 +176,14 @@ Bar_init(m) {
       Gui, Color, 000000, %wndTitle%
     }
 
-    ;If (Config_classicThemeFixes) {
-    ;  WinSet, Style, -0x40000, ahk_id %trayWndId% ; WS_THICKFRAME
-    ;  WinSet, Style, +0x80, ahk_id %trayWndId% ; DS_MODALFRAME
-    ;  WinSet, Style, +0x0004, ahk_id %trayWndId% ; DS_3DLOOK
+    If (Config_classicThemeTaskbar) {
+      WinSet, Style, -0x40000, ahk_id %trayWndId% ; WS_THICKFRAME
+      WinSet, Style, +0x80, ahk_id %trayWndId% ; DS_MODALFRAME
+      WinSet, Style, +0x0004, ahk_id %trayWndId% ; DS_3DLOOK
 
-    ;  WinSet, ExStyle, +0x1, ahk_id %trayWndId% ; WS_EX_DLGMODALFRAME
-    ;  WinSet, ExStyle, +0x20000, ahk_id %trayWndId% ; WS_EX_STATICEDGE
-    ;}
+      WinSet, ExStyle, +0x1, ahk_id %trayWndId% ; WS_EX_DLGMODALFRAME
+      WinSet, ExStyle, +0x20000, ahk_id %trayWndId% ; WS_EX_STATICEDGE
+    }
   } Else {
     appBarMsg := DllCall("RegisterWindowMessage", Str, "AppBarMsg")
 
@@ -734,15 +734,15 @@ Bar_updateStatus() {
     }
 
     ; set this in update loop because OpenShell likes to revert it when you change settings
-    ;If (Config_verticalBarPos = "tray" And Monitor_#%m%_taskBarClass And Config_classicThemeFixes) {
-    ;  trayWndId := WinExist("ahk_class " Monitor_#%m%_taskBarClass)
-    ;  WinSet, Style, -0x40000, ahk_id %trayWndId% ; WS_THICKFRAME
-    ;  WinSet, Style, +0x80, ahk_id %trayWndId% ; DS_MODALFRAME
-    ;  WinSet, Style, +0x0004, ahk_id %trayWndId% ; DS_3DLOOK
+    If (Config_verticalBarPos = "tray" And Monitor_#%m%_taskBarClass And Config_classicThemeTaskbar) {
+      trayWndId := WinExist("ahk_class " Monitor_#%m%_taskBarClass)
+      WinSet, Style, -0x40000, ahk_id %trayWndId% ; WS_THICKFRAME
+      WinSet, Style, +0x80, ahk_id %trayWndId% ; DS_MODALFRAME
+      WinSet, Style, +0x0004, ahk_id %trayWndId% ; DS_3DLOOK
 
-    ;  WinSet, ExStyle, +0x1, ahk_id %trayWndId% ; WS_EX_DLGMODALFRAME
-    ;  WinSet, ExStyle, +0x20000, ahk_id %trayWndId% ; WS_EX_STATICEDGE
-    ;}
+      WinSet, ExStyle, +0x1, ahk_id %trayWndId% ; WS_EX_DLGMODALFRAME
+      WinSet, ExStyle, +0x20000, ahk_id %trayWndId% ; WS_EX_STATICEDGE
+    }
   }
 }
 
diff --git a/src/Config.ahk b/src/Config.ahk
index 141dbe4..80e9d3d 100644
--- a/src/Config.ahk
+++ b/src/Config.ahk
@@ -51,16 +51,17 @@ Config_init() {
   Config_iconFontYOffset   := 3
 
   ;; Windows ui elements
-  Config_bbCompatibility   := False
-  Config_borderWidth       := 0
-  Config_borderPadding     := -1
-  Config_showTaskBar       := False
-  Config_showBorder        := True
-  Config_selBorderColor    := ""
-  Config_scalingFactor     := 1   ;; Undocumented. The value is retrieved by `Config_getSystemSettings()` from the registry.
+  Config_bbCompatibility     := False
+  Config_borderWidth         := 0
+  Config_borderPadding       := -1
+  Config_showTaskBar         := False
+  Config_showBorder          := True
+  Config_selBorderColor      := ""
+  Config_scalingFactor       := 1   ;; Undocumented. The value is retrieved by `Config_getSystemSettings()` from the registry.
                                   ;; It should not be set manually by the user,
                                   ;; but is dependant on the setting in the `Display control panel` of Windows under `Appearance and Personalization`.
-  Config_classicThemeFixes := False
+  Config_classicThemeFixes   := False
+  Config_classicThemeTaskbar := False
 
   ;; Window arrangement
   Config_viewNames          := "1;2;3;4;5;6;7;8;9"