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

Fix crash in tooltip window UpdateWidgetSize due to not using saved string

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-07-14 23:21:23 +01:00
parent cd4a9fba68
commit e497f0e78d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/misc_gui.cpp
View File

@@ -768,10 +768,15 @@ struct TooltipsWindow : public Window
void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
{ {
/* There is only one widget. */ /* There is only one widget. */
if (this->paramcount == 0) {
size->width = std::min<uint>(GetStringBoundingBox(this->buffer).width, ScaleGUITrad(194));
size->height = GetStringHeight(this->buffer, size->width);
} else {
for (uint i = 0; i != this->paramcount; i++) SetDParam(i, this->params[i]); for (uint i = 0; i != this->paramcount; i++) SetDParam(i, this->params[i]);
size->width = std::min<uint>(GetStringBoundingBox(this->string_id).width, ScaleGUITrad(194)); size->width = std::min<uint>(GetStringBoundingBox(this->string_id).width, ScaleGUITrad(194));
size->height = GetStringHeight(this->string_id, size->width); size->height = GetStringHeight(this->string_id, size->width);
}
/* Increase slightly to have some space around the box. */ /* Increase slightly to have some space around the box. */
size->width += 2 + WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT; size->width += 2 + WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;