add master layouts

This commit is contained in:
airstruck
2015-11-11 14:25:50 -05:00
parent a1ab534d6d
commit 68a250e273
3 changed files with 110 additions and 60 deletions

View File

@@ -38,11 +38,12 @@ local function metaIndex (self, property)
local value = Widget[property]
if value ~= nil then return value end
local style = self.layout.style
local layout = self.layout
local style = layout:getStyle()
value = style and style:getProperty(self, property)
if value ~= nil and value ~= 'defer' then return value end
local theme = self.layout.theme
local theme = layout:getTheme()
return theme and theme:getProperty(self, property)
end