80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge remote-tracking branch 'origin/master' into feature/machine_and_kb

Browse Source
This commit is contained in:
OBattler
2021-09-18 00:03:41 +02:00
parent 6d6e5f9e67 065b8cc0c3
commit 105c0389c2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/win/win.c
View File

@@ -1090,12 +1090,13 @@ plat_setfullscreen(int on)
}
/* Main Window. */
if (vid_resize >= 2)
MoveWindow(hwndMain, window_x, window_y, window_w, window_h, TRUE);
if (hide_status_bar)
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. */

5
src/win/win_ui.c
View File

@@ -980,7 +980,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
video_force_resize_set(1);
}
if (window_remember || (vid_resize & 2)) {
if (!(pos->flags & SWP_NOSIZE) && (window_remember || (vid_resize & 2))) {
window_x = pos->x;
window_y = pos->y;
if (!(vid_resize & 2)) {
@@ -1379,6 +1379,7 @@ ui_init(int nCmdShow)
MoveWindow(hwnd, window_x, window_y, window_w, window_h, TRUE);
else {
if (vid_resize >= 2) {
MoveWindow(hwnd, window_x, window_y, window_w, window_h, TRUE);
scrnsz_x = fixed_size_x;
scrnsz_y = fixed_size_y;
}
@@ -1386,8 +1387,6 @@ ui_init(int nCmdShow)
ResizeWindowByClientArea(hwndMain, scrnsz_x, scrnsz_y);
else
ResizeWindowByClientArea(hwndMain, scrnsz_x, scrnsz_y + sbar_height);
SetWindowPos(hwndMain, HWND_TOP, window_x, window_y, 0, 0, SWP_NOSIZE);
}
/* Reset all menus to their defaults. */