From 1c81724171347e3bb27746e93e430519825090a2 Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Sat, 4 Mar 2023 12:19:18 -0700 Subject: [PATCH] disable styling workaround added basicthemer2 reimpl to classic theme windhawk mod to get classic theme titlebars working --- src/Bar.ahk | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Bar.ahk b/src/Bar.ahk index 65ddd7f..a7d122a 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_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 - 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_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 - 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 + ;} } }