From 8e7adbc60d83549897e748b8bfa21ee8ccd3646d Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 01:52:45 +1000
Subject: [PATCH 01/23] Fuck

---
 Basalt/objects/Container.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Basalt/objects/Container.lua b/Basalt/objects/Container.lua
index 2e7cc4c..055ec75 100644
--- a/Basalt/objects/Container.lua
+++ b/Basalt/objects/Container.lua
@@ -386,7 +386,7 @@ return function(name, basalt)
 
     for objectName, _ in pairs(basalt.getObjects()) do
         container["add" .. objectName] = function(self, id)
-            return addObject(self, basalt.createObject(objectName, id, basalt))
+            return addObject(self, basalt:createObject(objectName, id))
         end
     end
 
-- 
2.49.1


From 015666ad14939186de435d6d91b63ec68669a598 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 01:54:12 +1000
Subject: [PATCH 02/23] Fuck (#79)

---
 Basalt/objects/Container.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Basalt/objects/Container.lua b/Basalt/objects/Container.lua
index 2e7cc4c..055ec75 100644
--- a/Basalt/objects/Container.lua
+++ b/Basalt/objects/Container.lua
@@ -386,7 +386,7 @@ return function(name, basalt)
 
     for objectName, _ in pairs(basalt.getObjects()) do
         container["add" .. objectName] = function(self, id)
-            return addObject(self, basalt.createObject(objectName, id, basalt))
+            return addObject(self, basalt:createObject(objectName, id))
         end
     end
 
-- 
2.49.1


From 79e9a14c1c8dd1f2f029383d1beaa404cf685d2a Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:10:26 +1000
Subject: [PATCH 03/23] Add getProperty() and setProperty()

---
 Basalt/objects/Object.lua |  16 +-
 Basalt/plugins/xml.lua    | 348 +-------------------------------------
 2 files changed, 17 insertions(+), 347 deletions(-)

diff --git a/Basalt/objects/Object.lua b/Basalt/objects/Object.lua
index 8bf4f18..ca27977 100644
--- a/Basalt/objects/Object.lua
+++ b/Basalt/objects/Object.lua
@@ -33,7 +33,21 @@ return function(name, basalt)
         isType = function(self, t)
             return objectType==t
         end,
-        
+
+        getProperty = function(self, name)
+            local get = self["get" .. name:gsub("^%l", string.upper)]
+            if (get ~= nil) then
+                return get(self)
+            end
+        end,
+
+        setProperty = function(self, name, ...)
+            local set = self["set" .. name:gsub("^%l", string.upper)]
+            if (set ~= nil) then
+                return set(self, ...)
+            end
+        end,
+
         getName = function(self)
             return name
         end,
diff --git a/Basalt/plugins/xml.lua b/Basalt/plugins/xml.lua
index 37f8dbc..c146f62 100644
--- a/Basalt/plugins/xml.lua
+++ b/Basalt/plugins/xml.lua
@@ -256,30 +256,11 @@ return {
     VisualObject = function(base, basalt)
 
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                local x, y = self:getPosition()
-                local w, h = self:getSize()
-                if (name == "x") then
-                    self:setPosition(value, y)
-                elseif (name == "y") then
-                    self:setPosition(x, value)
-                elseif (name == "width") then
-                    self:setSize(value, h)
-                elseif (name == "height") then
-                    self:setSize(w, value)
-                elseif (name == "background") then
-                    self:setBackground(colors[value])
-                elseif (name == "foreground") then
-                    self:setForeground(colors[value])
-                end
-            end,
-
             updateSpecifiedValuesByXMLData = function(self, data, valueNames)
                 for _, name in ipairs(valueNames) do
                     local value = xmlValue(name, data)
                     if (value ~= nil) then
-                        self:updateValue(name, value)
+                        self:setProperty(name, value)
                     end
                 end
             end,
@@ -289,7 +270,7 @@ return {
                 for prop, expression in pairs(data:reactiveProperties()) do
                     local update = function()
                         local value = load("return " .. expression, nil, "t", renderContext.env)()
-                        self:updateValue(prop, value)
+                        self:setProperty(prop, value)
                     end
                     basalt.effect(update)
                 end
@@ -326,14 +307,6 @@ return {
 
     ChangeableObject = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "value") then
-                    self:setValue(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -439,17 +412,6 @@ return {
 
     BaseFrame = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local _, yOffset = self:getOffset()
-                if (name == "layout") then
-                    self:setLayout(value)
-                elseif (name == "xOffset") then
-                    self:setOffset(value, yOffset)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -464,19 +426,6 @@ return {
 
     Frame = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local xOffset, yOffset = self:getOffset()
-                if (name == "layout") then
-                    self:setLayout(value)
-                elseif (name == "xOffset") then
-                    self:setOffset(value, yOffset)
-                elseif (name == "yOffset") then
-                    self:setOffset(xOffset, value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -492,20 +441,6 @@ return {
 
     Flexbox = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "flexDirection") then
-                    self:setFlexDirection(value)
-                elseif (name == "justifyContent") then
-                    self:setJustifyContent(value)
-                elseif (name == "alignItems") then
-                    self:setAlignItems(value)
-                elseif (name == "spacing") then
-                    self:setSpacing(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -522,18 +457,6 @@ return {
 
     Button = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "text") then
-                    self:setText(value)
-                elseif (name == "horizontalAlign") then
-                    self:setHorizontalAlign(value)
-                elseif (name == "verticalAlign") then
-                    self:setVerticalAlign(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -549,16 +472,6 @@ return {
 
     Label = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "text") then
-                    self:setText(value)
-                elseif (name == "align") then
-                    self:setAlign(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -573,27 +486,6 @@ return {
 
     Input = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local defaultText, defaultFG, defaultBG = self:getDefaultText()
-                if (name == "defaultText") then
-                    self:setDefaultText(value, defaultFG, defaultBG)
-                elseif (name == "defaultFG") then
-                    self:setDefaultText(defaultText, value, defaultBG)
-                elseif (name == "defaultBG") then
-                    self:setDefaultText(defaultText, defaultFG, value)
-                elseif (name == "offset") then
-                    self:setOffset(value)
-                elseif (name == "textOffset") then
-                    self:setTextOffset(value)
-                elseif (name == "text") then
-                    self:setText(value)
-                elseif (name == "inputLimit") then
-                    self:setInputLimit(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -613,23 +505,6 @@ return {
 
     Image = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local xOffset, yOffset = self:getOffset()
-                if (name == "xOffset") then
-                    self:setOffset(value, yOffset)
-                elseif (name == "yOffset") then
-                    self:setOffset(xOffset, value)
-                elseif (name == "path") then
-                    self:loadImage(value)
-                elseif (name == "usePalette") then
-                    self:usePalette(value)
-                elseif (name == "play") then
-                    self:play(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -647,23 +522,6 @@ return {
 
     Checkbox = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local activeSymbol, inactiveSymbol = self:getSymbol()
-                if (name == "text") then
-                    self:setText(value)
-                elseif (name == "checked") then
-                    self:setChecked(value)
-                elseif (name == "textPosition") then
-                    self:setTextPosition(value)
-                elseif (name == "activeSymbol") then
-                    self:setSymbol(value, inactiveSymbol)
-                elseif (name == "inactiveSymbol") then
-                    self:setSymbol(activeSymbol, value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -681,14 +539,6 @@ return {
 
     Program = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "execute") then
-                    self:execute(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -702,25 +552,6 @@ return {
 
     Progressbar = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local activeBarColor, activeBarSymbol, activeBarSymbolCol = self:getProgressBar()
-                if (name == "direction") then
-                    self:setDirection(value)
-                elseif (name == "activeBarColor") then
-                    self:setProgressBar(value, activeBarSymbol, activeBarSymbolCol)
-                elseif (name == "activeBarSymbol") then
-                    self:setProgressBar(activeBarColor, value, activeBarSymbolCol)
-                elseif (name == "activeBarSymbolColor") then
-                    self:setProgressBar(activeBarColor, activeBarSymbol, value)
-                elseif (name == "backgroundSymbol") then
-                    self:setBackgroundSymbol(value)
-                elseif (name == "progress") then
-                    self:setProgress(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -739,22 +570,6 @@ return {
 
     Slider = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "symbol") then
-                    self:setSymbol(value)
-                elseif (name == "symbolColor") then
-                    self:setSymbolColor(value)
-                elseif (name == "index") then
-                    self:setIndex(value)
-                elseif (name == "maxValue") then
-                    self:setMaxValue(value)
-                elseif (name == "barType") then
-                    self:setBarType(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -772,26 +587,6 @@ return {
 
     Scrollbar = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "symbol") then
-                    self:setSymbol(value)
-                elseif (name == "symbolColor") then
-                    self:setSymbolColor(value)
-                elseif (name == "symbolSize") then
-                    self:setSymbolSize(value)
-                elseif (name == "scrollAmount") then
-                    self:setScrollAmount(value)
-                elseif (name == "index") then
-                    self:setIndex(value)
-                elseif (name == "maxValue") then
-                    self:setMaxValue(value)
-                elseif (name == "barType") then
-                    self:setBarType(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -811,14 +606,6 @@ return {
 
     MonitorFrame = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "monitor") then
-                    self:setMonitor(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -832,18 +619,6 @@ return {
 
     Switch = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "symbol") then
-                    self:setSymbol(value)
-                elseif (name == "activeBackground") then
-                    self:setActiveBackground(value)
-                elseif (name == "inactiveBackground") then
-                    self:setInactiveBackground(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -859,22 +634,6 @@ return {
 
     Textfield = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local fgSel, bgSel = self:getSelection()
-                local xOffset, yOffset = self:getOffset()
-                if (name == "bgSelection") then
-                    self:setSelection(fgSel, value)
-                elseif (name == "fgSelection") then
-                    self:setSelection(value, bgSel)
-                elseif (name == "xOffset") then
-                    self:setOffset(value, yOffset)
-                elseif (name == "yOffset") then
-                    self:setOffset(xOffset, value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -943,16 +702,6 @@ return {
 
     Timer = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "start") then
-                    self:start(value)
-                elseif (name == "time") then
-                    self:setTime(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -970,23 +719,6 @@ return {
 
     List = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local selBg, selFg = self:getSelectionColor()
-                if (name == "align") then
-                    self:setTextAlign(value)
-                elseif (name == "offset") then
-                    self:setOffset(value)
-                elseif (name == "selectionBg") then
-                    self:setSelectionColor(value, selFg)
-                elseif (name == "selectionFg") then
-                    self:setSelectionColor(selBg, value)
-                elseif (name == "scrollable") then
-                    self:setScrollable(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -1014,17 +746,6 @@ return {
 
     Dropdown = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local w, h = self:getDropdownSize()
-                if (name == "dropdownWidth") then
-                    self:setDropdownSize(value, h)
-                elseif (name == "dropdownHeight") then
-                    self:setDropdownSize(w, value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -1039,22 +760,6 @@ return {
 
     Radio = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local selBg, selFg = self:getBoxSelectionColor()
-                local defBg, defFg = self:setBoxDefaultColor()
-                if (name == "selectionBg") then
-                    self:setBoxSelectionColor(value, selFg)
-                elseif (name == "selectionFg") then
-                    self:setBoxSelectionColor(selBg, value)
-                elseif (name == "defaultBg") then
-                    self:setBoxDefaultColor(value, defFg)
-                elseif (name == "defaultFg") then
-                    self:setBoxDefaultColor(defBg, value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -1079,16 +784,6 @@ return {
 
     Menubar = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                if (name == "space") then
-                    self:setSpace(value)
-                elseif (name == "scrollable") then
-                    self:setScrollable(value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -1103,25 +798,6 @@ return {
 
     Graph = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local symbol, symbolCol = self:getGraphSymbol()
-                if (name == "maxEntries") then
-                    self:setMaxEntries(value)
-                elseif (name == "type") then
-                    self:setType(value)
-                elseif (name == "minValue") then
-                    self:setMinValue(value)
-                elseif (name == "maxValue") then
-                    self:setMaxValue(value)
-                elseif (name == "symbol") then
-                    self:setGraphSymbol(value, symbolCol)
-                elseif (name == "symbolColor") then
-                    self:setGraphSymbol(symbol, value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
@@ -1147,26 +823,6 @@ return {
 
     Treeview = function(base, basalt)
         local object = {
-            updateValue = function(self, name, value)
-                if (value == nil) then return end
-                base.updateValue(self, name, value)
-                local selBg, selFg = self:getSelectionColor()
-                local xOffset, yOffset = self:getOffset()
-                if (name == "space") then
-                    self:setSpace(value)
-                elseif (name == "scrollable") then
-                    self:setScrollable(value)
-                elseif (name == "selectionBg") then
-                    self:setSelectionColor(value, selFg)
-                elseif (name == "selectionFg") then
-                    self:setSelectionColor(selBg, value)
-                elseif (name == "xOffset") then
-                    self:setOffset(value, yOffset)
-                elseif (name == "yOffset") then
-                    self:setOffset(xOffset, value)
-                end
-            end,
-
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
-- 
2.49.1


From e068c3f09c37984c8f08bb5335768dcf1fe8053a Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:16:10 +1000
Subject: [PATCH 04/23] Add getters and setters to VisualObject

---
 Basalt/objects/VisualObject.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Basalt/objects/VisualObject.lua b/Basalt/objects/VisualObject.lua
index 840cf2e..bac7ba7 100644
--- a/Basalt/objects/VisualObject.lua
+++ b/Basalt/objects/VisualObject.lua
@@ -138,10 +138,18 @@ return function(name, basalt)
             return x
         end,
 
+        setX = function(self, newX)
+            return self:setPosition(newX, y)
+        end,
+
         getY = function(self)
             return y
         end,
 
+        setY = function(self, newY)
+            return self:setPosition(x, newY)
+        end,
+
         getPosition = function(self)
             return x, y
         end,
@@ -167,10 +175,18 @@ return function(name, basalt)
             return height
         end,
 
+        setHeight = function(self, newHeight)
+            return self:setSize(width, newHeight)
+        end,
+
         getWidth = function(self)
             return width
         end,
 
+        setWidth = function(self, newWidth)
+            return self:setSize(newWidth, height)
+        end,
+
         getSize = function(self)
             return width, height
         end,
-- 
2.49.1


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 05/23] 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"
                 })
-- 
2.49.1


From 7a6c9480f8e98899e93b9370af69e8bb841a4cb1 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:23:28 +1000
Subject: [PATCH 06/23] Update Flexbox

---
 Basalt/objects/Flexbox.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Basalt/objects/Flexbox.lua b/Basalt/objects/Flexbox.lua
index f7a97a8..c7f0b95 100644
--- a/Basalt/objects/Flexbox.lua
+++ b/Basalt/objects/Flexbox.lua
@@ -76,6 +76,10 @@ return function(name, basalt)
             return spacing
         end,
 
+        getFlexDirection = function(self)
+            return flexDirection
+        end,
+
         setFlexDirection = function(self, direction)
             if direction == "row" or direction == "column" then
                 flexDirection = direction
@@ -84,6 +88,10 @@ return function(name, basalt)
             return self
         end,
 
+        getJustifyContent = function(self)
+            return justifyContent
+        end,
+
         setJustifyContent = function(self, alignment)
             if alignment == "flex-start" or alignment == "flex-end" or alignment == "center" or alignment == "space-between" or alignment == "space-around" then
                 justifyContent = alignment
@@ -92,6 +100,10 @@ return function(name, basalt)
             return self
         end,
 
+        getAlignItems = function(self)
+            return alignItems
+        end,
+
         setAlignItems = function(self, alignment)
             if alignment == "flex-start" or alignment == "flex-end" or alignment == "center" or alignment == "space-between" or alignment == "space-around" then
                 alignItems = alignment
-- 
2.49.1


From 84b3263ff2d57483785f79ba6332f80de4bfcf50 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:29:35 +1000
Subject: [PATCH 07/23] Update Button and Label

---
 Basalt/objects/Button.lua | 14 +++++++++++++-
 Basalt/objects/Label.lua  |  6 ++++++
 Basalt/plugins/xml.lua    |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Basalt/objects/Button.lua b/Basalt/objects/Button.lua
index e5659f4..f2a5d3b 100644
--- a/Basalt/objects/Button.lua
+++ b/Basalt/objects/Button.lua
@@ -23,7 +23,11 @@ return function(name, basalt)
 
         getBase = function(self)
             return base
-        end,  
+        end,
+
+        getHorizontalAlign = function(self)
+            return textHorizontalAlign
+        end,
         
         setHorizontalAlign = function(self, pos)
             textHorizontalAlign = pos
@@ -31,12 +35,20 @@ return function(name, basalt)
             return self
         end,
 
+        getVerticalAlign = function(self)
+            return textVerticalAlign
+        end,
+
         setVerticalAlign = function(self, pos)
             textVerticalAlign = pos
             self:updateDraw()
             return self
         end,
 
+        getText = function(self)
+            return text
+        end,
+
         setText = function(self, newText)
             text = newText
             self:updateDraw()
diff --git a/Basalt/objects/Label.lua b/Basalt/objects/Label.lua
index 160558c..f25b86c 100644
--- a/Basalt/objects/Label.lua
+++ b/Basalt/objects/Label.lua
@@ -77,6 +77,12 @@ return function(name, basalt)
             return self
         end,
 
+        --- Gets the text alignment of the label.
+        --- @return string
+        getTextAlign = function(self)
+            return textAlign
+        end,
+
         --- Sets the text alignment of the label.
         --- @param align string  The alignment of the text. Can be "left", "center", or "right".
         --- @return object
diff --git a/Basalt/plugins/xml.lua b/Basalt/plugins/xml.lua
index 32223c1..5d0ee5b 100644
--- a/Basalt/plugins/xml.lua
+++ b/Basalt/plugins/xml.lua
@@ -475,7 +475,7 @@ return {
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
                     "text",
-                    "align"
+                    "textAlign"
                 })
                 return self
             end,
-- 
2.49.1


From 818f7ef134362cd2c15706816912651a219fb877 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:31:13 +1000
Subject: [PATCH 08/23] Update Input

---
 Basalt/objects/Input.lua | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Basalt/objects/Input.lua b/Basalt/objects/Input.lua
index 5eb239e..7e41d43 100644
--- a/Basalt/objects/Input.lua
+++ b/Basalt/objects/Input.lua
@@ -37,6 +37,14 @@ return function(name, basalt)
             return objectType==t or base.isType~=nil and base.isType(t) or false
         end,
 
+        setDefaultFG = function(self, fCol)
+            return self:setDefaultText(self, defaultText, fCol, nil)
+        end,
+
+        setDefaultBG = function(self, bCol)
+            return self:setDefaultText(self, defaultText, nil, bCol)
+        end,
+
         setDefaultText = function(self, text, fCol, bCol)
             defaultText = text
             defaultFGCol = fCol or defaultFGCol
-- 
2.49.1


From 69318a6b0c0a4d103c11917e3bbc48f74b9767a9 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:40:25 +1000
Subject: [PATCH 09/23] Update Image

---
 Basalt/objects/BaseFrame.lua |  4 ++--
 Basalt/objects/Frame.lua     |  4 ++--
 Basalt/objects/Image.lua     | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Basalt/objects/BaseFrame.lua b/Basalt/objects/BaseFrame.lua
index d3d9968..9e46b10 100644
--- a/Basalt/objects/BaseFrame.lua
+++ b/Basalt/objects/BaseFrame.lua
@@ -46,7 +46,7 @@ return function(name, basalt)
         end,
 
         setXOffset = function(self, newXOffset)
-            return self:setOffset(newXOffset, yOffset)
+            return self:setOffset(newXOffset, nil)
         end,
 
         getYOffset = function(self)
@@ -54,7 +54,7 @@ return function(name, basalt)
         end,
 
         setYOffset = function(self, newYOffset)
-            return self:setOffset(xOffset, newYOffset)
+            return self:setOffset(nil, newYOffset)
         end,
 
         setPalette = function(self, col, ...)            
diff --git a/Basalt/objects/Frame.lua b/Basalt/objects/Frame.lua
index 646d8a7..838e15a 100644
--- a/Basalt/objects/Frame.lua
+++ b/Basalt/objects/Frame.lua
@@ -43,7 +43,7 @@ return function(name, basalt)
         end,
 
         setXOffset = function(self, newXOffset)
-            return self:setOffset(newXOffset, yOffset)
+            return self:setOffset(newXOffset, nil)
         end,
 
         getYOffset = function(self)
@@ -51,7 +51,7 @@ return function(name, basalt)
         end,
 
         setYOffset = function(self, newYOffset)
-            return self:setOffset(xOffset, newYOffset)
+            return self:setOffset(nil, newYOffset)
         end,
 
         setParent = function(self, p, ...)
diff --git a/Basalt/objects/Image.lua b/Basalt/objects/Image.lua
index 5e6d7fb..9580aa7 100644
--- a/Basalt/objects/Image.lua
+++ b/Basalt/objects/Image.lua
@@ -73,6 +73,14 @@ return function(name, basalt)
             return self
         end,
 
+        setXOffset = function(self, _x)
+            return self:setOffset(self, _x, nil)
+        end,
+
+        setYOffset = function(self, _y)
+            return self:setOffset(self, nil, _y)
+        end,
+
         setSize = function(self, _x, _y)
             base:setSize(_x, _y)
             autoSize = false
@@ -83,6 +91,14 @@ return function(name, basalt)
             return xOffset, yOffset
         end,
 
+        getXOffset = function(self)
+            return xOffset
+        end,
+
+        getYOffset = function(self)
+            return yOffset
+        end,
+
         selectFrame = function(self, id)
             if(bimgLibrary.getFrameObject(id)==nil)then
                 bimgLibrary.addFrame(id)
@@ -142,6 +158,10 @@ return function(name, basalt)
             return self
         end,
 
+        setPath = function(self, path)
+            return self:loadImage(path)
+        end,
+
         setImage = function(self, t)
             if(type(t)=="table")then
                 bimgLibrary = bimg(t)
@@ -176,6 +196,14 @@ return function(name, basalt)
             return self
         end,
 
+        getUsePalette = function(self)
+            return usePalette
+        end,
+
+        setUsePalette = function(self, use)
+            return self:usePalette(use)
+        end,
+
         play = function(self, inf)
             if(bimgLibrary.getMetadata("animated"))then
                 local t = bimgLibrary.getMetadata("duration") or bimgLibrary.getMetadata("secondsPerFrame") or 0.2
@@ -186,6 +214,10 @@ return function(name, basalt)
             return self
         end,
 
+        setPlay = function(self, inf)
+            return self:play(inf)
+        end,
+
         stop = function(self)
             os.cancelTimer(animTimer)
             animTimer = nil
-- 
2.49.1


From eb08f1efcf8e96f155dab801013b25e3ae39b328 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:43:08 +1000
Subject: [PATCH 10/23] Update Checkbox

---
 Basalt/objects/Checkbox.lua | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Basalt/objects/Checkbox.lua b/Basalt/objects/Checkbox.lua
index 0dfc3d5..298f82c 100644
--- a/Basalt/objects/Checkbox.lua
+++ b/Basalt/objects/Checkbox.lua
@@ -32,22 +32,48 @@ return function(name, basalt)
             return self
         end,
 
+        setActiveSymbol = function(self, sym)
+            return self:setSymbol(sym, nil)
+        end,
+
+        setInactiveSymbol = function(self, inactive)
+            return self:setSymbol(nil, inactive)
+        end,
+
         getSymbol = function(self)
             return symbol, inactiveSymbol
         end,
 
+        getActiveSymbol = function(self)
+            return symbol
+        end,
+
+        getInactiveSymbol = function(self)
+            return inactiveSymbol
+        end,
+
         setText = function(self, _text)
             text = _text
             return self
         end,
 
+        getText = function(self)
+            return text
+        end,
+
         setTextPosition = function(self, pos)
             textPos = pos or textPos
             return self
         end,
 
+        getTextPosition = function(self)
+            return textPos
+        end,
+
         setChecked = base.setValue,
 
+        getChecked = base.getValue,
+
         mouseHandler = function(self, button, x, y)
             if (base.mouseHandler(self, button, x, y)) then
                 if(button == 1)then
-- 
2.49.1


From 8adf05de0fad3cbfa9fb364e27b65f7d262e706a Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:44:36 +1000
Subject: [PATCH 11/23] Update Program

---
 Basalt/objects/Program.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Basalt/objects/Program.lua b/Basalt/objects/Program.lua
index 38bb457..32e9380 100644
--- a/Basalt/objects/Program.lua
+++ b/Basalt/objects/Program.lua
@@ -479,6 +479,10 @@ return function(name, basalt)
             return self
         end;
 
+        setExecute = function(self, path, ...)
+            return self:execute(path, ...)
+        end,
+
         stop = function(self)            
             local parent = self:getParent()
             if (curProcess ~= nil) then
-- 
2.49.1


From 3bae0eca9eaa846349ceba43574ab53b8f9721d6 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:48:03 +1000
Subject: [PATCH 12/23] Update Progressbar

---
 Basalt/objects/Progressbar.lua | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/Basalt/objects/Progressbar.lua b/Basalt/objects/Progressbar.lua
index b942ca9..6520862 100644
--- a/Basalt/objects/Progressbar.lua
+++ b/Basalt/objects/Progressbar.lua
@@ -25,6 +25,10 @@ return function(name, basalt)
             return self
         end,
 
+        getDirection = function(self)
+            return direction
+        end,
+
         setProgressBar = function(self, color, symbol, symbolcolor)
             activeBarColor = color or activeBarColor
             activeBarSymbol = symbol or activeBarSymbol
@@ -37,12 +41,40 @@ return function(name, basalt)
             return activeBarColor, activeBarSymbol, activeBarSymbolCol
         end,
 
+        setActiveBarColor = function(self, color)
+            return self:setProgressBar(color, nil, nil)
+        end,
+
+        getActiveBarColor = function(self)
+            return activeBarColor
+        end,
+
+        setActiveBarSymbol = function(self, symbol)
+            return self:setProgressBar(nil, symbol, nil)
+        end,
+
+        getActiveBarSymbol = function(self)
+            return activeBarSymbol
+        end,
+
+        setActiveBarSymbolColor = function(self, symbolColor)
+            return self:setProgressBar(nil, nil, symbolColor)
+        end,
+
+        getActiveBarSymbolColor = function(self)
+            return activeBarSymbolCol
+        end,
+
         setBackgroundSymbol = function(self, symbol)
             bgBarSymbol = symbol:sub(1, 1)
             self:updateDraw()
             return self
         end,
 
+        getBackgroundSymbol = function(self)
+            return bgBarSymbol
+        end,
+
         setProgress = function(self, value)
             if (value >= 0) and (value <= 100) and (progress ~= value) then
                 progress = value
-- 
2.49.1


From 9d9947073ae41844ca94eb817bc4ce0db025bab2 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:49:59 +1000
Subject: [PATCH 13/23] Update Slider

---
 Basalt/objects/Slider.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Basalt/objects/Slider.lua b/Basalt/objects/Slider.lua
index 1bbbda3..5bc6ac0 100644
--- a/Basalt/objects/Slider.lua
+++ b/Basalt/objects/Slider.lua
@@ -46,6 +46,10 @@ return function(name, basalt)
             return self
         end,
 
+        getSymbol = function(self)
+            return symbol
+        end,
+
         setIndex = function(self, _index)
             index = _index
             if (index < 1) then
@@ -67,18 +71,30 @@ return function(name, basalt)
             return self
         end,
 
+        getMaxValue = function(self)
+            return maxValue
+        end,
+
         setSymbolColor = function(self, col)
             symbolColor = col
             self:updateDraw()
             return self
         end,
 
+        getSymbolColor = function(self)
+            return symbolColor
+        end,
+
         setBarType = function(self, _typ)
             barType = _typ:lower()
             self:updateDraw()
             return self
         end,
 
+        getBarType = function(self)
+            return barType
+        end,
+
         mouseHandler = function(self, button, x, y)
             if (base.mouseHandler(self, button, x, y)) then
                 mouseEvent(self, button, x, y)
-- 
2.49.1


From f304c98ce815b57d22be04291b56ce0e4d295590 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:54:55 +1000
Subject: [PATCH 14/23] Update Scrollbar

---
 Basalt/objects/Scrollbar.lua | 32 ++++++++++++++++++++++++++++++++
 Basalt/plugins/xml.lua       |  4 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/Basalt/objects/Scrollbar.lua b/Basalt/objects/Scrollbar.lua
index 5b2ad8e..63ecf94 100644
--- a/Basalt/objects/Scrollbar.lua
+++ b/Basalt/objects/Scrollbar.lua
@@ -62,6 +62,26 @@ return function(name, basalt)
             return self
         end,
 
+        setSymbolBG = function(self, bg)
+            return self:setSymbol(symbol, bg, nil)
+        end,
+
+        setSymbolFG = function(self, fg)
+            return self:setSymbol(symbol, nil, fg)
+        end,
+
+        getSymbol = function(self)
+            return symbol
+        end,
+
+        getSymbolBG = function(self)
+            return symbolBG
+        end,
+
+        getSymbolFG = function(self)
+            return symbolFG
+        end,
+
         setIndex = function(self, _index)
             index = _index
             if (index < 1) then
@@ -81,6 +101,10 @@ return function(name, basalt)
             return self
         end,
 
+        getScrollAmount = function(self)
+            return scrollAmount
+        end,
+
         getIndex = function(self)
             local w,h = self:getSize()
             return scrollAmount > (barType=="vertical" and h or w) and math.floor(scrollAmount/(barType=="vertical" and h or w) * index) or index
@@ -94,6 +118,10 @@ return function(name, basalt)
             return self
         end,
 
+        getSymbolSize = function(self)
+            return symbolSize
+        end,
+
         setBarType = function(self, _typ)
             barType = _typ:lower()
             updateSymbolSize()
@@ -101,6 +129,10 @@ return function(name, basalt)
             return self
         end,
 
+        getBarType = function(self)
+            return barType
+        end,
+
         mouseHandler = function(self, button, x, y, ...)
             if (base.mouseHandler(self, button, x, y, ...)) then
                 mouseEvent(self, button, x, y)
diff --git a/Basalt/plugins/xml.lua b/Basalt/plugins/xml.lua
index 5d0ee5b..ff46b76 100644
--- a/Basalt/plugins/xml.lua
+++ b/Basalt/plugins/xml.lua
@@ -590,11 +590,11 @@ return {
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
                     "symbol",
-                    "symbolColor",
+                    "symbolBG",
+                    "symbolFG",
                     "symbolSize",
                     "scrollAmount",
                     "index",
-                    "maxValue",
                     "barType"
                 })
                 return self
-- 
2.49.1


From ac40dbeb10a4fbe11850b303fbbbb40d4bfe533c Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:56:56 +1000
Subject: [PATCH 15/23] Update Switch

---
 Basalt/objects/Switch.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Basalt/objects/Switch.lua b/Basalt/objects/Switch.lua
index 9c696cc..19a7367 100644
--- a/Basalt/objects/Switch.lua
+++ b/Basalt/objects/Switch.lua
@@ -20,16 +20,28 @@ return function(name, basalt)
             return self
         end,
 
+        getSymbol = function(self)
+            return bgSymbol
+        end,
+
         setActiveBackground = function(self, col)
             activeBG = col
             return self
         end,
 
+        getActiveBackground = function(self)
+            return activeBG
+        end,
+
         setInactiveBackground = function(self, col)
             inactiveBG = col
             return self
         end,
 
+        getInactiveBackground = function(self)
+            return inactiveBG
+        end,
+
 
         load = function(self)
             self:listenEvent("mouse_click")
-- 
2.49.1


From 0c0d560ba37d235aeffd2dcf64bdf2031094954f Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 02:59:52 +1000
Subject: [PATCH 16/23] Update Textfield

---
 Basalt/objects/Textfield.lua | 32 ++++++++++++++++++++++++++++++++
 Basalt/plugins/xml.lua       |  4 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/Basalt/objects/Textfield.lua b/Basalt/objects/Textfield.lua
index 8cdaa08..c802b30 100644
--- a/Basalt/objects/Textfield.lua
+++ b/Basalt/objects/Textfield.lua
@@ -161,10 +161,26 @@ return function(name, basalt)
             return self
         end,
 
+        setSelectionFG = function(self, fg)
+            return self:setSelection(fg, nil)
+        end,
+
+        setSelectionBG = function(self, bg)
+            return self:setSelection(nil, bg)
+        end,
+
         getSelection = function(self)
             return selectionFG, selectionBG
         end,
 
+        getSelectionFG = function(self)
+            return selectionFG
+        end,
+
+        getSelectionBG = function(self)
+            return selectionBG
+        end,
+
         getLines = function(self)
             return lines
         end,
@@ -289,6 +305,22 @@ return function(name, basalt)
             return self
         end,
 
+        getXOffset = function(self, xOff)
+            return wIndex
+        end,
+
+        setXOffset = function(self, xOff)
+            return self:setOffset(xOff, nil)
+        end,
+
+        getYOffset = function(self, xOff)
+            return hIndex
+        end,
+
+        setYOffset = function(self, yOff)
+            return self:setOffset(nil, yOff)
+        end,
+
         getFocusHandler = function(self)
             base.getFocusHandler(self)
             local obx, oby = self:getPosition()
diff --git a/Basalt/plugins/xml.lua b/Basalt/plugins/xml.lua
index ff46b76..19da5b7 100644
--- a/Basalt/plugins/xml.lua
+++ b/Basalt/plugins/xml.lua
@@ -636,8 +636,8 @@ return {
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
-                    "bgSelection",
-                    "fgSelection",
+                    "selectionBG",
+                    "selectionFG",
                     "xOffset",
                     "yOffset"
                 })
-- 
2.49.1


From ff6df82fcaf94e7fa82373f7b473997118c29c2e Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 03:03:02 +1000
Subject: [PATCH 17/23] Update Timer

---
 Basalt/objects/Timer.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Basalt/objects/Timer.lua b/Basalt/objects/Timer.lua
index 09585e5..9d2b575 100644
--- a/Basalt/objects/Timer.lua
+++ b/Basalt/objects/Timer.lua
@@ -19,6 +19,10 @@ return function(name, basalt)
             return self
         end,
 
+        getTime = function(self)
+            return timer
+        end,
+
         start = function(self)
             if(timerIsActive)then
                 os.cancelTimer(timerObj)
@@ -43,6 +47,14 @@ return function(name, basalt)
             return self
         end,
 
+        setStart = function(self, start)
+            if (start == true) then
+                return self:start()
+            else
+                return self:cancel()
+            end
+        end,
+
         onCall = function(self, func)
             self:registerEvent("timed_event", func)
             return self
-- 
2.49.1


From afbaa04f11d25237c5ab1dffe327df7577deb816 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 03:05:21 +1000
Subject: [PATCH 18/23] Update List

---
 Basalt/objects/List.lua | 20 ++++++++++++++++++++
 Basalt/plugins/xml.lua  |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Basalt/objects/List.lua b/Basalt/objects/List.lua
index 19be873..1927638 100644
--- a/Basalt/objects/List.lua
+++ b/Basalt/objects/List.lua
@@ -151,10 +151,26 @@ return function(name, basalt)
             return self
         end,
 
+        setSelectionBG = function(self, bgCol)
+            return self:setSelectionColor(bgCol, nil, selectionColorActive)
+        end,
+
+        setSelectionFG = function(self, fgCol)
+            return self:setSelectionColor(nil, fgCol, selectionColorActive)
+        end,
+
         getSelectionColor = function(self)
             return itemSelectedBG, itemSelectedFG
         end,
 
+        getSelectionBG = function(self)
+            return itemSelectedBG
+        end,
+
+        getSelectionFG = function(self)
+            return itemSelectedFG
+        end,
+
         isSelectionColorActive = function(self)
             return selectionColorActive
         end,
@@ -166,6 +182,10 @@ return function(name, basalt)
             return self
         end,
 
+        getScrollable = function(self)
+            return scrollable
+        end,
+
         scrollHandler = function(self, dir, x, y)
             if(base.scrollHandler(self, dir, x, y))then
                 if(scrollable)then
diff --git a/Basalt/plugins/xml.lua b/Basalt/plugins/xml.lua
index 19da5b7..52b92b8 100644
--- a/Basalt/plugins/xml.lua
+++ b/Basalt/plugins/xml.lua
@@ -721,7 +721,7 @@ return {
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
-                    "align",
+                    "textAlign",
                     "offset",
                     "selectionBg",
                     "selectionFg",
-- 
2.49.1


From d080488f55eeced495e8fd4d00acd05d39a27efb Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 03:07:13 +1000
Subject: [PATCH 19/23] Update Dropdown

---
 Basalt/objects/Dropdown.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Basalt/objects/Dropdown.lua b/Basalt/objects/Dropdown.lua
index 613e2a6..0e538df 100644
--- a/Basalt/objects/Dropdown.lua
+++ b/Basalt/objects/Dropdown.lua
@@ -83,10 +83,26 @@ return function(name, basalt)
             return self
         end,
 
+        setDropdownWidth = function(self, width)
+            return self:setDropdownSize(width, dropdownH)
+        end,
+
+        setDropdownHeight = function(self, height)
+            return self:setDropdownSize(dropdownW, height)
+        end,
+
         getDropdownSize = function(self)
             return dropdownW, dropdownH
         end,
 
+        getDropdownWidth = function(self)
+            return dropdownW
+        end,
+
+        getDropdownHeight = function(self)
+            return dropdownH
+        end,
+
         mouseHandler = function(self, button, x, y, isMon)
             if (isOpened) then
                 local obx, oby = self:getAbsolutePosition()
-- 
2.49.1


From 143144cfd62feb544f920cc455bad429e9895da3 Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 03:10:09 +1000
Subject: [PATCH 20/23] Update Radio

---
 Basalt/objects/Radio.lua | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/Basalt/objects/Radio.lua b/Basalt/objects/Radio.lua
index 304f3ba..19303d1 100644
--- a/Basalt/objects/Radio.lua
+++ b/Basalt/objects/Radio.lua
@@ -53,20 +53,52 @@ return function(name, basalt)
             return self
         end,
 
+        setBoxSelectionBG = function(self, bg)
+            return self:setBoxSelectionColor(bg, boxSelectedFG)
+        end,
+
+        setBoxSelectionFG = function(self, fg)
+            return self:setBoxSelectionColor(boxSelectedBG, fg)
+        end,
+
         getBoxSelectionColor = function(self)
             return boxSelectedBG, boxSelectedFG
         end,
 
+        getBoxSelectionBG = function(self)
+            return boxSelectedBG
+        end,
+
+        getBoxSelectionFG = function(self)
+            return boxSelectedFG
+        end,
+
         setBoxDefaultColor = function(self, bg, fg)
             boxNotSelectedBG = bg
             boxNotSelectedFG = fg
             return self
         end,
 
+        setBoxDefaultBG = function(self, bg)
+            return self:setBoxDefaultColor(bg, boxNotSelectedFG)
+        end,
+
+        setBoxDefaultFG = function(self, fg)
+            return self:setBoxDefaultColor(boxNotSelectedBG, fg)
+        end,
+
         getBoxDefaultColor = function(self)
             return boxNotSelectedBG, boxNotSelectedFG
         end,
 
+        getBoxDefaultBG = function(self)
+            return boxNotSelectedBG
+        end,
+
+        getBoxDefaultFG = function(self)
+            return boxNotSelectedFG
+        end,
+
         mouseHandler = function(self, button, x, y, ...)
             if (#list > 0) then
                 local obx, oby = self:getAbsolutePosition()
-- 
2.49.1


From cb0c8bb678020dcc306956f1cc0c8a85c9cfd3af Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 03:11:10 +1000
Subject: [PATCH 21/23] Update Menubar

---
 Basalt/objects/Menubar.lua | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Basalt/objects/Menubar.lua b/Basalt/objects/Menubar.lua
index dda0a24..da2eb44 100644
--- a/Basalt/objects/Menubar.lua
+++ b/Basalt/objects/Menubar.lua
@@ -46,12 +46,19 @@ return function(name, basalt)
             return self
         end,
 
+        getSpace = function(self)
+            return space
+        end,
+
         setScrollable = function(self, scroll)
             scrollable = scroll
             if(scroll==nil)then scrollable = true end
             return self
         end,
 
+        getScrollable = function(self)
+            return scrollable
+        end,
 
         mouseHandler = function(self, button, x, y)
             if(base:getBase().mouseHandler(self, button, x, y))then
-- 
2.49.1


From bc0cd209707e3591d94f0ec57d973ee81560390d Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 03:13:23 +1000
Subject: [PATCH 22/23] Update Graph

---
 Basalt/objects/Graph.lua | 12 ++++++++++++
 Basalt/plugins/xml.lua   |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Basalt/objects/Graph.lua b/Basalt/objects/Graph.lua
index 094f798..f6a145c 100644
--- a/Basalt/objects/Graph.lua
+++ b/Basalt/objects/Graph.lua
@@ -32,10 +32,18 @@ return function(name, basalt)
             return self
         end,
 
+        setGraphSymbolColor = function(self, symbolColor)
+            return self:setGraphSymbolColor(nil, symbolColor)
+        end,
+
         getGraphSymbol = function(self)
             return graphSymbol, graphSymbolCol
         end,
 
+        getGraphSymbolColor = function(self)
+            return graphSymbolCol
+        end,
+
         addDataPoint = function(self, value)
             if value >= minValue and value <= maxValue then
                 table.insert(graphData, value)
@@ -75,6 +83,10 @@ return function(name, basalt)
             return self
         end,
 
+        getGraphType = function(self)
+            return graphType
+        end,
+
         setMaxEntries = function(self, value)
             maxEntries = value
             self:updateDraw()
diff --git a/Basalt/plugins/xml.lua b/Basalt/plugins/xml.lua
index 52b92b8..59d4c23 100644
--- a/Basalt/plugins/xml.lua
+++ b/Basalt/plugins/xml.lua
@@ -801,11 +801,11 @@ return {
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
                     "maxEntries",
-                    "type",
+                    "graphType",
                     "minValue",
                     "maxValue",
-                    "symbol",
-                    "symbolColor"
+                    "graphSymbol",
+                    "graphSymbolColor"
                 })
                 if(data["item"]~=nil)then
                     local tab = data["item"]
-- 
2.49.1


From 3e1793ceb176f2a65f1505c53600ac594ded5d9e Mon Sep 17 00:00:00 2001
From: Sabine Lim <thesabinelim@gmail.com>
Date: Tue, 16 May 2023 03:16:26 +1000
Subject: [PATCH 23/23] Update Treeview

---
 Basalt/objects/Treeview.lua | 36 ++++++++++++++++++++++++++++++++++++
 Basalt/plugins/xml.lua      |  1 -
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/Basalt/objects/Treeview.lua b/Basalt/objects/Treeview.lua
index 9b715ef..03481e9 100644
--- a/Basalt/objects/Treeview.lua
+++ b/Basalt/objects/Treeview.lua
@@ -157,15 +157,35 @@ return function(name, basalt)
             return self
         end,
 
+        setXOffset = function(self, x)
+            return self:setOffset(x, yOffset)
+        end,
+
+        setYOffset = function(self, y)
+            return self:setOffset(xOffset, y)
+        end,
+
         getOffset = function(self)
             return xOffset, yOffset
         end,
 
+        getXOffset = function(self)
+            return xOffset
+        end,
+
+        getYOffset = function(self)
+            return yOffset
+        end,
+
         setScrollable = function(self, scroll)
             scrollable = scroll
             return self
         end,
 
+        getScrollable = function(self, scroll)
+            return scrollable
+        end,
+
         setSelectionColor = function(self, bgCol, fgCol, active)
             itemSelectedBG = bgCol or self:getBackground()
             itemSelectedFG = fgCol or self:getForeground()
@@ -174,10 +194,26 @@ return function(name, basalt)
             return self
         end,
 
+        setSelectionBG = function(self, bgCol)
+            return self:setSelectionColor(bgCol, nil, selectionColorActive)
+        end,
+
+        setSelectionFG = function(self, fgCol)
+            return self:setSelectionColor(nil, fgCol, selectionColorActive)
+        end,
+
         getSelectionColor = function(self)
             return itemSelectedBG, itemSelectedFG
         end,
 
+        getSelectionBG = function(self)
+            return itemSelectedBG
+        end,
+
+        getSelectionFG = function(self)
+            return itemSelectedFG
+        end,
+
         isSelectionColorActive = function(self)
             return selectionColorActive
         end,
diff --git a/Basalt/plugins/xml.lua b/Basalt/plugins/xml.lua
index 59d4c23..93c29d9 100644
--- a/Basalt/plugins/xml.lua
+++ b/Basalt/plugins/xml.lua
@@ -825,7 +825,6 @@ return {
             setValuesByXMLData = function(self, data, renderContext)
                 base.setValuesByXMLData(self, data, renderContext)
                 self:updateSpecifiedValuesByXMLData(data, {
-                    "space",
                     "scrollable",
                     "selectionBg",
                     "selectionFg",
-- 
2.49.1