miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed GetMinSizing() to GetMinButtonSize(), we do not use it for anything but button size

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-05-07 22:52:01 +03:00
parent c765e99c09
commit 9d9528b14e
35 changed files with 106 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf_gui.cpp
View File

@@ -726,14 +726,14 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
{
Dimension d = maxdim(GetSpriteSize(SPR_SQUARE), GetSpriteSize(SPR_WARNING_SIGN));
resize->height = std::max(d.height + 2U, FONT_HEIGHT_NORMAL + 2U);
resize->height = GetMinSizing(NWST_BUTTON, resize->height);
resize->height = GetMinButtonSize(resize->height);
size->height = std::max(size->height, WD_FRAMERECT_TOP + 4 * resize->height + WD_FRAMERECT_BOTTOM);
break;
}
case WID_NS_AVAIL_LIST:
resize->height = std::max(12, FONT_HEIGHT_NORMAL + 2);
resize->height = GetMinSizing(NWST_BUTTON, resize->height);
resize->height = GetMinButtonSize(resize->height);
size->height = std::max(size->height, WD_FRAMERECT_TOP + 4 * resize->height + WD_FRAMERECT_BOTTOM);
break;
@@ -755,7 +755,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
d = maxdim(d, GetStringBoundingBox(STR_JUST_RAW_STRING));
}
d.width += padding.width;
d.height = GetMinSizing(NWST_BUTTON, d.height);
d.height = GetMinButtonSize(d.height);
*size = maxdim(d, *size);
break;
}
@@ -766,7 +766,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
*size = maxdim(d, GetStringBoundingBox(STR_INTRO_ONLINE_CONTENT));
size->width += padding.width;
size->height += padding.height;
size->height = GetMinSizing(NWST_BUTTON, size->height);
size->height = GetMinButtonSize(size->height);
break;
}
}