From 36f87b3b8df4ddaa167bba781fb8db98274958c1 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:21:53 +1000
Subject: [PATCH] Update Frame and BaseFrame

---
 Basalt/objects/BaseFrame.lua | 16 ++++++++++++++++
 Basalt/objects/Frame.lua     | 16 ++++++++++++++++
 Basalt/plugins/xml.lua       |  5 ++---
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/Basalt/objects/BaseFrame.lua b/Basalt/objects/BaseFrame.lua
index c990252..d3d9968 100644
--- a/Basalt/objects/BaseFrame.lua
+++ b/Basalt/objects/BaseFrame.lua
@@ -41,6 +41,22 @@ return function(name, basalt)
             return self
         end,
 
+        getXOffset = function(self)
+            return xOffset
+        end,
+
+        setXOffset = function(self, newXOffset)
+            return self:setOffset(newXOffset, yOffset)
+        end,
+
+        getYOffset = function(self)
+            return yOffset
+        end,
+
+        setYOffset = function(self, newYOffset)
+            return self:setOffset(xOffset, newYOffset)
+        end,
+
         setPalette = function(self, col, ...)            
             if(self==basalt.getActiveFrame())then
                 if(type(col)=="string")then
diff --git a/Basalt/objects/Frame.lua b/Basalt/objects/Frame.lua
index 2b5fa29..646d8a7 100644
--- a/Basalt/objects/Frame.lua
+++ b/Basalt/objects/Frame.lua
@@ -38,6 +38,22 @@ return function(name, basalt)
             return self
         end,
 
+        getXOffset = function(self)
+            return xOffset
+        end,
+
+        setXOffset = function(self, newXOffset)
+            return self:setOffset(newXOffset, yOffset)
+        end,
+
+        getYOffset = function(self)
+            return yOffset
+        end,
+
+        setYOffset = function(self, newYOffset)
+            return self:setOffset(xOffset, newYOffset)
+        end,
+
         setParent = function(self, p, ...)
             base.setParent(self, p, ...)
             parent = p
diff --git a/Basalt/plugins/xml.lua b/Basalt/plugins/xml.lua
index c146f62..32223c1 100644
--- a/Basalt/plugins/xml.lua
+++ b/Basalt/plugins/xml.lua
@@ -415,8 +415,8 @@ return {
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
-                    "layout",
-                    "xOffset"
+                    "xOffset",
+                    "yOffset"
                 })
                 return self
             end,
@@ -429,7 +429,6 @@ return {
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
-                    "layout",
                     "xOffset",
                     "yOffset"
                 })