gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 07:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Local authority window rating list height ignored icon sizes. (#10285)

Browse Source 
Only font height was taken into account, so the list was broken if icon
sizes were taller than font height.
This commit is contained in:
PeterN 2022-12-26 18:26:01 +00:00 committed by GitHub
parent 961e66df30
commit 9e56e16147
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/town_gui.cpp
View File

@ -73,6 +73,9 @@ private:
TownActions enabled_actions; ///< Actions that are enabled in settings. TownActions enabled_actions; ///< Actions that are enabled in settings.
TownActions available_actions; ///< Actions that are available to execute for the current company. TownActions available_actions; ///< Actions that are available to execute for the current company.
Dimension icon_size; ///< Dimensions of company icon
Dimension exclusive_size; ///< Dimensions of exlusive icon
/** /**
* Get the position of the Nth set bit. * Get the position of the Nth set bit.
* *
@ -117,6 +120,12 @@ public:
this->InitNested(window_number); this->InitNested(window_number);
} }
void OnInit() override
{
this->icon_size = GetSpriteSize(SPR_COMPANY_ICON);
this->exclusive_size = GetSpriteSize(SPR_EXCLUSIVE_TRANSPORT);
}
void OnPaint() override void OnPaint() override
{ {
this->available_actions = GetMaskOfTownActions(_local_company, this->town); this->available_actions = GetMaskOfTownActions(_local_company, this->town);
@ -139,26 +148,22 @@ public:
{ {
Rect r = this->GetWidget<NWidgetBase>(WID_TA_RATING_INFO)->GetCurrentRect().Shrink(WidgetDimensions::scaled.framerect); Rect r = this->GetWidget<NWidgetBase>(WID_TA_RATING_INFO)->GetCurrentRect().Shrink(WidgetDimensions::scaled.framerect);
DrawString(r, STR_LOCAL_AUTHORITY_COMPANY_RATINGS); int text_y_offset = (this->resize.step_height - FONT_HEIGHT_NORMAL) / 2;
r.top += FONT_HEIGHT_NORMAL; int icon_y_offset = (this->resize.step_height - this->icon_size.height) / 2;
int exclusive_y_offset = (this->resize.step_height - this->exclusive_size.height) / 2;
Dimension icon_size = GetSpriteSize(SPR_COMPANY_ICON); DrawString(r.left, r.right, r.top + text_y_offset, STR_LOCAL_AUTHORITY_COMPANY_RATINGS);
int icon_width = icon_size.width; r.top += this->resize.step_height;
int icon_y_offset = (FONT_HEIGHT_NORMAL - icon_size.height) / 2;
Dimension exclusive_size = GetSpriteSize(SPR_EXCLUSIVE_TRANSPORT);
int exclusive_width = exclusive_size.width;
int exclusive_y_offset = (FONT_HEIGHT_NORMAL - exclusive_size.height) / 2;
bool rtl = _current_text_dir == TD_RTL; bool rtl = _current_text_dir == TD_RTL;
Rect text = r.Indent(icon_width + WidgetDimensions::scaled.hsep_normal + exclusive_width + WidgetDimensions::scaled.hsep_normal, rtl); Rect icon = r.WithWidth(this->icon_size.width, rtl);
uint icon_left = r.WithWidth(icon_width, rtl).left; Rect exclusive = r.Indent(this->icon_size.width + WidgetDimensions::scaled.hsep_normal, rtl).WithWidth(this->exclusive_size.width, rtl);
uint exclusive_left = r.Indent(icon_width + WidgetDimensions::scaled.hsep_normal, rtl).WithWidth(exclusive_width, rtl).left; Rect text = r.Indent(this->icon_size.width + WidgetDimensions::scaled.hsep_normal + this->exclusive_size.width + WidgetDimensions::scaled.hsep_normal, rtl);
/* Draw list of companies */ /* Draw list of companies */
for (const Company *c : Company::Iterate()) { for (const Company *c : Company::Iterate()) {
if ((HasBit(this->town->have_ratings, c->index) || this->town->exclusivity == c->index)) { if ((HasBit(this->town->have_ratings, c->index) || this->town->exclusivity == c->index)) {
DrawCompanyIcon(c->index, icon_left, text.top + icon_y_offset); DrawCompanyIcon(c->index, icon.left, text.top + icon_y_offset);
SetDParam(0, c->index); SetDParam(0, c->index);
SetDParam(1, c->index); SetDParam(1, c->index);
@ -175,11 +180,11 @@ public:
SetDParam(2, str); SetDParam(2, str);
if (this->town->exclusivity == c->index) { if (this->town->exclusivity == c->index) {
DrawSprite(SPR_EXCLUSIVE_TRANSPORT, COMPANY_SPRITE_COLOUR(c->index), exclusive_left, r.top + exclusive_y_offset); DrawSprite(SPR_EXCLUSIVE_TRANSPORT, COMPANY_SPRITE_COLOUR(c->index), exclusive.left, text.top + exclusive_y_offset);
} }
DrawString(text, STR_LOCAL_AUTHORITY_COMPANY_RATING); DrawString(text.left, text.right, text.top + text_y_offset, STR_LOCAL_AUTHORITY_COMPANY_RATING);
text.top += FONT_HEIGHT_NORMAL; text.top += this->resize.step_height;
} }
} }
@ -261,8 +266,8 @@ public:
break; break;
case WID_TA_RATING_INFO: case WID_TA_RATING_INFO:
resize->height = FONT_HEIGHT_NORMAL; resize->height = std::max({this->icon_size.height + WidgetDimensions::scaled.vsep_normal, this->exclusive_size.height + WidgetDimensions::scaled.vsep_normal, (uint)FONT_HEIGHT_NORMAL});
size->height = 9 * FONT_HEIGHT_NORMAL + padding.height; size->height = 9 * resize->height + padding.height;
break; break;
} }
} }