mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Fix #15271. Use formatter to pass description args to text input (#15272)

Browse Source 
* Fix #15271. Use formatter to pass description args to text input

Originally passed the variables via global vars which were not updated to 32bit during recent refactors. This removes the global and makes the interface cleaner and corrects the type

* Fix size of arguments
This commit is contained in:
Duncan
2021-08-24 19:12:05 +01:00
committed by GitHub
parent 201a94f7e6
commit d2aca03ff6
29 changed files with 91 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2-ui/windows/TextInput.cpp
View File

@@ -47,6 +47,7 @@ private:
std::string _description;
rct_string_id _descriptionStringId = STR_NONE;
Formatter _descriptionArgs;
std::function<void(std::string_view)> _callback;
std::function<void()> _cancelCallback;
@@ -89,10 +90,11 @@ public:
}
}
void SetTitle(rct_string_id title, rct_string_id description)
void SetTitle(rct_string_id title, rct_string_id description, const Formatter& decriptionArgs)
{
_titleStringId = title;
_descriptionStringId = description;
_descriptionArgs = decriptionArgs;
}
void SetTitle(std::string_view title, std::string_view description)
@@ -209,10 +211,8 @@ public:
}
else
{
auto ft = Formatter();
ft.Add<const char*>(TextInputDescriptionArgs);
DrawTextWrapped(
&dpi, { windowPos.x + WW / 2, screenCoords.y }, WW, _descriptionStringId, ft,
&dpi, { windowPos.x + WW / 2, screenCoords.y }, WW, _descriptionStringId, _descriptionArgs,
{ colours[1], TextAlignment::CENTRE });
}
@@ -373,7 +373,7 @@ private:
void window_text_input_raw_open(
rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
const_utf8string existing_text, int32_t maxLength)
const Formatter& descriptionArgs, const_utf8string existing_text, int32_t maxLength)
{
window_close_by_class(WC_TEXTINPUT);
@@ -382,7 +382,7 @@ void window_text_input_raw_open(
if (w != nullptr)
{
w->SetParentWindow(call_w, call_widget);
w->SetTitle(title, description);
w->SetTitle(title, description, descriptionArgs);
w->SetText(existing_text, maxLength);
}
}
@@ -403,10 +403,10 @@ void window_text_input_open(
void window_text_input_open(
rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
rct_string_id existing_text, uintptr_t existing_args, int32_t maxLength)
const Formatter& descriptionArgs, rct_string_id existing_text, uintptr_t existing_args, int32_t maxLength)
{
auto existingText = format_string(existing_text, &existing_args);
window_text_input_raw_open(call_w, call_widget, title, description, existingText.c_str(), maxLength);
window_text_input_raw_open(call_w, call_widget, title, description, descriptionArgs, existingText.c_str(), maxLength);
}
void window_text_input_key(rct_window* w, char keychar)