diff --git a/Basalt/objects/Container.lua b/Basalt/objects/Container.lua index 1a66c38..1b73d16 100644 --- a/Basalt/objects/Container.lua +++ b/Basalt/objects/Container.lua @@ -36,9 +36,6 @@ return function(name, basalt) end local function getChild(self, name) - if (type(name)=="table") then - name = name:getName() - end for _, v in ipairs(children) do if v.element:getName() == name then return v.element @@ -47,7 +44,7 @@ return function(name, basalt) end local function getDeepChild(self, name) - local maybeChild = getChild(name) + local maybeChild = self:getChild(name) if (maybeChild ~= nil) then return maybeChild end @@ -87,7 +84,7 @@ return function(name, basalt) local function removeChild(self, element) if (type(element)=="string") then - element = getChild(element:getName()) + element = self:getChild(element) end if (element==nil) then return @@ -95,11 +92,13 @@ return function(name, basalt) for i, v in ipairs(children) do if v.element:getName() == element:getName() then table.remove(children, i) + self:removeEvents(element) + sorted = false + self:updateDraw() return true end end - self:removeEvents(element) - sorted = false + return false end local function removeChildren(self) diff --git a/Basalt/objects/Image.lua b/Basalt/objects/Image.lua index 9580aa7..7750b4a 100644 --- a/Basalt/objects/Image.lua +++ b/Basalt/objects/Image.lua @@ -147,6 +147,8 @@ return function(name, basalt) loadImage = function(self, path) if(fs.exists(path))then local newBimg = images.loadBIMG(path) + print(newBimg[1][1]) + sleep(1) bimgLibrary = bimg(newBimg) activeFrame = 1 bimgFrame = bimgLibrary.getFrameObject(1)