claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Properly reverted all the win.c changes now.

Browse Source
This commit is contained in:
OBattler
2017-06-11 20:57:34 +02:00
parent 6588797139
commit cd4eb393f1
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/WIN/win.c
View File

@@ -232,7 +232,7 @@ void updatewindowsize(int x, int y)
if ((owsx != winsizex) || (owsy != winsizey)) if ((owsx != winsizex) || (owsy != winsizey))
{ {
win_doresize = 1; win_doresize = 1;
} }
else else
{ {
@@ -326,14 +326,6 @@ void mainthread(LPVOID param)
winsizey + (GetSystemMetrics(SM_CYEDGE) * 2) + (GetSystemMetrics(vid_resize ? SM_CYSIZEFRAME : SM_CYFIXEDFRAME) * 2) + GetSystemMetrics(SM_CYMENUSIZE) + GetSystemMetrics(SM_CYCAPTION) + 17 + sb_borders[1] + 1, winsizey + (GetSystemMetrics(SM_CYEDGE) * 2) + (GetSystemMetrics(vid_resize ? SM_CYSIZEFRAME : SM_CYFIXEDFRAME) * 2) + GetSystemMetrics(SM_CYMENUSIZE) + GetSystemMetrics(SM_CYCAPTION) + 17 + sb_borders[1] + 1,
TRUE); TRUE);
if (vid_apis[video_fullscreen][vid_api].resize)
{
startblit();
video_wait_for_blit();
vid_apis[video_fullscreen][vid_api].resize(winsizex, winsizey);
endblit();
}
if (mousecapture) if (mousecapture)
{ {
GetWindowRect(hwndRender, &r); GetWindowRect(hwndRender, &r);
@@ -1883,7 +1875,6 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
case IDM_VID_DDRAW: case IDM_VID_DDRAW:
case IDM_VID_D3D: case IDM_VID_D3D:
pause = 1;
startblit(); startblit();
video_wait_for_blit(); video_wait_for_blit();
CheckMenuItem(hmenu, IDM_VID_DDRAW + vid_api, MF_UNCHECKED); CheckMenuItem(hmenu, IDM_VID_DDRAW + vid_api, MF_UNCHECKED);
@@ -1894,7 +1885,6 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
endblit(); endblit();
saveconfig(); saveconfig();
device_force_redraw(); device_force_redraw();
pause = 0;
break; break;
case IDM_VID_FULLSCREEN: case IDM_VID_FULLSCREEN:
@@ -1906,19 +1896,17 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
msgbox_info(ghwnd, IDS_2193); msgbox_info(ghwnd, IDS_2193);
} }
pause = 1;
startblit(); startblit();
video_wait_for_blit(); video_wait_for_blit();
mouse_close(); mouse_close();
vid_apis[0][vid_api].close(); vid_apis[0][vid_api].close();
video_fullscreen = 1; video_fullscreen = 1;
vid_apis[1][vid_api].init(ghwnd); vid_apis[1][vid_api].init(ghwnd);
endblit();
mouse_init(); mouse_init();
leave_fullscreen_flag = 0; leave_fullscreen_flag = 0;
endblit();
saveconfig(); saveconfig();
device_force_redraw(); device_force_redraw();
pause = 0;
} }
break; break;
@@ -2165,9 +2153,6 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
break; break;
case WM_SIZE: case WM_SIZE:
MoveWindow(hwndStatus, 0, winsizey + 6, winsizex, 17, TRUE);
break;
winsizex = (lParam & 0xFFFF); winsizex = (lParam & 0xFFFF);
winsizey = (lParam >> 16) - (17 + 6); winsizey = (lParam >> 16) - (17 + 6);