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

aweful.menu: unicode submenu icon 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
dodo 2011-05-17 22:29:00 +02:00 committed by Uli Schlachter
parent 2729357ad2
commit d0a33a38a7
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,8 @@ local function load_theme(a, b)
fallback.menu_bg_normal or fallback.bg_normal fallback.menu_bg_normal or fallback.bg_normal
ret.submenu_icon= a.submenu_icon or b.menu_submenu_icon or b.submenu_icon or ret.submenu_icon= a.submenu_icon or b.menu_submenu_icon or b.submenu_icon or
fallback.menu_submenu_icon or fallback.submenu_icon fallback.menu_submenu_icon or fallback.submenu_icon
ret.submenu = a.submenu or b.menu_submenu or b.submenu or
fallback.menu_submenu or fallback.submenu or "▶"
ret.height = a.height or b.menu_height or b.height or ret.height = a.height or b.menu_height or b.height or
fallback.menu_height or 16 fallback.menu_height or 16
ret.width = a.width or b.menu_width or b.width or ret.width = a.width or b.menu_width or b.width or
@ -574,13 +576,17 @@ function entry(parent, args)
margin:set_left(args.theme.height + 2) margin:set_left(args.theme.height + 2)
end end
-- Create the submenu icon widget -- Create the submenu icon widget
local submenu_icon local submenu
if type(args.cmd) == "table" then if type(args.cmd) == "table" then
submenu_icon = wibox.widget.imagebox()
if args.theme.submenu_icon then if args.theme.submenu_icon then
submenu_icon:set_image( submenu = wibox.widget.imagebox()
submenu:set_image(
capi.oocairo.image_surface_create_from_png( capi.oocairo.image_surface_create_from_png(
args.theme.submenu_icon)) args.theme.submenu_icon))
else
submenu = wibox.widget.textbox()
submenu:set_font(args.theme.font)
submenu:set_text(args.theme.submenu)
end end
end end
-- Add widgets to the wibox -- Add widgets to the wibox
@ -593,12 +599,13 @@ function entry(parent, args)
local layout = wibox.layout.align.horizontal() local layout = wibox.layout.align.horizontal()
layout:set_middle(left) layout:set_middle(left)
if submenu_icon then if submenu then
layout:set_right(submenu_icon) layout:set_right(submenu)
end end
return table_update(ret, { return table_update(ret, {
label = label, label = label,
sep = submenu,
icon = iconbox, icon = iconbox,
widget = layout, widget = layout,
cmd = args.cmd, cmd = args.cmd,