🐛 Fix window focus handling

john-walks-slow · john-walks-slow · commit 6509baa17436 · 2024-02-28T02:12:40.000+08:00
diff --git a/scripts/toggleWnd.ahk b/scripts/toggleWnd.ahk
@@ -78,9 +78,11 @@ toggleWnd(id, entry := unset) {
       try {
         DetectHiddenWindows(false)
         wndList := WinGetList()
-        topWnd := wndList[wndList.FindIndex((wnd) => WinGetMinMax(wnd) > -1) + 1]
-        WinActivate(topWnd)
         DetectHiddenWindows(true)
+        wndIndex := wndList.FindIndex((wnd) => WinGetMinMax(wnd) > -1, 2)
+        if (wndIndex !== 0) {
+          WinActivate(wndList[wndIndex])
+        }
       }
     }
     ; Handle exit, try to reuse handler
@@ -129,7 +131,7 @@ toggleWnd(id, entry := unset) {
     try {
       if (WinGetMinMax(id) == -1)
         WinRestore(id)
-      ; WinActivate(id)
+      WinActivate(id)
       activatedWnd := id
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,11 @@ toggleWnd(id, entry := unset) {`
`78`	`78`	`try {`
`79`	`79`	`DetectHiddenWindows(false)`
`80`	`80`	`wndList := WinGetList()`
`81`		`- topWnd := wndList[wndList.FindIndex((wnd) => WinGetMinMax(wnd) > -1) + 1]`
`82`		`- WinActivate(topWnd)`
`83`	`81`	`DetectHiddenWindows(true)`
	`82`	`+ wndIndex := wndList.FindIndex((wnd) => WinGetMinMax(wnd) > -1, 2)`
	`83`	`+ if (wndIndex !== 0) {`
	`84`	`+ WinActivate(wndList[wndIndex])`
	`85`	`+ }`
`84`	`86`	`}`
`85`	`87`	`}`
`86`	`88`	`; Handle exit, try to reuse handler`
`@@ -129,7 +131,7 @@ toggleWnd(id, entry := unset) {`
`129`	`131`	`try {`
`130`	`132`	`if (WinGetMinMax(id) == -1)`
`131`	`133`	`WinRestore(id)`
`132`		`- ; WinActivate(id)`
	`134`	`+ WinActivate(id)`
`133`	`135`	`activatedWnd := id`
`134`	`136`	`}`
`135`	`137`	`}`