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

fix(menubar): apply both menu bg and fg, not only bg (#2372)

This commit is contained in:
Yauhen Kirylau 2018-08-26 18:35:14 +02:00 committed by Emmanuel Lepage Vallée
parent 0275d3537d
commit e332e2d868
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/menubar/init.lua
View File

@ -115,14 +115,16 @@ end
-- @param o The menu item. -- @param o The menu item.
-- @return item name, item background color, background image, item icon. -- @return item name, item background color, background image, item icon.
local function label(o) local function label(o)
local fg_color = theme.menu_fg_normal or theme.fg_normal
local bg_color = theme.menu_bg_normal or theme.bg_normal
if o.focused then if o.focused then
return colortext(o.name, (theme.menu_fg_focus or theme.fg_focus)), fg_color = theme.menu_fg_focus or theme.fg_focus
(theme.menu_bg_focus or theme.bg_focus), bg_color = theme.menu_bg_focus or theme.bg_focus
nil,
o.icon
else
return o.name, (theme.menu_bg_normal or theme.bg_normal), nil, o.icon
end end
return colortext(o.name, fg_color),
bg_color,
nil,
o.icon
end end
local function load_count_table() local function load_count_table()
@ -407,8 +409,14 @@ function menubar.show(scr)
menubar.refresh(scr) menubar.refresh(scr)
end end
local fg_color = theme.menu_fg_normal or theme.fg_normal
local bg_color = theme.menu_bg_normal or theme.bg_normal
instance = { instance = {
wibox = wibox({ ontop = true }), wibox = wibox{
ontop = true,
bg = bg_color,
fg = fg_color,
},
widget = common_args.w, widget = common_args.w,
prompt = awful.widget.prompt(), prompt = awful.widget.prompt(),
query = nil, query = nil,