mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r10400) [0.5] -Backport from trunk (r10399): 

- Fix: [Windows] _wnd.has_focus was not properly set after using ALT-TAB [FS#962] (r10399)
This commit is contained in:
glx 2007-06-30 15:13:55 +00:00
parent b0e8d229ee
commit b83f6733ca
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
video/win32_v.c
View File

@ -24,7 +24,6 @@ static struct {
int height;
int width_org;
int height_org;
bool minimized;
bool fullscreen;
bool double_size;
bool has_focus;
@ -512,8 +511,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
break;
case WM_SIZE:
_wnd.minimized = (wParam == SIZE_MINIMIZED);
if (!_wnd.minimized) {
if (wParam != SIZE_MINIMIZED) {
/* 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));
@ -611,23 +609,34 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
return 0;
}
case WM_ACTIVATEAPP:
_wnd.has_focus = (wParam != 0);
case WM_SETFOCUS:
_wnd.has_focus = true;
break;
case WM_KILLFOCUS:
_wnd.has_focus = false;
break;
#if !defined(WINCE)
case WM_ACTIVATE: {
bool active = (LOWORD(wParam) != WA_INACTIVE);
bool minimized = (HIWORD(wParam) != 0);
if (_wnd.fullscreen) {
if (_wnd.has_focus && _wnd.minimized) {
if (active && minimized) {
/* Restore the game window */
ShowWindow(hwnd, SW_RESTORE);
MakeWindow(true);
} else if (!_wnd.has_focus && !_wnd.minimized) {
} else if (!active && !minimized) {
/* Minimise the window and restore desktop */
ShowWindow(hwnd, SW_MINIMIZE);
ChangeDisplaySettings(NULL, 0);
}
}
#endif
break;
}
}
#endif
return DefWindowProc(hwnd, msg, wParam, lParam);
}