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

Fix crash when launching game with non-default GUI scale in config

Browse Source 
See: #459
This commit is contained in:
Jonathan G Rennison
2022-12-06 18:29:55 +00:00
parent e647075870
commit 351090ae7f
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gfx.cpp
View File

@@ -2361,7 +2361,7 @@ void UpdateGUIZoom()
* @returns true when the zoom level has changed, caller must call ReInitAllWindows(true)
* after resizing the application's window/buffer.
*/
bool AdjustGUIZoom(bool automatic)
bool AdjustGUIZoom(AdjustGUIZoomMode mode)
{
ZoomLevel old_zoom = _gui_zoom;
int old_scale = _gui_scale;
@@ -2373,14 +2373,14 @@ bool AdjustGUIZoom(bool automatic)
GfxClearSpriteCache();
VideoDriver::GetInstance()->ClearSystemSprites();
UpdateCursorSize();
UpdateRouteStepSpriteSize();
if (mode != AGZM_STARTUP) UpdateRouteStepSpriteSize();
}
ClearFontCache();
UpdateFontHeightCache();
LoadStringWidthTable();
UpdateAllVirtCoords();
FixTitleGameZoom();
if (mode != AGZM_STARTUP) FixTitleGameZoom();
extern void FlushDeparturesWindowTextCaches();
FlushDeparturesWindowTextCaches();
@@ -2389,7 +2389,7 @@ bool AdjustGUIZoom(bool automatic)
to move around when the application is moved to a screen with different DPI. */
auto zoom_shift = old_zoom - _gui_zoom;
for (Window *w : Window::IterateFromBack()) {
if (automatic) {
if (mode == AGZM_AUTOMATIC) {
w->left = (w->left * _gui_scale) / old_scale;
w->top = (w->top * _gui_scale) / old_scale;
w->width = (w->width * _gui_scale) / old_scale;