make classic theme fixes and taskbar blending configurable

CHANGES.md

@@ -1,28 +0,0 @@
-# Changes
-Required by license to disclose changes.
-
-## Bar
-* Disabled shebang
-* Icon support
-* Time and date can be combined and clicked on to change between states
-* MusicBee integration via MusicBeeIPC plugin
-* Proper text resizing
-* Clicking items no longer repositions mouse cursor
-* Bar elements no longer have progress element
-* Time has optional binary clock mode
-
-## Config
-* Renamed `Config_readinMemoryUsage` to `Config_readinRam`
-* Added `Config_readinMusic`, only supports MusicBee currently
-* Added `Config_readinTimeBinary` for enabling binary clock
-* Removed `Config_readinDiskLoad` and `Config_readinNetworkLoad`
-* Added `Config_barItemSpacing`, `Config_barIconSpacing` and `Config_iconFontYOffset`
-* Added `Config_barIcons`: `<time>;<date>;<ram>;<cpu>;<battery>;<volume>;<music>`
-* Added `Config_combineDateAndTime`
-
-## ResourceMonitor
-* RAM is now in MB
-* Different CPU load getting functions
-
-## Window
-* Implement [#283](https://github.com/fuhsjr00/bug.n/pull/283)

README.md

@@ -1,3 +1,41 @@
+# ct"wm" (Cyn's tiling "window manager") (working title)
+Personal fork of bug.n
+
+## Changes
+
+### Bar
+* Disabled shebang
+* Icon support
+* Time and date can be combined and clicked on to change between states
+* MusicBee integration via MusicBeeIPC plugin
+* Proper text resizing
+* Clicking items no longer repositions mouse cursor
+* Bar elements no longer have progress element
+* Time has optional binary clock mode
+* `Config_verticalBarPos` set to `tray` now attaches itself to first toolbar window
+  * This needs to be reworked, and the rest of the bar needs to be split to a second toolbar
+* `Config_verticalBarPos` set to `tray` will set styles on the taskbar (temporary hybrid classic theme workaround)
+
+### Config
+* Renamed `Config_readinMemoryUsage` to `Config_readinRam`
+* Added `Config_readinMusic`, only supports MusicBee currently
+* Added `Config_readinTimeBinary` for enabling binary clock
+* Removed `Config_readinDiskLoad` and `Config_readinNetworkLoad`
+* Added `Config_barItemSpacing`, `Config_barIconSpacing` and `Config_iconFontYOffset`
+* Added `Config_barIcons`: `<time>;<date>;<ram>;<cpu>;<battery>;<volume>;<music>`
+* Added `Config_combineDateAndTime`
+* Added `Config_readinTitle`
+
+### ResourceMonitor
+* RAM is now in MB
+* Different CPU load getting functions
+
+### Window
+* Implement [GH-283](https://github.com/fuhsjr00/bug.n/pull/283)
+
+<details>
+  <summary><h2>bug.n README</h2></summary>
+
 ## bug.n &ndash; Tiling Window Management
 
 bug.n is a
@@ -94,3 +132,4 @@ Currently, there are two branches:
 
 * `master`, the current stable version (v9), which is no longer actively developed or maintained;
 * `X`, a development version (v10), which is a rewrite of bug.n and in alpha stage, but development is dormant.
+</details>

src/Bar.ahk

@@ -167,17 +167,22 @@ Bar_init(m) {
   Bar_appBarData := ""
   If (Config_verticalBarPos = "tray" And Monitor_#%m%_taskBarClass) {
     trayWndId := WinExist("ahk_class " Monitor_#%m%_taskBarClass)
+
+    ; FIXME: find a specific ReBarWindow32 named a certain thing instead of first one
     ControlGet, ToolbarRoot, Hwnd, , ReBarWindow321, ahk_id %trayWndId%
     ControlGet, Toolbar, Hwnd, , ToolbarWindow321, ahk_id %ToolbarRoot%
     DllCall("SetParent", "UInt", wndId, "UInt", Toolbar)
-    ;Gui, Color, 000000, %wndTitle%
+    If (Config_barTaskbarBlend)
+      Gui, Color, 000000, %wndTitle%
 
-    WinSet, Style, -0x40000, ahk_id %trayWndId% ; WS_THICKFRAME
+    If (Config_classicThemeFixes) {
-    WinSet, Style, +0x80, ahk_id %trayWndId% ; DS_MODALFRAME
+      WinSet, Style, -0x40000, ahk_id %trayWndId% ; WS_THICKFRAME
-    WinSet, Style, +0x0004, ahk_id %trayWndId% ; DS_3DLOOK
+      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, +0x1, ahk_id %trayWndId% ; WS_EX_DLGMODALFRAME
-    WinSet, ExStyle, +0x20000, ahk_id %trayWndId% ; WS_EX_STATICEDGE
+      WinSet, ExStyle, +0x20000, ahk_id %trayWndId% ; WS_EX_STATICEDGE
+    }
   } Else {
     appBarMsg := DllCall("RegisterWindowMessage", Str, "AppBarMsg")
 
@@ -305,8 +310,10 @@ Bar_getHeight()
     If Not Config_singleRowBar
       Bar_ctrlHeight := Bar_height / 2
 
-    Bar_height := 22
+    If (Config_classicThemeFixes) {
-    Bar_ctrlHeight := 22
+      Bar_height := 22
+      Bar_ctrlHeight := 22
+    }
   }
 }
 
@@ -725,7 +732,8 @@ Bar_updateStatus() {
       statusWidth -= Config_barItemSpacing
     }
 
-    If (Config_verticalBarPos = "tray" And Monitor_#%m%_taskBarClass) {
+    ; 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

src/Config.ahk

@@ -33,6 +33,7 @@ Config_init() {
   }
   Config_barTransparency   := "off"
   Config_barCommands       := "Run, explore " Main_docDir ";Monitor_toggleBar();Reload;ExitApp"
+  Config_barTaskbarBlend   := False
   Config_readinBat         := False
   Config_readinCpu         := False
   Config_readinDate        := True
@@ -50,15 +51,16 @@ Config_init() {
   Config_iconFontYOffset   := 3
 
   ;; Windows ui elements
-  Config_bbCompatibility := False
+  Config_bbCompatibility   := False
-  Config_borderWidth     := 0
+  Config_borderWidth       := 0
-  Config_borderPadding   := -1
+  Config_borderPadding     := -1
-  Config_showTaskBar     := False
+  Config_showTaskBar       := False
-  Config_showBorder      := True
+  Config_showBorder        := True
-  Config_selBorderColor  := ""
+  Config_selBorderColor    := ""
-  Config_scalingFactor   := 1   ;; Undocumented. The value is retrieved by `Config_getSystemSettings()` from the registry.
+  Config_scalingFactor     := 1   ;; Undocumented. The value is retrieved by `Config_getSystemSettings()` from the registry.
-                                ;; It should not be set manually by the user,
+                                  ;; 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`.
+                                  ;; but is dependant on the setting in the `Display control panel` of Windows under `Appearance and Personalization`.
+  Config_classicThemeFixes := False
 
   ;; Window arrangement
   Config_viewNames          := "1;2;3;4;5;6;7;8;9"

src/Main.ahk

@@ -182,13 +182,6 @@ Main_toggleBar:
   Monitor_toggleBar()
 Return
 
-Main_delevatedRun(Args) {
-  MsgBox %A_UserName%
-  RunAs, %A_UserName%
-  Run, %Args%
-  RunAs
-}
-
 #Include Bar.ahk
 #Include Config.ahk
 #Include Debug.ahk