From a29c01493d9467e5f1dae98700ff8922f69244fc Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 30 Aug 2023 23:13:21 +0100 Subject: [PATCH] Tracerestrict: Fix train texts used in non-train slots windows See: #593 --- src/tracerestrict_gui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tracerestrict_gui.cpp b/src/tracerestrict_gui.cpp index 4ea3cde4d5..976e386f43 100644 --- a/src/tracerestrict_gui.cpp +++ b/src/tracerestrict_gui.cpp @@ -3677,7 +3677,7 @@ static const NWidgetPart _nested_slot_widgets[] = { NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(0, 12), SetResize(1, 0), EndContainer(), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_MATRIX, COLOUR_GREY, WID_TRSL_LIST_VEHICLE), SetMinimalSize(248, 0), SetMatrixDataTip(1, 0, STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP), SetResize(1, 1), SetFill(1, 0), SetScrollbar(WID_TRSL_LIST_VEHICLE_SCROLLBAR), + NWidget(WWT_MATRIX, COLOUR_GREY, WID_TRSL_LIST_VEHICLE), SetMinimalSize(248, 0), SetMatrixDataTip(1, 0, STR_NULL), SetResize(1, 1), SetFill(1, 0), SetScrollbar(WID_TRSL_LIST_VEHICLE_SCROLLBAR), NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_TRSL_LIST_VEHICLE_SCROLLBAR), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(1, 0), SetFill(1, 1), SetResize(1, 0), EndContainer(), @@ -3777,7 +3777,7 @@ private: /* draw group name */ StringID str; if (slot_id == ALL_TRAINS_TRACE_RESTRICT_SLOT_ID) { - str = STR_GROUP_ALL_TRAINS; + str = STR_GROUP_ALL_TRAINS + this->vli.vtype; } else { SetDParam(0, slot_id); str = STR_TRACE_RESTRICT_SLOT_NAME; @@ -3842,6 +3842,7 @@ public: this->GetWidget(WID_TRSL_CREATE_SLOT)->widget_data += this->vli.vtype; this->GetWidget(WID_TRSL_DELETE_SLOT)->widget_data += this->vli.vtype; this->GetWidget(WID_TRSL_RENAME_SLOT)->widget_data += this->vli.vtype; + this->GetWidget(WID_TRSL_LIST_VEHICLE)->tool_tip = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP + this->vli.vtype; this->FinishInitNested(window_number); this->owner = vli.company;