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

Fixed Flex Layout Fit Behavior 

Modified flex:fit so that it will not return more than its sub-widgets need.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
sirkha 2014-01-04 09:13:41 -06:00 committed by Uli Schlachter
parent ceaeaedb5b
commit 601dc232db
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/wibox/layout/flex.lua.in
View File

@ -77,35 +77,33 @@ end
-- @param orig_width The available width.
-- @param orig_height The available height.
function flex:fit(orig_width, orig_height)
local used_max = 0
local used_in_dir = self.dir == "y" and orig_height or orig_width
local used_in_dir = 0
local used_in_other = 0
-- Figure out the maximum size we can give out to sub-widgets
local sub_height = self.dir == "x" and orig_height or floor(orig_height / #self.widgets)
local sub_width = self.dir == "y" and orig_width or floor(orig_width / #self.widgets)
for k, v in pairs(self.widgets) do
local w, h = base.fit_widget(v, sub_width, sub_height)
local max = self.dir == "y" and w or h
if max > used_in_other then
used_in_other = max
end
used_in_dir = used_in_dir + (self.dir == "y" and h or w)
end
if self._max_widget_size then
used_in_dir = math.min(used_in_dir,
#self.widgets * self._max_widget_size)
end
-- Figure out the maximum size we can give out to sub-widgets
local sub_height = self.dir == "x" and orig_height or floor(used_in_dir / #self.widgets)
local sub_width = self.dir == "y" and orig_width or floor(used_in_dir / #self.widgets)
for k, v in pairs(self.widgets) do
local w, h = base.fit_widget(v, sub_width, sub_height)
local max
if self.dir == "y" then
max = w
else
max = h
end
if max > used_max then
used_max = max
end
end
if self.dir == "y" then
return used_max, used_in_dir
return used_in_other, used_in_dir
end
return used_in_dir, used_max
return used_in_dir, used_in_other
end
function flex:reset()