diff options
| author | peter1138 <peter1138@openttd.org> | 2011-10-12 07:22:26 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2011-10-12 07:22:26 +0000 |
| commit | 2cfd47a09b8ce83cec5452217485fcfbb31296f0 (patch) | |
| tree | e9a5237a86db7ed7bd7234265865fdf354778260 | |
| parent | 635ccea95d630b00a6c3a3f1b220439119362e5d (diff) | |
| download | openttd-2cfd47a09b8ce83cec5452217485fcfbb31296f0.tar.xz | |
(svn r23025) -Codechange: Support resized company colour icon in company key window.
| -rw-r--r-- | src/graph_gui.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index e87560dfa..8ead12ecc 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -70,11 +70,12 @@ struct GraphLegendWindow : Window { bool rtl = _current_text_dir == TD_RTL; - DrawCompanyIcon(cid, rtl ? r.right - 16 : r.left + 2, r.top + 2 + (FONT_HEIGHT_NORMAL - 10) / 2); + Dimension d = GetSpriteSize(SPR_COMPANY_ICON); + DrawCompanyIcon(cid, rtl ? r.right - d.width - 2 : r.left + 2, r.top + (r.bottom - r.top - d.height) / 2); SetDParam(0, cid); SetDParam(1, cid); - DrawString(r.left + (rtl ? WD_FRAMERECT_LEFT : 19), r.right - (rtl ? 19 : WD_FRAMERECT_RIGHT), r.top + WD_FRAMERECT_TOP, STR_COMPANY_NAME_COMPANY_NUM, HasBit(_legend_excluded_companies, cid) ? TC_BLACK : TC_WHITE); + DrawString(r.left + (rtl ? (uint)WD_FRAMERECT_LEFT : (d.width + 4)), r.right - (rtl ? (d.width + 4) : (uint)WD_FRAMERECT_RIGHT), r.top + (r.bottom - r.top + 1 - FONT_HEIGHT_NORMAL) / 2, STR_COMPANY_NAME_COMPANY_NUM, HasBit(_legend_excluded_companies, cid) ? TC_BLACK : TC_WHITE); } virtual void OnClick(Point pt, int widget, int click_count) @@ -115,10 +116,11 @@ struct GraphLegendWindow : Window { static NWidgetBase *MakeNWidgetCompanyLines(int *biggest_index) { NWidgetVertical *vert = new NWidgetVertical(); + uint line_height = max<uint>(GetSpriteSize(SPR_COMPANY_ICON).height, FONT_HEIGHT_NORMAL) + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; for (int widnum = GLW_FIRST_COMPANY; widnum <= GLW_LAST_COMPANY; widnum++) { NWidgetBackground *panel = new NWidgetBackground(WWT_PANEL, COLOUR_GREY, widnum); - panel->SetMinimalSize(246, FONT_HEIGHT_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM); + panel->SetMinimalSize(246, line_height); panel->SetFill(1, 0); panel->SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP); vert->Add(panel); |