Fixed Android compilation and warnings

This commit is contained in:
pelya
2021-01-25 21:31:09 +02:00
parent ac91ee617a
commit 2bc0595127
27 changed files with 67 additions and 63 deletions

View File

@@ -266,7 +266,7 @@ struct SignListWindow : Window, SignList {
Dimension spr_dim = GetSpriteSize(SPR_COMPANY_ICON);
this->text_offset = WD_FRAMETEXT_LEFT + spr_dim.width + 2; // 2 pixels space between icon and the sign text.
resize->height = std::max<uint>(FONT_HEIGHT_NORMAL, spr_dim.height);
resize->height = GetMinSizing(NWST_STEP), resize->height);
resize->height = std::max(GetMinSizing(NWST_STEP), resize->height);
Dimension d = {(uint)(this->text_offset + WD_FRAMETEXT_RIGHT), WD_FRAMERECT_TOP + 5 * resize->height + WD_FRAMERECT_BOTTOM};
*size = maxdim(*size, d);
break;