Merge pull request #91 from Ram-Z/icon_only

widget/taglist: don't add margin when icon_only = true

lib/awful/widget/common.lua.in

@@ -76,9 +76,13 @@ function common.list_update(w, buttons, label, data, objects)
 
         local text, bg, bg_image, icon = label(o)
         -- The text might be invalid, so use pcall
+        if text == nil or text == "" then
+            m:set_margins(0)
+        else
             if not pcall(tb.set_markup, tb, text) then
                 tb:set_markup("<i>&lt;Invalid text&gt;</i>")
             end
+        end
         bgb:set_bg(bg)
         if type(bg_image) == "function" then
             bg_image = bg_image(tb,o,m,objects,i)

lib/awful/widget/taglist.lua.in

@@ -43,7 +43,7 @@ function taglist.taglist_label(t, args)
     local taglist_squares_resize = theme.taglist_squares_resize or args.squares_resize or "true"
     local taglist_disable_icon = args.taglist_disable_icon or theme.taglist_disable_icon or false
     local font = args.font or theme.taglist_font or theme.font or ""
-    local text = "<span font_desc='"..font.."'>"
+    local text = nil
     local sel = capi.client.focus
     local bg_color = nil
     local fg_color = nil
@@ -98,14 +98,15 @@ function taglist.taglist_label(t, args)
         fg_color = fg_focus
     end
     if not tag.getproperty(t, "icon_only") then
+        text = "<span font_desc='"..font.."'>"
         if fg_color then
             text = text .. "<span color='"..util.color_strip_alpha(fg_color).."'>" ..
                 (util.escape(t.name) or "") .. "</span>"
         else
             text = text .. (util.escape(t.name) or "")
         end
-    end
         text = text .. "</span>"
+    end
     if not taglist_disable_icon then
         if tag.geticon(t) and type(tag.geticon(t)) == "image" then
             icon = tag.geticon(t)