From a65db3be0ded166643e9ddaf41d8e2e3d0cf1bad 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 viewport window. --- src/viewport_gui.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp index 046db96abb..4d9d260bbd 100644 --- a/src/viewport_gui.cpp +++ b/src/viewport_gui.cpp @@ -26,7 +26,7 @@ static constexpr NWidgetPart _nested_extra_viewport_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_GREY), - NWidget(WWT_CAPTION, COLOUR_GREY, WID_EV_CAPTION), SetStringTip(STR_EXTRA_VIEWPORT_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_CAPTION, COLOUR_GREY, WID_EV_CAPTION), NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY), @@ -61,13 +61,15 @@ public: if (_settings_client.gui.zoom_min == viewport->zoom) this->DisableWidget(WID_EV_ZOOM_IN); } - void SetStringParameters(WidgetID widget) const override + std::string GetWidgetString(WidgetID widget, StringID stringid) const override { switch (widget) { case WID_EV_CAPTION: /* set the number in the title bar */ - SetDParam(0, this->window_number + 1); - break; + return GetString(STR_EXTRA_VIEWPORT_TITLE, this->window_number + 1); + + default: + return this->Window::GetWidgetString(widget, stringid); } }