From be2077385e600abae75508392abaa5dcd2938a37 Mon Sep 17 00:00:00 2001
From: Robert Jelic <36573031+NoryiE@users.noreply.github.com>
Date: Thu, 6 Mar 2025 14:16:45 +0100
Subject: [PATCH] Fixed 2 minor bugs

---
 src/main.lua        | 29 +++++++++++++++++++++--------
 src/plugins/xml.lua |  3 +++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/main.lua b/src/main.lua
index e289703..46195fe 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -28,6 +28,7 @@ else
 end
 
 local mainFrame = nil
+local activeFrame = nil
 local updaterActive = false
 local _type = type
 
@@ -96,7 +97,10 @@ end
 function basalt.createFrame()
     local frame = basalt.create("BaseFrame")
     frame:postInit()
-    if(mainFrame==nil)then mainFrame = frame end
+    if(mainFrame==nil)then 
+        mainFrame = frame
+        activeFrame = frame
+    end
     return frame
 end
 
@@ -115,17 +119,26 @@ end
 function basalt.getMainFrame()
     if(mainFrame == nil)then
         mainFrame = basalt.createFrame()
+        activeFrame = mainFrame
     end
     return mainFrame
 end
 
 --- Sets the active frame
 --- @shortDescription Sets the active frame
---- @param frame table The frame to set as active
+--- @param frame BaseFrame The frame to set as active
 --- @usage basalt.setActiveFrame(myFrame)
 function basalt.setActiveFrame(frame)
-    mainFrame = frame
-    mainFrame:updateRender()
+    activeFrame = frame
+    activeFrame:updateRender()
+end
+
+--- Returns the active frame
+--- @shortDescription Returns the active frame
+--- @return BaseFrame? BaseFrame The frame to set as active
+--- @usage local frame = basalt.getActiveFrame()
+function basalt.getActiveFrame()
+    return activeFrame
 end
 
 --- Schedules a function to run in a coroutine
@@ -168,8 +181,8 @@ local function updateEvent(event, ...)
     if(event=="terminate")then basalt.stop() end
     if lazyElementsEventHandler(event, ...) then return end
 
-    if(mainFrame)then
-        mainFrame:dispatchEvent(event, ...)
+    if(activeFrame)then
+        activeFrame:dispatchEvent(event, ...)
     end
 
     for k, func in ipairs(basalt._schedule) do
@@ -194,8 +207,8 @@ local function updateEvent(event, ...)
 end
 
 local function renderFrames()
-    if(mainFrame)then
-        mainFrame:render()
+    if(activeFrame)then
+        activeFrame:render()
     end
 end
 
diff --git a/src/plugins/xml.lua b/src/plugins/xml.lua
index bcfdec2..0baaac8 100644
--- a/src/plugins/xml.lua
+++ b/src/plugins/xml.lua
@@ -199,6 +199,7 @@ function BaseElement:fromXML(node, scope)
             end
         end
     end
+    return self
 end
 
 local Container = {}
@@ -215,6 +216,7 @@ function Container:loadXML(content, scope)
             end
         end
     end
+    return self
 end
 
 function Container:fromXML(nodes, scope)
@@ -228,6 +230,7 @@ function Container:fromXML(nodes, scope)
             end
         end
     end
+    return self
 end
 
 return {