From deb3755acb4e82b84d9057a6b56291b86d49a9aa Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Mon, 3 Mar 2025 20:38:18 +0000 Subject: [PATCH] Codechange: Move to GetWidgetString for waypoint window. --- src/waypoint_gui.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp index c53855e25d..073a88e355 100644 --- a/src/waypoint_gui.cpp +++ b/src/waypoint_gui.cpp @@ -109,9 +109,11 @@ public: this->Window::Close(); } - void SetStringParameters(WidgetID widget) const override + std::string GetWidgetString(WidgetID widget, StringID stringid) const override { - if (widget == WID_W_CAPTION) SetDParam(0, this->wp->index); + if (widget == WID_W_CAPTION) return GetString(STR_WAYPOINT_VIEW_CAPTION, this->wp->index); + + return this->Window::GetWidgetString(widget, stringid); } void OnPaint() override @@ -189,7 +191,7 @@ static constexpr NWidgetPart _nested_waypoint_view_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_W_RENAME), SetAspect(WidgetDimensions::ASPECT_RENAME), SetSpriteTip(SPR_RENAME, STR_BUOY_VIEW_RENAME_TOOLTIP), - NWidget(WWT_CAPTION, COLOUR_GREY, WID_W_CAPTION), SetStringTip(STR_WAYPOINT_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_CAPTION, COLOUR_GREY, WID_W_CAPTION), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_W_CENTER_VIEW), SetAspect(WidgetDimensions::ASPECT_LOCATION), SetSpriteTip(SPR_GOTO_LOCATION, STR_BUOY_VIEW_CENTER_TOOLTIP), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),