mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Linkgraph legend assumes strings are small. 

Ensure all linkgraph legend strings are drawn with FS_SMALL forced, so
that it does not rely on NewGRF authors.
pull/10749/head
Peter Nelson 2023-04-28 17:59:16 +01:00 committed by PeterN
parent 35ba49bfb4
commit 6be6703498
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/linkgraph/linkgraph_gui.cpp
View File

@ -590,7 +590,7 @@ void LinkGraphLegendWindow::UpdateWidgetSize(int widget, Dimension *size, const
str = STR_LINKGRAPH_LEGEND_SATURATED; str = STR_LINKGRAPH_LEGEND_SATURATED;
} }
if (str != STR_NULL) { if (str != STR_NULL) {
Dimension dim = GetStringBoundingBox(str); Dimension dim = GetStringBoundingBox(str, FS_SMALL);
dim.width += padding.width; dim.width += padding.width;
dim.height += padding.height; dim.height += padding.height;
*size = maxdim(*size, dim); *size = maxdim(*size, dim);
@ -599,7 +599,7 @@ void LinkGraphLegendWindow::UpdateWidgetSize(int widget, Dimension *size, const
if (IsInsideMM(widget, WID_LGL_CARGO_FIRST, WID_LGL_CARGO_LAST + 1)) { if (IsInsideMM(widget, WID_LGL_CARGO_FIRST, WID_LGL_CARGO_LAST + 1)) {
CargoSpec *cargo = CargoSpec::Get(widget - WID_LGL_CARGO_FIRST); CargoSpec *cargo = CargoSpec::Get(widget - WID_LGL_CARGO_FIRST);
if (cargo->IsValid()) { if (cargo->IsValid()) {
Dimension dim = GetStringBoundingBox(cargo->abbrev); Dimension dim = GetStringBoundingBox(cargo->abbrev, FS_SMALL);
dim.width += padding.width; dim.width += padding.width;
dim.height += padding.height; dim.height += padding.height;
*size = maxdim(*size, dim); *size = maxdim(*size, dim);
@ -629,14 +629,14 @@ void LinkGraphLegendWindow::DrawWidget(const Rect &r, int widget) const
str = STR_LINKGRAPH_LEGEND_SATURATED; str = STR_LINKGRAPH_LEGEND_SATURATED;
} }
if (str != STR_NULL) { if (str != STR_NULL) {
DrawString(br.left, br.right, CenterBounds(br.top, br.bottom, FONT_HEIGHT_SMALL), str, GetContrastColour(colour) | TC_FORCED, SA_HOR_CENTER); DrawString(br.left, br.right, CenterBounds(br.top, br.bottom, FONT_HEIGHT_SMALL), str, GetContrastColour(colour) | TC_FORCED, SA_HOR_CENTER, false, FS_SMALL);
} }
} }
if (IsInsideMM(widget, WID_LGL_CARGO_FIRST, WID_LGL_CARGO_LAST + 1)) { if (IsInsideMM(widget, WID_LGL_CARGO_FIRST, WID_LGL_CARGO_LAST + 1)) {
if (this->IsWidgetDisabled(widget)) return; if (this->IsWidgetDisabled(widget)) return;
CargoSpec *cargo = CargoSpec::Get(widget - WID_LGL_CARGO_FIRST); CargoSpec *cargo = CargoSpec::Get(widget - WID_LGL_CARGO_FIRST);
GfxFillRect(br, cargo->legend_colour); GfxFillRect(br, cargo->legend_colour);
DrawString(br.left, br.right, CenterBounds(br.top, br.bottom, FONT_HEIGHT_SMALL), cargo->abbrev, GetContrastColour(cargo->legend_colour, 73), SA_HOR_CENTER); DrawString(br.left, br.right, CenterBounds(br.top, br.bottom, FONT_HEIGHT_SMALL), cargo->abbrev, GetContrastColour(cargo->legend_colour, 73), SA_HOR_CENTER, false, FS_SMALL);
} }
} }