mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2025-12-10 15:02:06 +01:00
Code Issues Releases Wiki Activity

Codechange 7a0814c: Use SetDisplayedPlane instead of UpdateWidgetSize (#14823)

Browse Source
This commit is contained in:
mmtunligit
2025-11-25 12:05:24 +01:00
committed by GitHub
parent 3b541d4c74
commit c3f9cdf84f
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/misc_gui.cpp
View File

@@ -921,6 +921,7 @@ struct QueryStringWindow : public Window
this->flags = flags; this->flags = flags;
this->CreateNestedTree(); this->CreateNestedTree();
this->GetWidget<NWidgetStacked>(WID_QS_DEFAULT_SEL)->SetDisplayedPlane((this->flags.Test(QueryStringFlag::EnableDefault)) ? 0 : SZSP_NONE);
this->GetWidget<NWidgetStacked>(WID_QS_MOVE_SEL)->SetDisplayedPlane((this->flags.Test(QueryStringFlag::EnableMove)) ? 0 : SZSP_NONE); this->GetWidget<NWidgetStacked>(WID_QS_MOVE_SEL)->SetDisplayedPlane((this->flags.Test(QueryStringFlag::EnableMove)) ? 0 : SZSP_NONE);
this->FinishInitNested(WN_QUERY_STRING); this->FinishInitNested(WN_QUERY_STRING);
@@ -929,16 +930,6 @@ struct QueryStringWindow : public Window
this->SetFocusedWidget(WID_QS_TEXT); this->SetFocusedWidget(WID_QS_TEXT);
} }
void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
{
if (widget == WID_QS_DEFAULT && !this->flags.Test(QueryStringFlag::EnableDefault)) {
/* We don't want this widget to show! */
fill.width = 0;
resize.width = 0;
size.width = 0;
}
}
std::string GetWidgetString(WidgetID widget, StringID stringid) const override std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{ {
if (widget == WID_QS_CAPTION) return GetString(this->editbox.caption); if (widget == WID_QS_CAPTION) return GetString(this->editbox.caption);
@@ -1041,7 +1032,9 @@ static constexpr std::initializer_list<NWidgetPart> _nested_query_string_widgets
NWidget(WWT_EDITBOX, COLOUR_GREY, WID_QS_TEXT), SetMinimalSize(256, 0), SetFill(1, 0), SetPadding(2, 2, 2, 2), NWidget(WWT_EDITBOX, COLOUR_GREY, WID_QS_TEXT), SetMinimalSize(256, 0), SetFill(1, 0), SetPadding(2, 2, 2, 2),
EndContainer(), EndContainer(),
NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_DEFAULT), SetMinimalSize(65, 12), SetFill(1, 1), SetStringTip(STR_BUTTON_DEFAULT), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_QS_DEFAULT_SEL),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_DEFAULT), SetMinimalSize(65, 12), SetFill(1, 1), SetStringTip(STR_BUTTON_DEFAULT),
EndContainer(),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_CANCEL), SetMinimalSize(65, 12), SetFill(1, 1), SetStringTip(STR_BUTTON_CANCEL), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_CANCEL), SetMinimalSize(65, 12), SetFill(1, 1), SetStringTip(STR_BUTTON_CANCEL),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_OK), SetMinimalSize(65, 12), SetFill(1, 1), SetStringTip(STR_BUTTON_OK), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_QS_OK), SetMinimalSize(65, 12), SetFill(1, 1), SetStringTip(STR_BUTTON_OK),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_QS_MOVE_SEL), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_QS_MOVE_SEL),

1
src/widgets/misc_widget.h
View File

@@ -33,6 +33,7 @@ enum QueryStringWidgets : WidgetID {
WID_QS_CAPTION, ///< Caption of the window. WID_QS_CAPTION, ///< Caption of the window.
WID_QS_TEXT, ///< Text of the query. WID_QS_TEXT, ///< Text of the query.
WID_QS_DEFAULT, ///< Default button. WID_QS_DEFAULT, ///< Default button.
WID_QS_DEFAULT_SEL, ///< Container for default button, which can be hidden.
WID_QS_CANCEL, ///< Cancel button. WID_QS_CANCEL, ///< Cancel button.
WID_QS_OK, ///< OK button. WID_QS_OK, ///< OK button.
WID_QS_MOVE, ///< Move button. WID_QS_MOVE, ///< Move button.