|
@@ -1053,13 +1053,13 @@ struct PerformanceRatingDetailWindow : W
|
|
|
if (this->company == INVALID_COMPANY) return;
|
|
|
|
|
|
if (IsInsideMM(widget, PRW_COMPANY_FIRST, PRW_COMPANY_LAST + 1)) {
|
|
|
if (this->IsWidgetDisabled(widget)) return;
|
|
|
CompanyID cid = (CompanyID)(widget - PRW_COMPANY_FIRST);
|
|
|
int offset = (cid == this->company) ? 1 : 0;
|
|
|
Dimension sprite_size = GetSpriteSize(SPR_PLAYER_ICON);
|
|
|
Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON);
|
|
|
DrawCompanyIcon(cid, (r.left + r.right - sprite_size.width) / 2 + offset, (r.top + r.bottom - sprite_size.height) / 2 + offset);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
if (!IsInsideMM(widget, PRW_SCORE_FIRST, PRW_SCORE_LAST + 1)) return;
|
|
|
|
|
@@ -1219,13 +1219,13 @@ static NWidgetBase *MakeCompanyButtonRow
|
|
|
{
|
|
|
static const int MAX_LENGTH = 8; // Maximal number of company buttons in one row.
|
|
|
NWidgetVertical *vert = NULL; // Storage for all rows.
|
|
|
NWidgetHorizontal *hor = NULL; // Storage for buttons in one row.
|
|
|
int hor_length = 0;
|
|
|
|
|
|
Dimension sprite_size = GetSpriteSize(SPR_PLAYER_ICON);
|
|
|
Dimension sprite_size = GetSpriteSize(SPR_COMPANY_ICON);
|
|
|
sprite_size.width += WD_MATRIX_LEFT + WD_MATRIX_RIGHT;
|
|
|
sprite_size.height += WD_MATRIX_TOP + WD_MATRIX_BOTTOM + 1; // 1 for the 'offset' of being pressed
|
|
|
|
|
|
for (int widnum = PRW_COMPANY_FIRST; widnum <= PRW_COMPANY_LAST; widnum++) {
|
|
|
/* Ensure there is room in 'hor' for another button. */
|
|
|
if (hor_length == MAX_LENGTH) {
|