Skip to content

Commit 4e2c28e

Browse files
authored
Merge pull request #331 from Insality/core
Core
2 parents 2a169da + 5a36fa0 commit 4e2c28e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+7
-7904
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ manifest.private.der
1717
manifest.public.der
1818
/.editor_settings
1919
/.deployer_cache
20+
21+
deployer_version_settings.ini

druid/component.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ local WIDGET_METATABLE = { __index = M }
410410
function M.create_widget(self, widget_class, context)
411411
local instance = setmetatable({}, {
412412
__index = setmetatable(widget_class, WIDGET_METATABLE)
413-
})
413+
}) --[[@as druid.widget]]
414414

415415
instance._component = {
416416
_uid = M.create_uid(),
@@ -440,7 +440,6 @@ function M.create_widget(self, widget_class, context)
440440
instance._meta.parent:__add_child(instance)
441441
end
442442

443-
---@cast instance druid.widget
444443
return instance
445444
end
446445

druid/custom/tiling_node/gui_tiling_node.fp

Lines changed: 0 additions & 83 deletions
This file was deleted.

druid/custom/tiling_node/gui_tiling_node.material

Lines changed: 0 additions & 37 deletions
This file was deleted.

druid/custom/tiling_node/gui_tiling_node.vp

Lines changed: 0 additions & 40 deletions
This file was deleted.

druid/custom/tiling_node/tiling_node.lua

Lines changed: 0 additions & 184 deletions
This file was deleted.

druid/editor_scripts/druid.editor_script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function M.get_prefs_schema()
1818
["druid.gui_script_template_path"] = editor.prefs.schema.string({
1919
default = DEFAULT_GUI_SCRIPT_TEMPLATE_PATH,
2020
scope = editor.prefs.SCOPE.PROJECT
21-
})
21+
}),
2222
}
2323
end
2424

druid/system/druid_instance.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ function M:on_input(action_id, action)
357357

358358
for i = #components, 1, -1 do
359359
local component = components[i]
360-
local input_enabled = component:get_input_enabled()
360+
local input_enabled = component._meta.input_enabled
361361

362362
if input_enabled and self:_can_use_input_component(component) then
363363
if not is_input_consumed then

0 commit comments

Comments
 (0)