qwreey-bot/quad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix style bug

Browse source
This commit is contained in:
Qwreey 2023-02-23 22:38:08 +09:00
parent 36af88270e
commit 3cdbf3e786
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/class.lua
View file

@ -198,7 +198,7 @@ function module.init(shared)
if not processedProperty[thisStyle] then if not processedProperty[thisStyle] then
processedProperty[thisStyle] = true processedProperty[thisStyle] = true
for styleIndex,styleValue in pairs(thisStyle) do for styleIndex,styleValue in pairs(thisStyle) do
if type(styleValue) ~= "table" or pcall(styleValue,"__type") ~= "quad_style" then if PcallGetProperty(styleValue,"__type") ~= "quad_style" then
ProcessQuadProperty(processedProperty,iprop,holder,item,className,styleIndex,styleValue) ProcessQuadProperty(processedProperty,iprop,holder,item,className,styleIndex,styleValue)
end end
end end
@ -225,18 +225,29 @@ function module.init(shared)
elseif classOfClassName == "table" then -- if classname is a calss what is included new function, call it for making new object (object) elseif classOfClassName == "table" then -- if classname is a calss what is included new function, call it for making new object (object)
local func = ClassName.new or ClassName.New or ClassName.__new local func = ClassName.new or ClassName.New or ClassName.__new
if ClassName.__noSetup then -- if is support initing props if ClassName.__noSetup then -- if is support initing props
local childs,props,parsed,binds,links = {},pack(...),{},{},{} local childs,props,parsed,binds,links,processed = {},pack(...),{},{},{},{}
for iprop = props.n,1,-1 do for iprop = props.n,1,-1 do
local prop = props[iprop] local prop = props[iprop]
if prop then if prop then
for i,v in pairs(prop) do for i,v in pairs(prop) do
if type(i) == "number" then local quadType = PcallGetProperty(v,"__type")
insert(childs,(iprop == 1) and v or v:Clone()) if bind(i) then
elseif bind(i) then
binds[i] = v binds[i] = v
elseif PcallGetProperty(v,"__type") == "quad_linker" then elseif quadType == "quad_linker" then
links[i] = v links[i] = v
elseif quadType == "quad_style" then
for _,thisStyle in ipairs(parseStyles(v)) do
for styleIndex,styleValue in pairs(thisStyle) do
if not processed[styleIndex] then
processed[styleIndex] = true
parsed[styleIndex] = styleValue
end
end
end
elseif type(i) == "number" then
insert(childs,(iprop == 1) and v or v:Clone())
else else
processed[i] = true
parsed[i] = v parsed[i] = v
end end
end end