miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed minimap sizing

Browse Source
This commit is contained in:
pelya
2020-03-23 00:27:59 +02:00
parent ef449023b2
commit 455f481c8d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/smallmap_gui.cpp
View File

@@ -138,7 +138,6 @@ static LegendAndColour _legend_land_owners[NUM_NO_COMPANY_ENTRIES + MAX_COMPANIE
}; };
#undef MK #undef MK
#undef MKB
#undef MC #undef MC
#undef MS #undef MS
#undef MO #undef MO
@@ -1729,7 +1728,7 @@ public:
this->smallmap_window = dynamic_cast<SmallMapWindow *>(w); this->smallmap_window = dynamic_cast<SmallMapWindow *>(w);
assert(this->smallmap_window != nullptr); assert(this->smallmap_window != nullptr);
this->smallest_x = max(display->smallest_x, bar->smallest_x + smallmap_window->GetMinLegendWidth()); this->smallest_x = max(display->smallest_x, max(bar->smallest_x, smallmap_window->GetMinLegendWidth()));
this->smallest_y = display->smallest_y + max(bar->smallest_y, smallmap_window->GetLegendHeight(smallmap_window->min_number_of_columns)); this->smallest_y = display->smallest_y + max(bar->smallest_y, smallmap_window->GetLegendHeight(smallmap_window->min_number_of_columns));
this->fill_x = max(display->fill_x, bar->fill_x); this->fill_x = max(display->fill_x, bar->fill_x);
this->fill_y = (display->fill_y == 0 && bar->fill_y == 0) ? 0 : min(display->fill_y, bar->fill_y); this->fill_y = (display->fill_y == 0 && bar->fill_y == 0) ? 0 : min(display->fill_y, bar->fill_y);
@@ -1878,7 +1877,7 @@ void ShowSmallMap()
{ {
AllocateWindowDescFront<SmallMapWindow>(&_smallmap_desc, 0); AllocateWindowDescFront<SmallMapWindow>(&_smallmap_desc, 0);
SmallMapWindow *w = dynamic_cast<SmallMapWindow *>(FindWindowByClass(WC_SMALLMAP)); SmallMapWindow *w = dynamic_cast<SmallMapWindow *>(FindWindowByClass(WC_SMALLMAP));
if (w && w->GetMinLegendWidth() > w->width) { if (w && (int)w->GetMinLegendWidth() > w->width) {
ResizeWindow(w, w->GetMinLegendWidth() - w->width, 0); ResizeWindow(w, w->GetMinLegendWidth() - w->width, 0);
} }
} }

2
src/smallmap_gui.h
View File

@@ -175,7 +175,7 @@ public:
* Compute minimal required width of the legends. * Compute minimal required width of the legends.
* @return Minimally needed width for displaying the smallmap legends in pixels. * @return Minimally needed width for displaying the smallmap legends in pixels.
*/ */
inline int GetMinLegendWidth() const inline uint GetMinLegendWidth() const
{ {
return WD_FRAMERECT_LEFT + this->min_number_of_columns * this->column_width; return WD_FRAMERECT_LEFT + this->min_number_of_columns * this->column_width;
} }