simplify style system

This commit is contained in:
airstruck
2015-12-07 04:22:36 -05:00
parent 367535ad33
commit 69703fdce0
41 changed files with 2227 additions and 292 deletions

View File

@@ -66,8 +66,8 @@ local function metaIndex (self, property)
local layout = self.layout
local style = layout:getStyle()
value = style and style:getProperty(self, property)
if value ~= nil and value ~= 'defer' then return maybeCall(value, self) end
value = style and maybeCall(style:getProperty(self, property), self)
if value ~= nil and value ~= 'defer' then return value end
local theme = layout:getTheme()
return theme and maybeCall(theme:getProperty(self, property), self)