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

10
src/network/network_gui.cpp
View File

@@ -496,14 +496,14 @@ public:
switch (widget) {
case WID_NG_MATRIX:
resize->height = WD_MATRIX_TOP + std::max(GetSpriteSize(SPR_BLOT).height, (uint)FONT_HEIGHT_NORMAL) + WD_MATRIX_BOTTOM;
resize->height = GetMinSizing(NWST_BUTTON, resize->height);
resize->height = GetMinButtonSize(resize->height);
fill->height = resize->height;
size->height = 5 * resize->height;
break;
case WID_NG_LASTJOINED:
size->height = WD_MATRIX_TOP + std::max(GetSpriteSize(SPR_BLOT).height, (uint)FONT_HEIGHT_NORMAL) + WD_MATRIX_BOTTOM;
size->height = GetMinSizing(NWST_BUTTON, size->height);
size->height = GetMinButtonSize(size->height);
break;
case WID_NG_LASTJOINED_SPACER:
@@ -1023,9 +1023,9 @@ struct NetworkStartServerWindow : public Window {
case WID_NSS_CONNTYPE_BTN:
*size = maxdim(GetStringBoundingBox(_server_visibility_dropdown[0]), GetStringBoundingBox(_server_visibility_dropdown[1]));
size->width += padding.width;
size->width = GetMinSizing(NWST_BUTTON, size->width);
size->width = GetMinButtonSize(size->width);
size->height += padding.height;
size->height = GetMinSizing(NWST_BUTTON, size->height);
size->height = GetMinButtonSize(size->height);
break;
}
}
@@ -1303,7 +1303,7 @@ struct NetworkLobbyWindow : public Window {
case WID_NL_MATRIX:
resize->height = WD_MATRIX_TOP + std::max<uint>(std::max(GetSpriteSize(SPR_LOCK).height, GetSpriteSize(SPR_PROFIT_LOT).height), FONT_HEIGHT_NORMAL) + WD_MATRIX_BOTTOM;
resize->height = GetMinSizing(NWST_BUTTON, resize->height);
resize->height = GetMinButtonSize(resize->height);
size->height = 6 * resize->height;
break;