Partydeck/Extension-Druid
3
0
Fork 0
mirror of https://github.com/Insality/druid.git synced 2025-06-27 18:37:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

#153 Add Druid acquire input to late_init step

Browse Source
This commit is contained in:
Insality 2022-01-27 01:13:23 +02:00
parent ef455a71eb
commit b7d2891fed
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
druid/system/druid_instance.lua Normal file → Executable file
View File

@ -63,7 +63,7 @@ local DruidInstance = class("druid.druid_instance")
local function input_init(self) local function input_init(self)
if sys.get_config("druid.no_auto_input") == "1" then if self._no_auto_input then
return return
end end
@ -75,7 +75,7 @@ end
local function input_release(self) local function input_release(self)
if sys.get_config("druid.no_auto_input") == "1" then if self._no_auto_input then
return return
end end
@ -113,10 +113,6 @@ local function create(self, instance_class)
for i = 1, #register_to do for i = 1, #register_to do
local interest = register_to[i] local interest = register_to[i]
table.insert(self.components[interest], instance) table.insert(self.components[interest], instance)
if base_component.UI_INPUT[interest] then
input_init(self)
end
end end
return instance return instance
@ -209,6 +205,7 @@ function DruidInstance.initialize(self, context, style)
self._input_blacklist = nil self._input_blacklist = nil
self._input_whitelist = nil self._input_whitelist = nil
self._no_auto_input = (sys.get_config("druid.no_auto_input") == "1")
self.components = {} self.components = {}
for i = 1, #base_component.ALL_INTERESTS do for i = 1, #base_component.ALL_INTERESTS do
@ -316,6 +313,11 @@ function DruidInstance.update(self, dt)
table.remove(late_init_components, 1) table.remove(late_init_components, 1)
end end
if not self.input_inited and #self.components[base_component.ON_INPUT] > 0 then
-- Input init on late init step, to be sure it goes after user go acquire input
input_init(self)
end
local components = self.components[base_component.ON_UPDATE] local components = self.components[base_component.ON_UPDATE]
for i = 1, #components do for i = 1, #components do
components[i]:update(dt) components[i]:update(dt)
@ -622,10 +624,11 @@ end
-- @tparam node node Gui node -- @tparam node node Gui node
-- @tparam function callback Checkbox callback -- @tparam function callback Checkbox callback
-- @tparam[opt=node] node click_node Trigger node, by default equals to node -- @tparam[opt=node] node click_node Trigger node, by default equals to node
-- @tparam[opt=false] boolean initial_state The initial state of checkbox, default - false
-- @treturn Checkbox checkbox component -- @treturn Checkbox checkbox component
function DruidInstance.new_checkbox(self, node, callback, click_node) function DruidInstance.new_checkbox(self, node, callback, click_node, initial_state)
-- return helper.extended_component("checkbox") -- return helper.extended_component("checkbox")
return DruidInstance.new(self, checkbox, node, callback, click_node) return DruidInstance.new(self, checkbox, node, callback, click_node, initial_state)
end end