awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #206 from dodo/menu-fixes 

Fixes for awful.menu
This commit is contained in:
Daniel Hahler 2015-04-19 19:02:32 +02:00
parent d2ddb33708 fc39db377f
commit 344965a328
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/awful/menu.lua.in
View File

@ -102,7 +102,7 @@ end
local function item_position(_menu, child) local function item_position(_menu, child)
local in_dir, other, a, b = 0, 0, "height", "width" local in_dir, other, a, b = 0, 0, "height", "width"
local dir = _menu.layout.get_dir and _menu.layout:get_dir() or "y" local dir = _menu.layout.dir or "y"
if dir == "x" then a, b = b, a end if dir == "x" then a, b = b, a end
local in_dir, other = 0, _menu[b] local in_dir, other = 0, _menu[b]
@ -163,7 +163,7 @@ end
local function set_size(_menu) local function set_size(_menu)
local in_dir, other, a, b = 0, 0, "height", "width" local in_dir, other, a, b = 0, 0, "height", "width"
local dir = _menu.layout.get_dir and _menu.layout:get_dir() or "y" local dir = _menu.layout.dir or "y"
if dir == "x" then a, b = b, a end if dir == "x" then a, b = b, a end
for _, item in ipairs(_menu.items) do for _, item in ipairs(_menu.items) do
other = math.max(other, item[b]) other = math.max(other, item[b])
@ -422,6 +422,9 @@ function menu:add(args, index)
table.insert(self.items, item) table.insert(self.items, item)
self.layout:add(item._background) self.layout:add(item._background)
end end
if self.wibox then
set_size(self)
end
return item return item
end end
@ -451,6 +454,9 @@ function menu:delete(num)
end end
table.remove(self.child, num) table.remove(self.child, num)
end end
if self.wibox then
set_size(self)
end
end end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------