mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-13 02:52:37 +00:00
(svn r7672) -Backport from trunk (r7562):
- [win32] OpenTTD didn't always remember its maximized state on restart.
This commit is contained in:
parent
f3424f51bc
commit
6fa93f4a7a
@ -564,17 +564,18 @@ static void MakeWindow(bool full_screen)
|
|||||||
|
|
||||||
{
|
{
|
||||||
RECT r;
|
RECT r;
|
||||||
uint style;
|
DWORD style, showstyle;
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
|
|
||||||
|
showstyle = SW_SHOWNORMAL;
|
||||||
_wnd.fullscreen = full_screen;
|
_wnd.fullscreen = full_screen;
|
||||||
if (_wnd.fullscreen) {
|
if (_wnd.fullscreen) {
|
||||||
style = WS_POPUP | WS_VISIBLE;
|
style = WS_POPUP;
|
||||||
SetRect(&r, 0, 0, _wnd.width_org, _wnd.height_org);
|
SetRect(&r, 0, 0, _wnd.width_org, _wnd.height_org);
|
||||||
} else {
|
} else {
|
||||||
style = WS_OVERLAPPEDWINDOW | WS_VISIBLE;
|
style = WS_OVERLAPPEDWINDOW;
|
||||||
/* On window creation, check if we were in maximize mode before */
|
/* On window creation, check if we were in maximize mode before */
|
||||||
if (_window_maximize) style |= WS_MAXIMIZE;
|
if (_window_maximize) showstyle = SW_SHOWMAXIMIZED;
|
||||||
SetRect(&r, 0, 0, _wnd.width, _wnd.height);
|
SetRect(&r, 0, 0, _wnd.width, _wnd.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -595,6 +596,7 @@ static void MakeWindow(bool full_screen)
|
|||||||
|
|
||||||
_wnd.main_wnd = CreateWindow(_T("OTTD"), Windowtitle, style, x, y, w, h, 0, 0, GetModuleHandle(NULL), 0);
|
_wnd.main_wnd = CreateWindow(_T("OTTD"), Windowtitle, style, x, y, w, h, 0, 0, GetModuleHandle(NULL), 0);
|
||||||
if (_wnd.main_wnd == NULL) error("CreateWindow failed");
|
if (_wnd.main_wnd == NULL) error("CreateWindow failed");
|
||||||
|
ShowWindow(_wnd.main_wnd, showstyle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
GameSizeChanged(); // invalidate all windows, force redraw
|
GameSizeChanged(); // invalidate all windows, force redraw
|
||||||
|
Loading…
Reference in New Issue
Block a user