Merge pull request #1690 from 86Box/master

Bring the branch up to par with master.
2021-09-14 22:34:42 +02:00
parent dbdf07aa96 de28a9d836
commit be2005dea4
15 changed files with 538 additions and 440 deletions
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -1094,6 +1094,8 @@ plat_setfullscreen(int on)
 				ResizeWindowByClientArea(hwndMain, temp_x, temp_y);
 			else
 				ResizeWindowByClientArea(hwndMain, temp_x, temp_y + sbar_height);
+
+			SetWindowPos(hwndMain, HWND_TOP, window_x, window_y, 0, 0, SWP_NOSIZE);
 		}

 		/* Render window. */