gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: Consistently use screen size and not driver resolution for determining window sizes.

Browse Source
This commit is contained in:
Michael Lutz 2021-01-06 23:02:10 +01:00
parent b66e977acd
commit 8906e9e0fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/cocoa/cocoa_v.mm
View File

@ -270,7 +270,7 @@ bool VideoDriver_Cocoa::ToggleFullscreen(bool full_screen)
*/ */
bool VideoDriver_Cocoa::AfterBlitterChange() bool VideoDriver_Cocoa::AfterBlitterChange()
{ {
this->ChangeResolution(_screen.width, _screen.height); this->ChangeResolution(_cur_resolution.width, _cur_resolution.height);
this->UpdatePalette(0, 256); this->UpdatePalette(0, 256);
return true; return true;
} }

6
src/window.cpp
View File

@ -2158,8 +2158,8 @@ void ResizeWindow(Window *w, int delta_x, int delta_y, bool clamp_to_screen)
* the resolution clamp it in such a manner that it stays within the bounds. */ * the resolution clamp it in such a manner that it stays within the bounds. */
int new_right = w->left + w->width + delta_x; int new_right = w->left + w->width + delta_x;
int new_bottom = w->top + w->height + delta_y; int new_bottom = w->top + w->height + delta_y;
if (new_right >= (int)_cur_resolution.width) delta_x -= Ceil(new_right - _cur_resolution.width, std::max(1U, w->nested_root->resize_x)); if (new_right >= (int)_screen.width) delta_x -= Ceil(new_right - _screen.width, std::max(1U, w->nested_root->resize_x));
if (new_bottom >= (int)_cur_resolution.height) delta_y -= Ceil(new_bottom - _cur_resolution.height, std::max(1U, w->nested_root->resize_y)); if (new_bottom >= (int)_screen.height) delta_y -= Ceil(new_bottom - _screen.height, std::max(1U, w->nested_root->resize_y));
} }
w->SetDirty(); w->SetDirty();
@ -3468,7 +3468,7 @@ void ReInitAllWindows()
NetworkReInitChatBoxSize(); NetworkReInitChatBoxSize();
/* Make sure essential parts of all windows are visible */ /* Make sure essential parts of all windows are visible */
RelocateAllWindows(_cur_resolution.width, _cur_resolution.height); RelocateAllWindows(_screen.width, _screen.height);
MarkWholeScreenDirty(); MarkWholeScreenDirty();
} }