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

Add menu 'auto_resize' option for horizontal menus

This commit is contained in:
Emmanuel Lepage Vallee 2013-07-01 18:25:25 -04:00
parent 9dc5137d92
commit 82421bf8bb
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layout/horizontal.lua
View File

@ -134,7 +134,6 @@ function module:setup_item(data,item,args)
end end
icon_flex:set_middle(icon) icon_flex:set_middle(icon)
l:add(icon_flex) l:add(icon_flex)
text_w:set_markup(item._private_data.text)
l:add(text_w) l:add(text_w)
if item._private_data.sub_menu_f or item._private_data.sub_menu_m then if item._private_data.sub_menu_f or item._private_data.sub_menu_m then
local subArrow = wibox.widget.imagebox() --TODO, make global local subArrow = wibox.widget.imagebox() --TODO, make global
@ -174,10 +173,20 @@ function module:setup_item(data,item,args)
data.style(data) data.style(data)
item._internal.set_map.text = function (value) item._internal.set_map.text = function (value)
text_w:set_markup(value) text_w:set_markup(value)
if data.auto_resize then
local fit_w,fit_h = text_w:fit(999,9999)
local is_largest = item == data._internal.largest_item_h
--TODO find new largest is item is smaller
if not data._internal.largest_item_h_v or data._internal.largest_item_h_v < fit_h then
data._internal.largest_item_h =item
data._internal.largest_item_h_v = fit_h
end
end
end end
item._internal.set_map.icon = function (value) item._internal.set_map.icon = function (value)
icon:set_image(value) icon:set_image(value)
end end
item._internal.set_map.text(item._private_data.text)
end end
--Get preferred item geometry --Get preferred item geometry
@ -190,8 +199,13 @@ local function new(data)
local l = wibox.layout.fixed.horizontal() local l = wibox.layout.fixed.horizontal()
l.fit = function(a1,a2,a3) l.fit = function(a1,a2,a3)
local result,r2 = wibox.layout.fixed.fit(a1,99999,99999) local result,r2 = wibox.layout.fixed.fit(a1,99999,99999)
-- return data.rowcount*(data.item_width or data.default_width),data.item_height
if data.auto_resize and data._internal.largest_item_h then
return data.rowcount*(data.item_width or data.default_width),data._internal.largest_item_h_v > data.item_height and data._internal.largest_item_h_v or data.item_height
else
return data.rowcount*(data.item_width or data.default_width),data.item_height return data.rowcount*(data.item_width or data.default_width),data.item_height
end end
end
l.add = function(l,item) l.add = function(l,item)
return wibox.layout.fixed.add(l,item.widget) return wibox.layout.fixed.add(l,item.widget)
end end

3
layout/vertical.lua
View File

@ -216,7 +216,8 @@ local function new(data)
local result,r2 = wibox.layout.fixed.fit(a1,99999,99999) local result,r2 = wibox.layout.fixed.fit(a1,99999,99999)
local total = data._total_item_height local total = data._total_item_height
if data.auto_resize and data._internal.largest_item_w then if data.auto_resize and data._internal.largest_item_w then
return data._internal.largest_item_w_v+100,(total and total > 0 and total or data.rowcount*data.item_height) + (filter_tb and data.item_height or 0) return data._internal.largest_item_w_v+100 > data.default_width and data._internal.largest_item_w_v+100 or data.default_width
,(total and total > 0 and total or data.rowcount*data.item_height) + (filter_tb and data.item_height or 0)
else else
return data.default_width, (total and total > 0 and total or data.rowcount*data.item_height) + (filter_tb and data.item_height or 0) return data.default_width, (total and total > 0 and total or data.rowcount*data.item_height) + (filter_tb and data.item_height or 0)
end end