Mercurial > hg > openttd
changeset 16993:56795b8de540 draft
(svn r21729) -Fix (r21718, r21720): In some cases clicking on a industry/company legend entry would not work.
author | terkhen <terkhen@openttd.org> |
---|---|
date | Tue, 04 Jan 2011 22:56:56 +0000 |
parents | e364b524e15a |
children | 828e3b8f6b18 |
files | src/smallmap_gui.cpp |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1291,7 +1291,7 @@ const NWidgetBase *wi = this->GetWidget<NWidgetBase>(SM_WIDGET_LEGEND); // Label panel uint line = (pt.y - wi->pos_y - WD_FRAMERECT_TOP) / FONT_HEIGHT_SMALL; uint columns = this->GetNumberColumnsLegend(wi->current_x); - uint number_of_rows = max(CeilDiv(_smallmap_industry_count, columns), this->min_number_of_fixed_rows); + uint number_of_rows = max(CeilDiv(max(_smallmap_company_count, _smallmap_industry_count), columns), this->min_number_of_fixed_rows); if (line >= number_of_rows) break; bool rtl = _current_text_dir == TD_RTL; @@ -1328,7 +1328,7 @@ const NWidgetBase *wi = this->GetWidget<NWidgetBase>(SM_WIDGET_LEGEND); uint line = (pt.y - wi->pos_y - WD_FRAMERECT_TOP) / FONT_HEIGHT_SMALL; uint columns = this->GetNumberColumnsLegend(wi->current_x); - uint number_of_rows = max(CeilDiv(_smallmap_company_count, columns), this->min_number_of_fixed_rows); + uint number_of_rows = max(CeilDiv(max(_smallmap_company_count, _smallmap_industry_count), columns), this->min_number_of_fixed_rows); if (line >= number_of_rows) break; bool rtl = _current_text_dir == TD_RTL;