dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling of string parameters in query window caption

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-12-06 20:37:56 +00:00
parent e03b998c41
commit b6768e4f5a
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/misc_gui.cpp
View File

@@ -1194,25 +1194,27 @@ struct QueryWindow : public Window {
* overridden pretty often. We will copy these back for drawing */ * overridden pretty often. We will copy these back for drawing */
this->precomposed = false; this->precomposed = false;
CopyOutDParam(this->params, 10); CopyOutDParam(this->params, 10);
this->caption = caption;
this->message = message; this->message = message;
this->proc = callback; this->proc = callback;
this->parent = parent; this->parent = parent;
this->InitNested(WN_CONFIRM_POPUP_QUERY); this->CreateNestedTree();
this->GetWidget<NWidgetCore>(WID_Q_CAPTION)->SetDataTip(caption, STR_NULL);
this->FinishInitNested(WN_CONFIRM_POPUP_QUERY);
} }
QueryWindow(WindowDesc *desc, std::string caption, std::string message, Window *parent, QueryCallbackProc *callback) : Window(desc) QueryWindow(WindowDesc *desc, std::string caption, std::string message, Window *parent, QueryCallbackProc *callback) : Window(desc)
{ {
this->precomposed = true; this->precomposed = true;
this->caption = SPECSTR_TEMP_START;
this->message = STR_EMPTY; this->message = STR_EMPTY;
this->caption_str = std::move(caption); this->caption_str = std::move(caption);
this->message_str = std::move(message); this->message_str = std::move(message);
this->proc = callback; this->proc = callback;
this->parent = parent; this->parent = parent;
this->InitNested(WN_CONFIRM_POPUP_QUERY); this->CreateNestedTree();
this->GetWidget<NWidgetCore>(WID_Q_CAPTION)->SetDataTip(STR_JUST_RAW_STRING, STR_NULL);
this->FinishInitNested(WN_CONFIRM_POPUP_QUERY);
} }
void Close([[maybe_unused]] int data = 0) override void Close([[maybe_unused]] int data = 0) override
@@ -1234,11 +1236,10 @@ struct QueryWindow : public Window {
switch (widget) { switch (widget) {
case WID_Q_CAPTION: case WID_Q_CAPTION:
if (this->precomposed) { if (this->precomposed) {
_temp_special_strings[0] = this->caption_str; SetDParamStr(0, this->caption_str.c_str());
} else { } else {
CopyInDParam(this->params, 1); CopyInDParam(this->params);
} }
SetDParam(0, this->caption);
break; break;
case WID_Q_TEXT: case WID_Q_TEXT:
@@ -1317,7 +1318,7 @@ struct QueryWindow : public Window {
static const NWidgetPart _nested_query_widgets[] = { static const NWidgetPart _nested_query_widgets[] = {
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_RED), NWidget(WWT_CLOSEBOX, COLOUR_RED),
NWidget(WWT_CAPTION, COLOUR_RED, WID_Q_CAPTION), SetDataTip(STR_JUST_STRING, STR_NULL), NWidget(WWT_CAPTION, COLOUR_RED, WID_Q_CAPTION), // The caption's string is set in the constructor
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_RED), NWidget(WWT_PANEL, COLOUR_RED),
NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.modalpopup), NWidget(NWID_VERTICAL), SetPIP(0, WidgetDimensions::unscaled.vsep_wide, 0), SetPadding(WidgetDimensions::unscaled.modalpopup),