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

awful: avoid concat of nil 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-08-21 14:57:31 +02:00
parent 1dab8894a7
commit c3a1e36be1
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/awful.lua.in
View File

@ -1450,21 +1450,32 @@ function titlebar.update(c)
c.titlebar.fg = titlebar.data[c].fg_focus c.titlebar.fg = titlebar.data[c].fg_focus
c.titlebar.bg = titlebar.data[c].bg_focus c.titlebar.bg = titlebar.data[c].bg_focus
if close then if close then
close.text = theme.titlebar_close_button_focus or if theme.titlebar_close_button_focus then
"<bg image=\"" .. theme.titlebar_close_button_img_focus .. "\" resize=\"true\"/>" or close.text = theme.titlebar_close_button_focus
elseif theme.titlebar_close_button_img_focus then
close.text =
"<bg image=\"" .. theme.titlebar_close_button_img_focus .. "\" resize=\"true\"/>"
else
close.text =
"<bg image=\"@AWESOME_ICON_PATH@/titlebar/closer.png\" resize=\"true\"/>" "<bg image=\"@AWESOME_ICON_PATH@/titlebar/closer.png\" resize=\"true\"/>"
end
end end
else else
c.titlebar.fg = titlebar.data[c].fg c.titlebar.fg = titlebar.data[c].fg
c.titlebar.bg = titlebar.data[c].bg c.titlebar.bg = titlebar.data[c].bg
if close then if close then
close.text = theme.titlebar_close_button_normal or if theme.titlebar_close_button_normal then
"<bg image=\"" .. theme.titlebar_close_button_img_normal .. "\" resize=\"true\"/>" or close.text = theme.titlebar_close_button_normal
elseif theme.titlebar_close_button_img_normal then
close.text =
"<bg image=\"" .. theme.titlebar_close_button_img_normal .. "\" resize=\"true\"/>"
else
close.text =
"<bg image=\"@AWESOME_ICON_PATH@/titlebar/close.png\" resize=\"true\"/>" "<bg image=\"@AWESOME_ICON_PATH@/titlebar/close.png\" resize=\"true\"/>"
end end
end end
end end
end
end end
--- Remove a titlebar from a client. --- Remove a titlebar from a client.