aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-30 20:41:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Minor adjustments to ExpElement

Browse Source
This commit is contained in:
Cooldude2606
2025-01-03 18:06:54 +00:00
parent d752b01076
commit ce560ca157
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
exp_gui/module/prototype.lua
View File

@@ -12,7 +12,7 @@ local ExpElement = {
--- @alias ExpElement.DrawCallback fun(def: ExpElement, parent: LuaGuiElement, ...): LuaGuiElement?, function? --- @alias ExpElement.DrawCallback fun(def: ExpElement, parent: LuaGuiElement, ...): LuaGuiElement?, function?
--- @alias ExpElement.StyleCallback fun(def: ExpElement, element: LuaGuiElement?, parent: LuaGuiElement, ...): table? --- @alias ExpElement.StyleCallback fun(def: ExpElement, element: LuaGuiElement?, parent: LuaGuiElement, ...): table?
--- @alias ExpElement.DataCallback fun(def: ExpElement, element: LuaGuiElement?, parent: LuaGuiElement, ...): table? --- @alias ExpElement.DataCallback fun(def: ExpElement, element: LuaGuiElement?, parent: LuaGuiElement, ...): table?
--- @alias ExpElement.OnEventAdder<E> fun(self: ExpElement, handler: fun(event: E)): ExpElement --- @alias ExpElement.OnEventAdder<E> fun(self: ExpElement, handler: fun(def: ExpElement, event: E)): ExpElement
--- @class ExpElement._debug --- @class ExpElement._debug
--- @field defined_at string --- @field defined_at string
@@ -32,7 +32,7 @@ local ExpElement = {
--- @field _events table<defines.events, function[]> --- @field _events table<defines.events, function[]>
ExpElement._prototype = { ExpElement._prototype = {
_track_elements = false, _track_elements = false,
_tag_elements = false, _has_handlers = false,
} }
ExpElement._metatable = { ExpElement._metatable = {
@@ -111,8 +111,8 @@ function ExpElement._prototype:create(parent, ...)
self:track_element(element) self:track_element(element)
end end
if self._tag_elements and status ~= ExpElement._prototype.tag_element and status ~= ExpElement._prototype.untag_element then if self._has_handlers and status ~= ExpElement._prototype.link_element and status ~= ExpElement._prototype.unlink_element then
self:tag_element(element) self:link_element(element)
end end
return element return element
@@ -231,11 +231,12 @@ function ExpElement._prototype:untrack_element(element)
return element, ExpElement._prototype.untrack_element return element, ExpElement._prototype.untrack_element
end end
--- Tag an arbitrary element, tagged elements call event handlers --- Link an arbitrary element, linked elements call event handlers
--- @param element LuaGuiElement --- @param element LuaGuiElement
--- @return LuaGuiElement --- @return LuaGuiElement
--- @return function --- @return function
function ExpElement._prototype:tag_element(element) function ExpElement._prototype:link_element(element)
assert(self._has_handlers, "Element has no event handlers")
local element_tags = element.tags local element_tags = element.tags
if not element_tags then if not element_tags then
element_tags = {} element_tags = {}
@@ -248,19 +249,20 @@ function ExpElement._prototype:tag_element(element)
end end
--- @cast event_tags string[] --- @cast event_tags string[]
if not table.contains(event_tags, self.scope) then if not table.array_contains(event_tags, self.scope) then
event_tags[#event_tags + 1] = self.scope event_tags[#event_tags + 1] = self.scope
end end
element.tags = element_tags element.tags = element_tags
return element, ExpElement._prototype.tag_element return element, ExpElement._prototype.link_element
end end
--- Untag an arbitrary element, untagged elements do not call event handlers --- Unlink an arbitrary element, unlinked elements do not call event handlers
--- @param element LuaGuiElement --- @param element LuaGuiElement
--- @return LuaGuiElement --- @return LuaGuiElement
--- @return function --- @return function
function ExpElement._prototype:untag_element(element) function ExpElement._prototype:unlink_element(element)
assert(self._has_handlers, "Element has no event handlers")
local element_tags = element.tags local element_tags = element.tags
if not element_tags then if not element_tags then
element_tags = {} element_tags = {}
@@ -275,7 +277,7 @@ function ExpElement._prototype:untag_element(element)
table.remove_element(event_tags, self.scope) table.remove_element(event_tags, self.scope)
element.tags = element_tags element.tags = element_tags
return element, ExpElement._prototype.untag_element return element, ExpElement._prototype.unlink_element
end end
local e = defines.events local e = defines.events
@@ -304,7 +306,7 @@ local function event_factory(event_name)
end end
return function(self, handler) return function(self, handler)
self._tag_elements = true self._has_handlers = true
local handlers = self._events[event_name] local handlers = self._events[event_name]
if not handlers then if not handlers then
handlers = {} handlers = {}
@@ -321,7 +323,7 @@ function ExpElement._prototype:_raise_event(event)
local handlers = self._events[event.name] local handlers = self._events[event.name]
if not handlers then return end if not handlers then return end
for _, handler in ipairs(handlers) do for _, handler in ipairs(handlers) do
handler(event) handler(self, event)
end end
end end