diff options
author | rubidium <rubidium@openttd.org> | 2010-07-30 12:26:58 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2010-07-30 12:26:58 +0000 |
commit | 0c54c242e218b3065fe447d5f0f50da664c7e1dc (patch) | |
tree | 15d983faa9c86007fa7bcf5d924231d270561cd9 /src/group_gui.cpp | |
parent | 4a6c317d429da3063e61955a077384c1a4879e87 (diff) | |
download | openttd-0c54c242e218b3065fe447d5f0f50da664c7e1dc.tar.xz |
(svn r20244) -Fix: the caption of the "Available vehicle" lists was black, whereas for building those vehicles, which uses the exact same window, it was white.
Diffstat (limited to 'src/group_gui.cpp')
-rw-r--r-- | src/group_gui.cpp | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/src/group_gui.cpp b/src/group_gui.cpp index 97e7bce59..e7f76b896 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -98,7 +98,7 @@ static const NWidgetPart _nested_group_widgets[] = { EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, GRP_WIDGET_AVAILABLE_VEHICLES), SetMinimalSize(106, 12), SetFill(0, 1), - SetDataTip(0x0, STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP), + SetDataTip(STR_BLACK_STRING, STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP), NWidget(WWT_DROPDOWN, COLOUR_GREY, GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN), SetMinimalSize(118, 12), SetFill(0, 1), SetDataTip(STR_VEHICLE_LIST_MANAGE_LIST, STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_STOP_ALL), SetMinimalSize(12, 12), SetFill(0, 1), @@ -197,7 +197,6 @@ public: this->GetWidget<NWidgetCore>(GRP_WIDGET_CAPTION)->widget_data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vehicle_type; this->GetWidget<NWidgetCore>(GRP_WIDGET_LIST_VEHICLE)->tool_tip = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP + this->vehicle_type; - this->GetWidget<NWidgetCore>(GRP_WIDGET_AVAILABLE_VEHICLES)->widget_data = STR_VEHICLE_LIST_AVAILABLE_TRAINS + this->vehicle_type; this->GetWidget<NWidgetCore>(GRP_WIDGET_CREATE_GROUP)->widget_data += this->vehicle_type; this->GetWidget<NWidgetCore>(GRP_WIDGET_RENAME_GROUP)->widget_data += this->vehicle_type; @@ -268,22 +267,28 @@ public: virtual void SetStringParameters(int widget) const { - if (widget != GRP_WIDGET_CAPTION) return; - - /* If selected_group == DEFAULT_GROUP || ALL_GROUP, draw the standard caption - * We list all vehicles or ungrouped vehicles */ - if (IsDefaultGroupID(this->group_sel) || IsAllGroupID(this->group_sel)) { - SetDParam(0, STR_COMPANY_NAME); - SetDParam(1, GB(this->window_number, 0, 8)); - SetDParam(2, this->vehicles.Length()); - SetDParam(3, this->vehicles.Length()); - } else { - const Group *g = Group::Get(this->group_sel); + switch (widget) { + case GRP_WIDGET_AVAILABLE_VEHICLES: + SetDParam(0, STR_VEHICLE_LIST_AVAILABLE_TRAINS + this->vehicle_type); + break; - SetDParam(0, STR_GROUP_NAME); - SetDParam(1, g->index); - SetDParam(2, g->num_vehicle); - SetDParam(3, g->num_vehicle); + case GRP_WIDGET_CAPTION: + /* If selected_group == DEFAULT_GROUP || ALL_GROUP, draw the standard caption + * We list all vehicles or ungrouped vehicles */ + if (IsDefaultGroupID(this->group_sel) || IsAllGroupID(this->group_sel)) { + SetDParam(0, STR_COMPANY_NAME); + SetDParam(1, GB(this->window_number, 0, 8)); + SetDParam(2, this->vehicles.Length()); + SetDParam(3, this->vehicles.Length()); + } else { + const Group *g = Group::Get(this->group_sel); + + SetDParam(0, STR_GROUP_NAME); + SetDParam(1, g->index); + SetDParam(2, g->num_vehicle); + SetDParam(3, g->num_vehicle); + } + break; } } |