Small event fix

Fixed a small event issue when removing and readding objects (changing z-index)

Basalt/Object.lua

@@ -925,6 +925,7 @@ return function(name)
                 initialized = true
                 return true
             end
+            return false
         end
 
     }

Basalt/objects/Button.lua

@@ -17,8 +17,10 @@ return function(name)
 
     local object = {
         init = function(self)
-            self.bgColor = self.parent:getTheme("ButtonBG")
+            if(base.init(self))then
-            self.fgColor = self.parent:getTheme("ButtonText")        
+                self.bgColor = self.parent:getTheme("ButtonBG")
+                self.fgColor = self.parent:getTheme("ButtonText")    
+            end    
         end,
         getType = function(self)
             return objectType

Basalt/objects/Checkbox.lua

@@ -72,11 +72,12 @@ return function(name)
         end,
         
         init = function(self)
-            base.init(self)
-            self.bgColor = self.parent:getTheme("CheckboxBG")
-            self.fgColor = self.parent:getTheme("CheckboxText")       
             self.parent:addEvent("mouse_click", self)
             self.parent:addEvent("mouse_up", self)
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("CheckboxBG")
+                self.fgColor = self.parent:getTheme("CheckboxText")       
+            end
         end,
     }
 

Basalt/objects/Dropdown.lua

@@ -225,14 +225,14 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("DropdownBG")
+            self.parent:addEvent("mouse_click", self)
-            self.fgColor = self.parent:getTheme("DropdownText")
+            self.parent:addEvent("mouse_up", self)
-            itemSelectedBG = self.parent:getTheme("SelectionBG")
+            self.parent:addEvent("mouse_scroll", self)
-            itemSelectedFG = self.parent:getTheme("SelectionText")
+            if(base.init(self))then
-            if(self.parent~=nil)then
+                self.bgColor = self.parent:getTheme("DropdownBG")
-                self.parent:addEvent("mouse_click", self)
+                self.fgColor = self.parent:getTheme("DropdownText")
-                self.parent:addEvent("mouse_up", self)
+                itemSelectedBG = self.parent:getTheme("SelectionBG")
-                self.parent:addEvent("mouse_scroll", self)
+                itemSelectedFG = self.parent:getTheme("SelectionText")
             end
         end,
     }

Basalt/objects/Graphic.lua

@@ -132,7 +132,9 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("GraphicBG")
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("GraphicBG")
+            end
         end,
     }
 

Basalt/objects/Image.lua

@@ -14,7 +14,9 @@ return function(name)
 
     local object = {
         init = function(self)
-            self.bgColor = self.parent:getTheme("ImageBG")
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("ImageBG")
+            end
         end,
         getType = function(self)
             return objectType

Basalt/objects/Input.lua

@@ -353,8 +353,6 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("InputBG")
-            self.fgColor = self.parent:getTheme("InputText")
             if(self.parent~=nil)then
                 self.parent:addEvent("mouse_click", self)
                 self.parent:addEvent("key", self)
@@ -362,6 +360,10 @@ return function(name)
                 self.parent:addEvent("other_event", self)
                 self.parent:addEvent("mouse_drag", self)
             end
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("InputBG")
+                self.fgColor = self.parent:getTheme("InputText")
+            end
         end,
     }
 

Basalt/objects/Label.lua

@@ -153,13 +153,13 @@ return function(name)
             end
         end,
         init = function(self)
+            self.parent:addEvent("other_event", self)
             if(base.init(self))then
                 self.bgColor = self.parent:getTheme("LabelBG")
                 self.fgColor = self.parent:getTheme("LabelText")
                 if(self.parent.bgColor==colors.black)and(self.fgColor==colors.black)then
                     self.fgColor = colors.lightGray
                 end
-                self.parent:addEvent("other_event", self)
             end
         end
 

Basalt/objects/List.lua

@@ -199,13 +199,15 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("ListBG")
-            self.fgColor = self.parent:getTheme("ListText")
-            itemSelectedBG = self.parent:getTheme("SelectionBG")
-            itemSelectedFG = self.parent:getTheme("SelectionText")
             self.parent:addEvent("mouse_click", self)
             self.parent:addEvent("mouse_drag", self)
             self.parent:addEvent("mouse_scroll", self)
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("ListBG")
+                self.fgColor = self.parent:getTheme("ListText")
+                itemSelectedBG = self.parent:getTheme("SelectionBG")
+                itemSelectedFG = self.parent:getTheme("SelectionText")
+            end
         end,
     }
 

Basalt/objects/Menubar.lua

@@ -226,14 +226,14 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("MenubarBG")
-            self.fgColor = self.parent:getTheme("MenubarText")
-            itemSelectedBG = self.parent:getTheme("SelectionBG")
-            itemSelectedFG = self.parent:getTheme("SelectionText")
-
             self.parent:addEvent("mouse_click", self)
             self.parent:addEvent("mouse_scroll", self)
-
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("MenubarBG")
+                self.fgColor = self.parent:getTheme("MenubarText")
+                itemSelectedBG = self.parent:getTheme("SelectionBG")
+                itemSelectedFG = self.parent:getTheme("SelectionText")
+            end
         end,
     }
 

Basalt/objects/Program.lua

@@ -792,7 +792,9 @@ return function(name, parent)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("ProgramBG")
+            if(base.init(self))then
+                elf.bgColor = self.parent:getTheme("ProgramBG")
+            end
         end,
 
     }

Basalt/objects/Progressbar.lua

@@ -21,9 +21,11 @@ return function(name)
 
     local object = {
         init = function(self)
-            self.bgColor = self.parent:getTheme("ProgressbarBG")
+            if(base.init(self))then
-            self.fgColor = self.parent:getTheme("ProgressbarText")
+                self.bgColor = self.parent:getTheme("ProgressbarBG")
-            activeBarColor = self.parent:getTheme("ProgressbarActiveBG")
+                self.fgColor = self.parent:getTheme("ProgressbarText")
+                activeBarColor = self.parent:getTheme("ProgressbarActiveBG")
+            end
         end,
         getType = function(self)
             return objectType

Basalt/objects/Radio.lua

@@ -153,13 +153,15 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("MenubarBG")
-            self.fgColor = self.parent:getTheme("MenubarFG")
-            itemSelectedBG = self.parent:getTheme("SelectionBG")
-            itemSelectedFG = self.parent:getTheme("SelectionText")
-            boxSelectedBG = self.parent:getTheme("MenubarBG")
-            boxSelectedFG = self.parent:getTheme("MenubarText")
             self.parent:addEvent("mouse_click", self)
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("MenubarBG")
+                self.fgColor = self.parent:getTheme("MenubarFG")
+                itemSelectedBG = self.parent:getTheme("SelectionBG")
+                itemSelectedFG = self.parent:getTheme("SelectionText")
+                boxSelectedBG = self.parent:getTheme("MenubarBG")
+                boxSelectedFG = self.parent:getTheme("MenubarText")
+            end
         end,
     }
 

Basalt/objects/Scrollbar.lua

@@ -173,12 +173,14 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("ScrollbarBG")
-            self.fgColor = self.parent:getTheme("ScrollbarText")
-            symbolColor = self.parent:getTheme("ScrollbarSymbolColor")
             self.parent:addEvent("mouse_click", self)
             self.parent:addEvent("mouse_drag", self)
             self.parent:addEvent("mouse_scroll", self)
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("ScrollbarBG")
+                self.fgColor = self.parent:getTheme("ScrollbarText")
+                symbolColor = self.parent:getTheme("ScrollbarSymbolColor")
+            end
         end,
     }
 

Basalt/objects/Slider.lua

@@ -173,12 +173,14 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("SliderBG")
-            self.fgColor = self.parent:getTheme("SliderText")
-            symbolColor = self.parent:getTheme("SliderSymbolColor")
             self.parent:addEvent("mouse_click", self)
             self.parent:addEvent("mouse_drag", self)
             self.parent:addEvent("mouse_scroll", self)
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("SliderBG")
+                self.fgColor = self.parent:getTheme("SliderText")
+                symbolColor = self.parent:getTheme("SliderSymbolColor")
+            end
         end,
     }
 

Basalt/objects/Switch.lua

@@ -74,12 +74,14 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("SwitchBG")
-            self.fgColor = self.parent:getTheme("SwitchText")
-            bgSymbol = self.parent:getTheme("SwitchBGSymbol")
-            inactiveBG = self.parent:getTheme("SwitchInactive")
-            activeBG = self.parent:getTheme("SwitchActive")
             self.parent:addEvent("mouse_click", self)
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("SwitchBG")
+                self.fgColor = self.parent:getTheme("SwitchText")
+                bgSymbol = self.parent:getTheme("SwitchBGSymbol")
+                inactiveBG = self.parent:getTheme("SwitchInactive")
+                activeBG = self.parent:getTheme("SwitchActive")
+            end
         end,
     }
 

Basalt/objects/Textfield.lua

@@ -608,14 +608,16 @@ return function(name)
         end,
 
         init = function(self)
-            self.bgColor = self.parent:getTheme("TextfieldBG")
-            self.fgColor = self.parent:getTheme("TextfieldText")
             self.parent:addEvent("mouse_click", self)
             self.parent:addEvent("mouse_scroll", self)
             self.parent:addEvent("mouse_drag", self)
             self.parent:addEvent("key", self)
             self.parent:addEvent("char", self)
             self.parent:addEvent("other_event", self)
+            if(base.init(self))then
+                self.bgColor = self.parent:getTheme("TextfieldBG")
+                self.fgColor = self.parent:getTheme("TextfieldText")
+            end
         end,
     }