From 26567debd6db8ff13ccf5a2cf309dd6f6ef85b5b Mon Sep 17 00:00:00 2001
From: Robert Jelic <36573031+NoryiE@users.noreply.github.com>
Date: Thu, 8 Jun 2023 09:13:03 +0200
Subject: [PATCH] Small color fix for labels

fixed bug with foreground/background colors, when using xml
---
 Basalt/objects/Label.lua       | 12 +++++++++++-
 Basalt/plugins/reactiveXml.lua |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Basalt/objects/Label.lua b/Basalt/objects/Label.lua
index f25b86c..823a363 100644
--- a/Basalt/objects/Label.lua
+++ b/Basalt/objects/Label.lua
@@ -12,6 +12,8 @@ return function(name, basalt)
     base:setSize(5, 1)
     base:setBackground(false)
 
+    local fgChanged = false
+
     local autoSize = true
     local text, textAlign = "Label", "left"
 
@@ -47,6 +49,12 @@ return function(name, basalt)
             return self
         end,
 
+        setForeground = function(self, col)
+            base.setForeground(self, col)
+            fgChanged = true
+            return self
+        end,
+
         --- Returns the label's autoSize property.
         --- @return boolean
         getAutoSize = function(self)
@@ -105,7 +113,9 @@ return function(name, basalt)
         init = function(self)
             base.init(self)
             local parent = self:getParent()
-            self:setForeground(parent:getForeground())
+            if not(fgChanged)then
+                self:setForeground(parent:getForeground())
+            end
         end
 
     }
diff --git a/Basalt/plugins/reactiveXml.lua b/Basalt/plugins/reactiveXml.lua
index 8331c4e..f18e4f8 100644
--- a/Basalt/plugins/reactiveXml.lua
+++ b/Basalt/plugins/reactiveXml.lua
@@ -71,6 +71,7 @@ return {
                     else
                         Reactive.effect(function()
                             local value = load("return " .. expression, nil, "t", env)()
+                            if(colors[value]~=nil)then value = colors[value] end
                             object:setProperty(attribute, value)
                         end)
                     end
@@ -138,4 +139,4 @@ return {
         }
         return object
     end
-}
+}
\ No newline at end of file