From 00f78cc8fa4ce80bef3c5d6aba21bd0cde7569a6 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Fri, 1 May 2020 13:53:28 +0100
Subject: [PATCH] Use ScreenCoordsXY for tab image offset

---
 distribution/openrct2.d.ts                 |  5 ++---
 src/openrct2-ui/scripting/CustomWindow.cpp | 16 ++++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts
index f3b09bb9a6..6a554573a4 100644
--- a/distribution/openrct2.d.ts
+++ b/distribution/openrct2.d.ts
@@ -724,7 +724,7 @@ declare global {
      * Represents the type of a widget, e.g. button or label.
      */
     type WidgetType =
-        "button" | "checkbox" | "dropdown" | "groupbox" | "label" | "spinner" | "tabview" | "viewport";
+        "button" | "checkbox" | "dropdown" | "groupbox" | "label" | "spinner" | "viewport";
 
     interface Widget {
         type: WidgetType;
@@ -822,8 +822,7 @@ declare global {
         frameBase: number;
         frameCount?: number;
         frameDuration?: number;
-        offsetX?: number;
-        offsetY?: number;
+        offset?: Coord2;
     }
 
     interface WindowTabDesc {
diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp
index 4b9df269fd..ada79e2926 100644
--- a/src/openrct2-ui/scripting/CustomWindow.cpp
+++ b/src/openrct2-ui/scripting/CustomWindow.cpp
@@ -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)
                 {