dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/company_cmd.cpp
#	src/lang/greek.txt
#	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2021-03-02 13:42:11 +00:00
parent fdfd9753d6 c656633bea
commit 84a7ab180e
30 changed files with 307 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/win32_v.cpp
View File

@@ -138,7 +138,7 @@ bool VideoDriver_Win32Base::MakeWindow(bool full_screen)
_fullscreen = full_screen;
/* recreate window? */
if ((full_screen || this->fullscreen) && this->main_wnd) {
if ((full_screen != this->fullscreen) && this->main_wnd) {
DestroyWindow(this->main_wnd);
this->main_wnd = 0;
}
@@ -716,7 +716,9 @@ LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (video_driver->fullscreen) {
if (active && minimized) {
/* Restore the game window */
Dimension d = _bck_resolution; // Save current non-fullscreen window size as it will be overwritten by ShowWindow.
ShowWindow(hwnd, SW_RESTORE);
_bck_resolution = d;
video_driver->MakeWindow(true);
} else if (!active && !minimized) {
/* Minimise the window and restore desktop */