From 5c9e09419d4234f28b4c3bb65adddd00c97c6041 Mon Sep 17 00:00:00 2001 From: terkhen Date: Tue, 4 Jan 2011 22:56:56 +0000 Subject: [PATCH] (svn r21729) -Fix (r21718, r21720): In some cases clicking on a industry/company legend entry would not work. --- src/smallmap_gui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 08a3530d31..be3340aeb1 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -1291,7 +1291,7 @@ public: const NWidgetBase *wi = this->GetWidget(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 @@ public: const NWidgetBase *wi = this->GetWidget(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;