mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Consolidate groupbox drawing code

Browse Source
This commit is contained in:
Aaron van Geffen
2025-04-17 00:02:29 +02:00
parent 2de3e96dfb
commit d2d9c15cc3
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/openrct2-ui/interface/Widget.cpp
View File

@@ -447,26 +447,6 @@ namespace OpenRCT2::Ui
WidgetText(dpi, w, widgetIndex); WidgetText(dpi, w, widgetIndex);
} }
static std::pair<StringId, void*> WidgetGetStringidAndArgs(const Widget& widget)
{
auto stringId = widget.text;
void* formatArgs = gCommonFormatArgs;
if (widget.flags & WIDGET_FLAGS::TEXT_IS_STRING)
{
if (widget.string == nullptr || widget.string[0] == '\0')
{
stringId = kStringIdNone;
formatArgs = nullptr;
}
else
{
stringId = STR_STRING;
formatArgs = const_cast<void*>(reinterpret_cast<const void*>(&widget.string));
}
}
return std::make_pair(stringId, formatArgs);
}
/** /**
* *
* rct2: 0x006EB535 * rct2: 0x006EB535
@@ -482,7 +462,21 @@ namespace OpenRCT2::Ui
auto textRight = l; auto textRight = l;
// Text // Text
auto [stringId, formatArgs] = WidgetGetStringidAndArgs(widget); auto stringId = widget.text;
auto rawFt = Formatter::Common();
if (widget.flags & WIDGET_FLAGS::TEXT_IS_STRING)
{
if (widget.string != nullptr && widget.string[0] != '\0')
{
stringId = STR_STRING;
rawFt.Add<utf8*>(widget.string);
}
else
{
stringId = kStringIdNone;
}
}
if (stringId != kStringIdNone) if (stringId != kStringIdNone)
{ {
auto colour = w.colours[widget.colour].withFlag(ColourFlag::translucent, false); auto colour = w.colours[widget.colour].withFlag(ColourFlag::translucent, false);
@@ -490,7 +484,8 @@ namespace OpenRCT2::Ui
colour.setFlag(ColourFlag::inset, true); colour.setFlag(ColourFlag::inset, true);
utf8 buffer[512] = { 0 }; utf8 buffer[512] = { 0 };
OpenRCT2::FormatStringLegacy(buffer, sizeof(buffer), stringId, formatArgs); OpenRCT2::FormatStringLegacy(buffer, sizeof(buffer), stringId, rawFt.Data());
auto ft = Formatter(); auto ft = Formatter();
ft.Add<utf8*>(buffer); ft.Add<utf8*>(buffer);
DrawTextBasic(dpi, { l, t }, STR_STRING, ft, { colour }); DrawTextBasic(dpi, { l, t }, STR_STRING, ft, { colour });