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

Allow using ImageId in widgets directly

Browse Source
This commit is contained in:
Gymnasiast
2022-12-24 17:47:22 +01:00
parent 162b01204d
commit 38f7c2a159
43 changed files with 260 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/scripting/CustomWindow.cpp
View File

@@ -902,7 +902,7 @@ namespace OpenRCT2::Ui::Windows
widget.right = widget.left + 30;
widget.top = 17;
widget.bottom = 43;
widget.image = ImageId(SPR_TAB, FilterPaletteID::PaletteNull).ToUInt32();
widget.image = ImageId(SPR_TAB, FilterPaletteID::PaletteNull);
widget.tooltip = STR_NONE;
widgetList.push_back(widget);
info.WidgetIndexMap.push_back(std::numeric_limits<size_t>::max());
@@ -974,7 +974,7 @@ namespace OpenRCT2::Ui::Windows
if (desc.Image.HasValue())
{
widget.type = desc.HasBorder ? WindowWidgetType::ImgBtn : WindowWidgetType::FlatBtn;
widget.image = desc.Image.ToUInt32();
widget.image = desc.Image;
}
else
{
@@ -1002,7 +1002,7 @@ namespace OpenRCT2::Ui::Windows
else if (desc.Type == "colourpicker")
{
widget.type = WindowWidgetType::ColourBtn;
widget.image = GetColourButtonImage(desc.Colour).ToUInt32();
widget.image = GetColourButtonImage(desc.Colour);
widgetList.push_back(widget);
}
else if (desc.Type == "custom")
@@ -1237,7 +1237,7 @@ namespace OpenRCT2::Ui::Windows
if (lastColour != colour && colour < COLOUR_COUNT)
{
customWidgetInfo->Colour = colour;
widget.image = GetColourButtonImage(colour).ToUInt32();
widget.image = GetColourButtonImage(colour);
widget_invalidate(*w, widgetIndex);
std::vector<DukValue> args;