kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elua: handle event/property mixins correctly in eo

This commit is contained in:
Daniel Kolesa 2014-10-17 16:14:49 +01:00
parent 9e770c06be
commit 54d7fed7b6
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bindings/luajit/eo.lua
View File

@ -197,8 +197,26 @@ M.class_unregister = function(name)
eo_classes[addr] = nil
end
local mixin_tbl = function(cl, mixin, field)
local mxt = mixin[field]
if mxt then
local clt = cl[field]
if not clt then
cl[field] = mxt
else
for k, v in pairs(mxt) do clt[k] = v end
end
mixin[field] = nil
end
end
M.class_mixin = function(name, mixin)
classes[name]:mixin(classes[mixin])
local cl = classes[name]
-- mixin properties/events
mixin_tbl(cl, mixin, "__properties")
mixin_tbl(cl, mixin, "__events")
-- mixin the rest
cl:mixin(classes[mixin])
end
local obj_gccb = function(obj)