mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

Use ScreenCoordsXY for tab image offset

Browse Source
This commit is contained in:
Ted John
2020-05-01 13:53:28 +01:00
parent 65303a9f00
commit 00f78cc8fa
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,8 +185,7 @@ namespace OpenRCT2::Ui::Windows
ImageId imageFrameBase;
uint32_t imageFrameCount;
uint32_t imageFrameDuration;
int32_t offsetX;
int32_t offsetY;
ScreenCoordsXY offset;
std::vector<CustomWidgetDesc> Widgets;
static CustomTabDesc FromDukValue(const DukValue& desc)
@@ -202,8 +201,13 @@ namespace OpenRCT2::Ui::Windows
result.imageFrameBase = ImageId::FromUInt32(static_cast<uint32_t>(dukImage["frameBase"].as_int()));
result.imageFrameCount = AsOrDefault(dukImage["frameCount"], 0);
result.imageFrameDuration = AsOrDefault(dukImage["frameDuration"], 0);
result.offsetX = AsOrDefault(dukImage["offsetX"], 0);
result.offsetY = AsOrDefault(dukImage["offsetY"], 0);
auto dukCoord = dukImage["offset"];
if (dukCoord.type() == DukValue::Type::OBJECT)
{
result.offset.x = AsOrDefault(dukCoord["x"], 0);
result.offset.y = AsOrDefault(dukCoord["y"], 0);
}
}
if (desc["widgets"].is_array())
{
@@ -611,8 +615,8 @@ namespace OpenRCT2::Ui::Windows
auto widget = &w->widgets[widgetIndex];
if (widget_is_enabled(w, widgetIndex))
{
auto l = w->windowPos.x + widget->left + tab.offsetX;
auto t = w->windowPos.y + widget->top + tab.offsetY;
auto l = w->windowPos.x + widget->left + tab.offset.x;
auto t = w->windowPos.y + widget->top + tab.offset.y;
auto image = tab.imageFrameBase;
if (static_cast<size_t>(w->page) == tabIndex && tab.imageFrameDuration != 0 && tab.imageFrameCount != 0)
{