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

awful.widget: fix taglist label without beautiful (FS#353) 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-10-23 17:55:38 +02:00
parent 2e3744de9d
commit 9f8773ddfa
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/awful/widget.lua.in
View File

@ -104,9 +104,9 @@ function taglist.label.all(t, args)
local bg_focus = args.bg_focus or theme.taglist_bg_focus or theme.bg_focus local bg_focus = args.bg_focus or theme.taglist_bg_focus or theme.bg_focus
local fg_urgent = args.fg_urgent or theme.taglist_fg_urgent or theme.fg_urgent local fg_urgent = args.fg_urgent or theme.taglist_fg_urgent or theme.fg_urgent
local bg_urgent = args.bg_urgent or theme.taglist_bg_urgent or theme.bg_urgent local bg_urgent = args.bg_urgent or theme.taglist_bg_urgent or theme.bg_urgent
local taglist_squares = args.taglist_squares or theme.taglist_squares local taglist_squares = args.taglist_squares or theme.taglist_squares or "true"
local taglist_squares_sel = args.squares_sel or theme.squares_sel local taglist_squares_sel = args.squares_sel or theme.squares_sel or "@AWESOME_ICON_PATH@/taglist/squarefw.png"
local taglist_squares_unsel = args.squares_unsel or theme.squares_unsel local taglist_squares_unsel = args.squares_unsel or theme.squares_unsel or "@AWESOME_ICON_PATH@/taglist/squarew.png"
local text local text
local background = "" local background = ""
local sel = capi.client.focus local sel = capi.client.focus
@ -117,25 +117,18 @@ function taglist.label.all(t, args)
fg_color = fg_focus fg_color = fg_focus
end end
if sel and sel:tags()[t] then if sel and sel:tags()[t] then
if not taglist_squares or taglist_squares == "true" then if taglist_squares == "true" then
if taglist_squares_sel then background = "resize=\"true\" image=\"" .. taglist_squares_sel .. "\""
background = "resize=\"true\" image=\"" .. taglist_squares_sel .. "\""
else
background = "resize=\"true\" image=\"@AWESOME_ICON_PATH@/taglist/squarefw.png\""
end
end end
elseif bg_urgent or fg_urgent then else
for k, c in pairs(t:clients()) do local cls = t:clients()
if not taglist_squares or taglist_squares == "true" then if #cls > 0 and taglist_squares == "true" then
if taglist_squares_unsel then background = "resize=\"true\" image=\"" .. taglist_squares_unsel .. "\""
background = "resize=\"true\" image=\"" .. taglist_squares_unsel .. "\"" end
else for k, c in pairs(cls) do
background = "resize=\"true\" image=\"@AWESOME_ICON_PATH@/taglist/squarew.png\""
end
end
if c.urgent then if c.urgent then
bg_color = bg_urgent if bg_urgent then bg_color = bg_urgent end
fg_color = fg_urgent if fg_urgent then fg_color = fg_urgent end
break break
end end
end end