|
|
|
@ -23,6 +23,7 @@
|
|
|
|
|
#include "company_base.h"
|
|
|
|
|
#include "screenshot.h"
|
|
|
|
|
#include "guitimer_func.h"
|
|
|
|
|
#include "zoom_func.h"
|
|
|
|
|
|
|
|
|
|
#include "smallmap_colours.h"
|
|
|
|
|
#include "smallmap_gui.h"
|
|
|
|
@ -1090,8 +1091,11 @@ void SmallMapWindow::RebuildColourIndexIfNecessary()
|
|
|
|
|
this->min_number_of_columns = std::max(this->min_number_of_columns, num_columns);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Width of the legend blob. */
|
|
|
|
|
this->legend_width = (FONT_HEIGHT_SMALL - ScaleFontTrad(1)) * 8 / 5;
|
|
|
|
|
|
|
|
|
|
/* The width of a column is the minimum width of all texts + the size of the blob + some spacing */
|
|
|
|
|
this->column_width = min_width + LEGEND_BLOB_WIDTH + WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
|
|
|
|
|
this->column_width = min_width + this->legend_width + WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* virtual */ void SmallMapWindow::OnPaint()
|
|
|
|
@ -1129,11 +1133,12 @@ void SmallMapWindow::RebuildColourIndexIfNecessary()
|
|
|
|
|
uint y = y_org;
|
|
|
|
|
uint i = 0; // Row counter for industry legend.
|
|
|
|
|
uint row_height = FONT_HEIGHT_SMALL;
|
|
|
|
|
int padding = ScaleFontTrad(1);
|
|
|
|
|
|
|
|
|
|
uint text_left = rtl ? 0 : LEGEND_BLOB_WIDTH + WD_FRAMERECT_LEFT;
|
|
|
|
|
uint text_right = this->column_width - 1 - (rtl ? LEGEND_BLOB_WIDTH + WD_FRAMERECT_RIGHT : 0);
|
|
|
|
|
uint blob_left = rtl ? this->column_width - 1 - LEGEND_BLOB_WIDTH : 0;
|
|
|
|
|
uint blob_right = rtl ? this->column_width - 1 : LEGEND_BLOB_WIDTH;
|
|
|
|
|
uint text_left = rtl ? 0 : this->legend_width + WD_FRAMERECT_LEFT;
|
|
|
|
|
uint text_right = this->column_width - padding - (rtl ? this->legend_width + WD_FRAMERECT_RIGHT : 0);
|
|
|
|
|
uint blob_left = rtl ? this->column_width - padding - this->legend_width : 0;
|
|
|
|
|
uint blob_right = rtl ? this->column_width - padding : this->legend_width;
|
|
|
|
|
|
|
|
|
|
StringID string = STR_NULL;
|
|
|
|
|
switch (this->map_type) {
|
|
|
|
@ -1185,7 +1190,7 @@ void SmallMapWindow::RebuildColourIndexIfNecessary()
|
|
|
|
|
DrawString(x + text_left, x + text_right, y, string, TC_GREY);
|
|
|
|
|
} else {
|
|
|
|
|
DrawString(x + text_left, x + text_right, y, string, TC_BLACK);
|
|
|
|
|
GfxFillRect(x + blob_left, y + 1, x + blob_right, y + row_height - 1, PC_BLACK); // Outer border of the legend colour
|
|
|
|
|
GfxFillRect(x + blob_left, y + padding, x + blob_right, y + row_height - 1, PC_BLACK); // Outer border of the legend colour
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
@ -1194,11 +1199,11 @@ void SmallMapWindow::RebuildColourIndexIfNecessary()
|
|
|
|
|
default:
|
|
|
|
|
if (this->map_type == SMT_CONTOUR) SetDParam(0, tbl->height * TILE_HEIGHT_STEP);
|
|
|
|
|
/* Anything that is not an industry or a company is using normal process */
|
|
|
|
|
GfxFillRect(x + blob_left, y + 1, x + blob_right, y + row_height - 1, PC_BLACK);
|
|
|
|
|
GfxFillRect(x + blob_left, y + padding, x + blob_right, y + row_height - 1, PC_BLACK);
|
|
|
|
|
DrawString(x + text_left, x + text_right, y, tbl->legend);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
GfxFillRect(x + blob_left + 1, y + 2, x + blob_right - 1, y + row_height - 2, legend_colour); // Legend colour
|
|
|
|
|
GfxFillRect(x + blob_left + 1, y + padding + 1, x + blob_right - 1, y + row_height - 2, legend_colour); // Legend colour
|
|
|
|
|
|
|
|
|
|
y += row_height;
|
|
|
|
|
}
|
|
|
|
|