gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: don't set the window position when changing blitter

Browse Source 
There really is no need to make an extra call to the OS in
these cases.
This commit is contained in:
Michael Lutz 2021-03-08 13:48:32 +01:00 committed by Patric Stout
parent b9eac7c6dc
commit 3a4a15cc93
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/video/win32_v.cpp
View File

@ -128,9 +128,10 @@ uint8 VideoDriver_Win32Base::GetFullscreenBpp()
/** /**
* Instantiate a new window. * Instantiate a new window.
* @param full_screen Whether to make a full screen window or not. * @param full_screen Whether to make a full screen window or not.
* @param resize Whether to change window size.
* @return True if the window could be created. * @return True if the window could be created.
*/ */
bool VideoDriver_Win32Base::MakeWindow(bool full_screen) bool VideoDriver_Win32Base::MakeWindow(bool full_screen, bool resize)
{ {
/* full_screen is whether the new window should be fullscreen, /* full_screen is whether the new window should be fullscreen,
* _wnd.fullscreen is whether the current window is. */ * _wnd.fullscreen is whether the current window is. */
@ -172,7 +173,7 @@ bool VideoDriver_Win32Base::MakeWindow(bool full_screen)
} }
if (ChangeDisplaySettings(&settings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) { if (ChangeDisplaySettings(&settings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) {
this->MakeWindow(false); // don't care about the result this->MakeWindow(false, resize); // don't care about the result
return false; // the request failed return false; // the request failed
} }
} else if (this->fullscreen) { } else if (this->fullscreen) {
@ -205,7 +206,7 @@ bool VideoDriver_Win32Base::MakeWindow(bool full_screen)
h = r.bottom - r.top; h = r.bottom - r.top;
if (this->main_wnd != nullptr) { if (this->main_wnd != nullptr) {
if (!_window_maximize) SetWindowPos(this->main_wnd, 0, 0, 0, w, h, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE); if (!_window_maximize && resize) SetWindowPos(this->main_wnd, 0, 0, 0, w, h, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE);
} else { } else {
int x = (GetSystemMetrics(SM_CXSCREEN) - w) / 2; int x = (GetSystemMetrics(SM_CXSCREEN) - w) / 2;
int y = (GetSystemMetrics(SM_CYSCREEN) - h) / 2; int y = (GetSystemMetrics(SM_CYSCREEN) - h) / 2;
@ -1043,7 +1044,7 @@ bool VideoDriver_Win32GDI::AllocateBackingStore(int w, int h, bool force)
bool VideoDriver_Win32GDI::AfterBlitterChange() bool VideoDriver_Win32GDI::AfterBlitterChange()
{ {
assert(BlitterFactory::GetCurrentBlitter()->GetScreenDepth() != 0); assert(BlitterFactory::GetCurrentBlitter()->GetScreenDepth() != 0);
return this->AllocateBackingStore(_screen.width, _screen.height, true) && this->MakeWindow(_fullscreen); return this->AllocateBackingStore(_screen.width, _screen.height, true) && this->MakeWindow(_fullscreen, false);
} }
void VideoDriver_Win32GDI::MakePalette() void VideoDriver_Win32GDI::MakePalette()

2
src/video/win32_v.h
View File

@ -54,7 +54,7 @@ protected:
bool PollEvent() override; bool PollEvent() override;
void Initialize(); void Initialize();
bool MakeWindow(bool full_screen); bool MakeWindow(bool full_screen, bool resize = true);
void ClientSizeChanged(int w, int h, bool force = false); void ClientSizeChanged(int w, int h, bool force = false);
/** Get screen depth to use for fullscreen mode. */ /** Get screen depth to use for fullscreen mode. */