From 353fd97de6d649440d01f1682ee5580e19d32768 Mon Sep 17 00:00:00 2001 From: truebrain Date: Mon, 30 Apr 2012 16:49:26 +0000 Subject: (svn r24189) -Fix: when going to fullscreen and back, restore to the resolution you were, not to the fullscreen resolution (Windows only) --- src/video/win32_v.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index d83395795..df7510084 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -296,6 +296,9 @@ bool VideoDriver_Win32::MakeWindow(bool full_screen) } else if (_wnd.fullscreen) { /* restore display? */ ChangeDisplaySettings(NULL, 0); + /* restore the resolution */ + _wnd.width = _bck_resolution.width; + _wnd.height = _bck_resolution.height; } #endif @@ -628,7 +631,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP /* Set maximized flag when we maximize (obviously), but also when we * switched to fullscreen from a maximized state */ _window_maximize = (wParam == SIZE_MAXIMIZED || (_window_maximize && _fullscreen)); - if (_window_maximize) _bck_resolution = _cur_resolution; + if (_window_maximize || _fullscreen) _bck_resolution = _cur_resolution; ClientSizeChanged(LOWORD(lParam), HIWORD(lParam)); } return 0; -- cgit v1.2.3-54-g00ecf