Win32DisplayWindow: Show window borders in windowed mode

dpjudas · Jan 26, 2025 · 0005689 · 0005689
1 parent 00ad31b
commit 0005689
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Thirdparty/ZWidget/src/window/win32/win32_display_window.cpp b/Thirdparty/ZWidget/src/window/win32/win32_display_window.cpp
@@ -126,11 +126,12 @@ void Win32DisplayWindow::Show()
 void Win32DisplayWindow::ShowFullscreen()
 {
 	HDC screenDC = GetDC(0);
+	DWORD dwStyle = GetWindowLong(WindowHandle.hwnd, GWL_STYLE);
 	int width = GetDeviceCaps(screenDC, HORZRES);
 	int height = GetDeviceCaps(screenDC, VERTRES);
 	ReleaseDC(0, screenDC);
 	SetWindowLongPtr(WindowHandle.hwnd, GWL_EXSTYLE, WS_EX_APPWINDOW);
-	SetWindowLongPtr(WindowHandle.hwnd, GWL_STYLE, WS_OVERLAPPED);
+	SetWindowLongPtr(WindowHandle.hwnd, GWL_STYLE, dwStyle & ~WS_OVERLAPPEDWINDOW);
 	SetWindowPos(WindowHandle.hwnd, HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED | SWP_SHOWWINDOW);
 	Fullscreen = true;
 }
@@ -147,6 +148,7 @@ void Win32DisplayWindow::ShowMinimized()
 
 void Win32DisplayWindow::ShowNormal()
 {
+	SetWindowLongPtr(WindowHandle.hwnd, GWL_STYLE, WS_OVERLAPPEDWINDOW);
 	ShowWindow(WindowHandle.hwnd, SW_NORMAL);
 	Fullscreen = false;
 }