From 34dcdfd8497ab1e3728bbd9d3eb323723b753d29 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sat, 9 Dec 2006 00:41:25 +0000 Subject: [PATCH] (svn r7445) -Codechange (r4822): Properly draw the cargo colours in the station list and centre the cargo abbreviations. The window at least looks a lot better this way. --- station_gui.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/station_gui.c b/station_gui.c index 5fd680d8a5..2d97d8548a 100644 --- a/station_gui.c +++ b/station_gui.c @@ -310,25 +310,26 @@ static void PlayerStationsWndProc(Window *w, WindowEvent *e) DoDrawString(sl->flags & SL_ORDER ? DOWNARROW : UPARROW, 69, 26, 0x10); - x = 90; + x = 89; y = 14; for (i = 0; i < NUM_CARGO; i++) { cg_ofst = IsWindowWidgetLowered(w, i + STATIONLIST_WIDGET_CARGOSTART) ? 2 : 1; - GfxFillRect(x + cg_ofst, y + cg_ofst + 1, x + cg_ofst + 10 , y + cg_ofst + 7, _cargo_colours[i]); - DrawString(x + cg_ofst + 2, y + cg_ofst + 1, _cargoc.names_short[i], i == 11 ? 15 : 16); + GfxFillRect(x + cg_ofst, y + cg_ofst, x + cg_ofst + 10 , y + cg_ofst + 7, _cargo_colours[i]); + DrawStringCentered(x + 6 + cg_ofst, y + cg_ofst, _cargoc.names_short[i], 0x10); x += 14; } - cg_ofst = IsWindowWidgetLowered(w, STATIONLIST_WIDGET_NOCARGOWAITING) ? 1 : 0; - DrawString(x + 2 + cg_ofst, y + 2 + cg_ofst, STR_ABBREV_NONE, 16); + x += 6; + cg_ofst = IsWindowWidgetLowered(w, STATIONLIST_WIDGET_NOCARGOWAITING) ? 2 : 1; + DrawStringCentered(x + cg_ofst, y + cg_ofst, STR_ABBREV_NONE, 16); x += 14; - cg_ofst = IsWindowWidgetLowered(w, STATIONLIST_WIDGET_CARGOALL) ? 1 : 0; - DrawString(x + 2 + cg_ofst, y + 2 + cg_ofst, STR_ABBREV_ALL, 16); + cg_ofst = IsWindowWidgetLowered(w, STATIONLIST_WIDGET_CARGOALL) ? 2 : 1; + DrawStringCentered(x + cg_ofst, y + cg_ofst, STR_ABBREV_ALL, 16); - cg_ofst = IsWindowWidgetLowered(w, STATIONLIST_WIDGET_FACILALL) ? 1 : 0; - DrawString(72 + cg_ofst, y + 2 + cg_ofst, STR_ABBREV_ALL, 16); + cg_ofst = IsWindowWidgetLowered(w, STATIONLIST_WIDGET_FACILALL) ? 2 : 1; + DrawString(71 + cg_ofst, y + cg_ofst, STR_ABBREV_ALL, 16); if (w->vscroll.count == 0) { // player has no stations DrawString(xb, 40, STR_304A_NONE, 0);