Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

widgets: Apply attributes before adding the widgets 

For example, some layouts may place the widgets in a different order
depending on some attreibutes.
This commit is contained in:
Emmanuel Lepage Vallee 2016-07-23 17:24:11 -04:00
parent 2926d02e96
commit 79394c0965
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/wibox/widget/base.lua
View File

@ -436,6 +436,19 @@ local function drill(ids, content)
-- Clear the internal attributes -- Clear the internal attributes
attributes.id, attributes.layout, attributes.widget = nil, nil, nil attributes.id, attributes.layout, attributes.widget = nil, nil, nil
-- Set layouts attributes, this has to be done before the widgets are added
-- because it might affect the output.
for attr, val in pairs(attributes) do
if l["set_"..attr] then
l["set_"..attr](l, val)
elseif type(l[attr]) == "function" then
l[attr](l, val)
else
l[attr] = val
end
end
-- Add all widgets
for k = 1, max do for k = 1, max do
-- ipairs cannot be used on sparse tables -- ipairs cannot be used on sparse tables
local v, id2, e = widgets[k], id, nil local v, id2, e = widgets[k], id, nil
@ -459,17 +472,6 @@ local function drill(ids, content)
-- Replace all children (if any) with the new ones -- Replace all children (if any) with the new ones
l:set_children(widgets) l:set_children(widgets)
-- Set layouts attributes
for attr, val in pairs(attributes) do
if l["set_"..attr] then
l["set_"..attr](l, val)
elseif type(l[attr]) == "function" then
l[attr](l, val)
else
l[attr] = val
end
end
return l, id return l, id
end end