fix forced z index (fix #80)

blurfx · Apr 19, 2024 · c1d8534 · c1d8534
1 parent 6607e58
commit c1d8534
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/internal/ad.go b/internal/ad.go
@@ -41,12 +41,12 @@ func HideMainWindowAd(windowClass string, handle windows.HWND) {
 	// @deprecated
 	if windowClass == "BannerAdWnd" {
 		winapi.ShowWindow(handle, 0)
-		winapi.SetWindowPos(handle, 0, 0, 0, 0, 0, winapi.SwpNomove)
+		winapi.MoveWindow(handle, 0, 0, 0, 0, true)
 	}
 	if windowClass == "BannerAdContainer" {
 		parentHandle := winapi.GetParent(handle)
 		winapi.ShowWindow(parentHandle, 0)
-		winapi.SetWindowPos(parentHandle, 0, 0, 0, 0, 0, winapi.SwpNomove)
+		winapi.MoveWindow(parentHandle, 0, 0, 0, 0, true)
 	}
 }
 

diff --git a/internal/app.go b/internal/app.go
@@ -110,7 +110,7 @@ func removeAd() {
 				for _, candidate := range candidates {
 					if candidate[1] == mainWindowParentHandle {
 						winapi.ShowWindow(candidate[0], 0)
-						winapi.SetWindowPos(candidate[0], 0, 0, 0, 0, 0, winapi.SwpNomove)
+						winapi.MoveWindow(candidate[0], 0, 0, 0, 0, true)
 						break
 					}
 				}

diff --git a/internal/win/winapi/user32.go b/internal/win/winapi/user32.go
@@ -33,6 +33,7 @@ var (
 	defWindowProc            = user32.NewProc("DefWindowProcW")
 	registerClassEx          = user32.NewProc("RegisterClassExW")
 	createWindowEx           = user32.NewProc("CreateWindowExW")
+	moveWindow               = user32.NewProc("MoveWindow")
 )
 
 func cStr(str string) uintptr {
@@ -167,3 +168,19 @@ func LoadIcon(instance uintptr, iconName *uint16) (uintptr, error) {
 	}
 	return ret, nil
 }
+
+func MoveWindow(hWnd windows.HWND, x, y, width, height int32, repaint bool) bool {
+	shouldRepaint := 0
+	if repaint {
+		shouldRepaint = 1
+	}
+	r, _, _ := moveWindow.Call(
+		uintptr(hWnd),
+		uintptr(x),
+		uintptr(y),
+		uintptr(width),
+		uintptr(height),
+		uintptr(shouldRepaint),
+	)
+	return r != 0
+}