Made a small mistake..

This commit is contained in:
Robert Jelic
2022-12-14 20:31:01 +01:00
parent a181496052
commit c81f24cca2
2 changed files with 24 additions and 9 deletions

View File

@@ -83,7 +83,6 @@ return function(name, parent, pTerm, basalt)
end end
local function getObject(name) local function getObject(name)
if(type(name)=="number")then name = tostring(number) end
if(type(name)~="string")then name = name.name end if(type(name)~="string")then name = name.name end
for _, value in pairs(objects) do for _, value in pairs(objects) do
for _, b in pairs(value) do for _, b in pairs(value) do
@@ -109,7 +108,7 @@ return function(name, parent, pTerm, basalt)
local function addObject(obj) local function addObject(obj)
local zIndex = obj:getZIndex() local zIndex = obj:getZIndex()
if (getObject(obj.name) ~= nil) then if (getObject(obj.name) ~= nil) then
return nil return
end end
if (objects[zIndex] == nil) then if (objects[zIndex] == nil) then
for x = 1, #objZIndex + 1 do for x = 1, #objZIndex + 1 do
@@ -163,14 +162,14 @@ return function(name, parent, pTerm, basalt)
table.remove(objects[a], key) table.remove(objects[a], key)
removeEvents(object, value) removeEvents(object, value)
self:updateDraw() self:updateDraw()
return true; return true
end end
else else
if (value == obj) then if (value == obj) then
table.remove(objects[a], key) table.remove(objects[a], key)
removeEvents(object, value) removeEvents(object, value)
self:updateDraw() self:updateDraw()
return true; return true
end end
end end
end end
@@ -193,7 +192,7 @@ return function(name, parent, pTerm, basalt)
if(events[event]==nil)then events[event] = {} end if(events[event]==nil)then events[event] = {} end
if(eventZIndex[event]==nil)then eventZIndex[event] = {} end if(eventZIndex[event]==nil)then eventZIndex[event] = {} end
if (getEvent(self, event, obj.name) ~= nil) then if (getEvent(self, event, obj.name) ~= nil) then
return nil return
end end
if(self.parent~=nil)then if(self.parent~=nil)then
self.parent:addEvent(event, self) self.parent:addEvent(event, self)
@@ -221,6 +220,7 @@ return function(name, parent, pTerm, basalt)
table.insert(events[event][zIndex], obj) table.insert(events[event][zIndex], obj)
return obj return obj
end end
local function removeEvent(self, event, obj) local function removeEvent(self, event, obj)
if(events[event]~=nil)then if(events[event]~=nil)then
@@ -412,7 +412,22 @@ return function(name, parent, pTerm, basalt)
getType = function(self) getType = function(self)
return objectType return objectType
end; end,
getObjectCount = function(self)
local count = 0
for _, value in pairs(objects) do
count = count+#value
end
return count
end,
getEventCount = function(self, ev)
local count = 0
for _, value in pairs(events[ev]) do
count = count+#value
end
return count
end,
setZIndex = function(self, newIndex) setZIndex = function(self, newIndex)
base.setZIndex(self, newIndex) base.setZIndex(self, newIndex)

View File

@@ -246,9 +246,9 @@ local function basaltUpdateEvent(event, ...)
end end
if(event == "monitor_touch") then if(event == "monitor_touch") then
if(monFrames[p1]~=nil)then if(monFrames[a[1]]~=nil)then
monFrames[p1]:mouseHandler(1, a[2], a[3], true) monFrames[a[1]]:mouseHandler(1, a[2], a[3], true)
activeFrame = monFrames[p1] activeFrame = monFrames[a[1]]
end end
if(count(monGroups)>0)then if(count(monGroups)>0)then
for k,v in pairs(monGroups)do for k,v in pairs(monGroups)do