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

Suppress calls to AdjustGUIZoom during startup phase

Browse Source 
See: #518
This commit is contained in:
Jonathan G Rennison
2023-05-15 20:16:10 +01:00
parent 9e1066049f
commit cd0cc13724
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gfx.cpp
View File

@@ -61,6 +61,7 @@ uint32 _pause_countdown;
Palette _cur_palette; Palette _cur_palette;
std::mutex _cur_palette_mutex; std::mutex _cur_palette_mutex;
std::string _switch_baseset; std::string _switch_baseset;
static bool _adjust_gui_zoom_startup_done = false;
static byte _stringwidth_table[FS_END][224]; ///< Cache containing width of often used characters. @see GetCharacterWidth() static byte _stringwidth_table[FS_END][224]; ///< Cache containing width of often used characters. @see GetCharacterWidth()
DrawPixelInfo *_cur_dpi; DrawPixelInfo *_cur_dpi;
@@ -2380,6 +2381,12 @@ void UpdateGUIZoom()
*/ */
bool AdjustGUIZoom(AdjustGUIZoomMode mode) bool AdjustGUIZoom(AdjustGUIZoomMode mode)
{ {
if (mode == AGZM_STARTUP) {
_adjust_gui_zoom_startup_done = true;
} else if (!_adjust_gui_zoom_startup_done) {
return false;
}
ZoomLevel old_gui_zoom = _gui_zoom; ZoomLevel old_gui_zoom = _gui_zoom;
ZoomLevel old_font_zoom = _font_zoom; ZoomLevel old_font_zoom = _font_zoom;
int old_scale = _gui_scale; int old_scale = _gui_scale;