Update WindowManager.ahk

Author: Ven0m0

Lib/v2/WindowManager.ahk

@@ -1,74 +1,35 @@
 #Requires AutoHotkey v2.0
 
-; ============================================================================
-; WindowManager.ahk - Window manipulation and fullscreen utilities
-; Version: 2.0.0 (Migrated to AHK v2)
-; ============================================================================
+; WindowManager – borderless/fullscreen utilities
 
-; ============================================================================
-; ToggleFakeFullscreen(winTitle := "A") - Toggle borderless fullscreen
-; Removes/restores window decorations and maximizes to simulate fullscreen
-;
-; Parameters:
-;   winTitle - Window to affect (default: active window)
-; ============================================================================
-ToggleFakeFullscreen(winTitle := "A") {
-    ; Check if window is currently in fake fullscreen by checking for titlebar
-    currentStyle := WinGetStyle(winTitle)
-    hasTitleBar := currentStyle & 0xC00000
-
-    if (hasTitleBar) {
-        ; Enter fake fullscreen - remove window decorations (combined: 0xC00000 | 0x800000 | 0x400000 | 0x40000 = 0xEC0000)
-        WinSetStyle(-0xEC0000, winTitle)  ; Remove all decorations in single operation
+static STYLE_DECORATIONS := 0xEC0000      ; title/menu/frame/sysmodal combined
+static STYLE_UNDECORATED := -0xEC0000
 
-        ; Maximize the window
+ToggleFakeFullscreen(winTitle := "A") {
+    current := WinGetStyle(winTitle)
+    hasTitle := current & 0xC00000
+    if hasTitle {
+        WinSetStyle(STYLE_UNDECORATED, winTitle)
         WinMove(0, 0, A_ScreenWidth, A_ScreenHeight, winTitle)
     } else {
-        ; Exit fake fullscreen - restore window decorations (combined)
-        WinSetStyle(0xEC0000, winTitle)  ; Restore all decorations in single operation
-
-        ; Restore window to non-maximized state
+        WinSetStyle(STYLE_DECORATIONS, winTitle)
         WinRestore(winTitle)
     }
 }
 
-; ============================================================================
-; SetWindowBorderless(winTitle) - Remove window borders and decorations
-; Parameters:
-;   winTitle - Window to affect
-; ============================================================================
 SetWindowBorderless(winTitle) {
-    ; Remove all decorations in single operation (0xC00000 | 0x800000 | 0x400000 | 0x40000 = 0xEC0000)
-    WinSetStyle(-0xEC0000, winTitle)
+    WinSetStyle(STYLE_UNDECORATED, winTitle)
 }
 
-; ============================================================================
-; MaximizeWindow(winTitle) - Maximize window to full screen size
-; Parameters:
-;   winTitle - Window to affect
-; ============================================================================
 MaximizeWindow(winTitle) {
     WinMove(0, 0, A_ScreenWidth, A_ScreenHeight, winTitle)
 }
 
-; ============================================================================
-; MakeFullscreen(winTitle) - Combine borderless + maximize
-; Parameters:
-;   winTitle - Window to affect
-; ============================================================================
 MakeFullscreen(winTitle) {
     SetWindowBorderless(winTitle)
     MaximizeWindow(winTitle)
 }
 
-; ============================================================================
-; WaitForWindow(winTitle, timeout := 30) - Wait for window with timeout
-; Returns: true if window found, false if timeout
-;
-; Parameters:
-;   winTitle - Window to wait for
-;   timeout  - Timeout in seconds (default: 30 seconds)
-; ============================================================================
 WaitForWindow(winTitle, timeout := 30) {
     try {
         WinWait(winTitle, , timeout)
@@ -78,89 +39,56 @@ WaitForWindow(winTitle, timeout := 30) {
     }
 }
 
-; ============================================================================
-; WaitForProcess(processName, timeout := 30) - Wait for process with timeout
-; Returns: true if process found, false if timeout
-;
-; Parameters:
-;   processName - Process to wait for (e.g., "notepad.exe")
-;   timeout     - Timeout in seconds (default: 30 seconds)
-; ============================================================================
 WaitForProcess(processName, timeout := 30) {
-    startTime := A_TickCount
-    timeoutMs := timeout * 1000
-
-    while (!ProcessExist(processName)) {
-        if (A_TickCount - startTime > timeoutMs)
+    start := A_TickCount
+    limit := timeout * 1000
+    while !ProcessExist(processName) {
+        if (A_TickCount - start > limit)
             return false
-
         Sleep(100)
     }
-
     return true
 }
 
-; ============================================================================
-; Multi-monitor aware fullscreen functions
-; ============================================================================
-
 GetMonitorAtPos(x, y) {
-    ; Monitor number at position x,y or -1 if x,y outside monitors
-    monitorCount := MonitorGetCount()
-
-    Loop monitorCount {
-        MonitorGet(A_Index, &areaLeft, &areaTop, &areaRight, &areaBottom)
-        if (areaLeft <= x && x <= areaRight && areaTop <= y && y <= areaBottom)
+    count := MonitorGetCount()
+    Loop count {
+        MonitorGet(A_Index, &l, &t, &r, &b)
+        if (l <= x && x <= r && t <= y && y <= b)
             return A_Index
     }
     return -1
 }
 
 GetMonitorActiveWindow(winTitle := "A") {
-    ; Get Monitor number at the center position of the specified window
-    WinGetPos(&x, &y, &width, &height, winTitle)
-    return GetMonitorAtPos(x + width/2, y + height/2)
+    WinGetPos(&x, &y, &w, &h, winTitle)
+    return GetMonitorAtPos(x + w/2, y + h/2)
 }
 
 ToggleFakeFullscreenMultiMonitor(winTitle := "A") {
-    ; Toggle borderless fullscreen with multi-monitor support
-    static WINDOW_STYLE_UNDECORATED := -0xC40000
-    static savedInfo := Map()
-
+    static saved := Map()
     id := WinGetID(winTitle)
 
-    if (savedInfo.Has(id)) {
-        ; Restore saved window state
-        inf := savedInfo[id]
-        WinSetStyle(inf["style"], "ahk_id " . id)
-        WinMove(inf["x"], inf["y"], inf["width"], inf["height"], "ahk_id " . id)
-        savedInfo.Delete(id)
-    } else {
-        ; Save current state and make fullscreen
-        inf := Map()
-        inf["style"] := WinGetStyle(winTitle)
-        WinGetPos(&ltmpX, &ltmpY, &ltmpWidth, &ltmpHeight, "ahk_id " . id)
-        inf["x"] := ltmpX
-        inf["y"] := ltmpY
-        inf["width"] := ltmpWidth
-        inf["height"] := ltmpHeight
-        savedInfo[id] := inf
+    if saved.Has(id) {
+        inf := saved[id]
+        WinSetStyle(inf.style, "ahk_id " . id)
+        WinMove(inf.x, inf.y, inf.w, inf.h, "ahk_id " . id)
+        saved.Delete(id)
+        return
+    }
 
-        WinSetStyle(WINDOW_STYLE_UNDECORATED, "ahk_id " . id)
+    inf := Map()
+    inf.style := WinGetStyle(winTitle)
+    WinGetPos(&ix, &iy, &iw, &ih, "ahk_id " . id)
+    inf.x := ix, inf.y := iy, inf.w := iw, inf.h := ih
+    saved[id] := inf
 
-        ; Get the monitor where window is currently located
-        mon := GetMonitorActiveWindow("ahk_id " . id)
-        MonitorGet(mon, &monLeft, &monTop, &monRight, &monBottom)
-        WinMove(monLeft, monTop, monRight - monLeft, monBottom - monTop, winTitle)
-    }
+    WinSetStyle(STYLE_UNDECORATED, "ahk_id " . id)
+    mon := GetMonitorActiveWindow("ahk_id " . id)
+    MonitorGet(mon, &ml, &mt, &mr, &mb)
+    WinMove(ml, mt, mr - ml, mb - mt, winTitle)
 }
 
-; ============================================================================
-; RestoreWindowBorders(winTitle) - Restore standard window decorations
-; Parameters:
-;   winTitle - Window to affect
-; ============================================================================
 RestoreWindowBorders(winTitle) {
-    ; Restore all decorations in single operation (0xC00000 | 0x800000 | 0x400000 | 0x40000 = 0xEC0000)
-    WinSetStyle(0xEC0000, winTitle)
+    WinSetStyle(STYLE_DECORATIONS, winTitle)
 }