From c3b565faabc6d6548065af9de3ed1309432aef9e Mon Sep 17 00:00:00 2001 From: Kevin Zander Date: Mon, 16 Jan 2017 01:11:42 -0600 Subject: [PATCH 1/3] Fix theme lookup of tasklist_spacing; fix doc typo --- lib/awful/widget/tasklist.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/awful/widget/tasklist.lua b/lib/awful/widget/tasklist.lua index 3244bc5a..6c448a34 100644 --- a/lib/awful/widget/tasklist.lua +++ b/lib/awful/widget/tasklist.lua @@ -139,7 +139,7 @@ local instances --- The space between the tasklist elements. -- @beautiful beautiful.tasklist_spacing --- @tparam[opt=0] number spacing The spacing between tags. +-- @tparam[opt=0] number spacing The spacing between tasks. --- The default tasklist elements shape. -- @beautiful beautiful.tasklist_shape @@ -404,8 +404,8 @@ function tasklist.new(screen, filter, buttons, style, update_function, base_widg local data = setmetatable({}, { __mode = 'k' }) - if w.set_spacing and (style and style.spacing or beautiful.taglist_spacing) then - w:set_spacing(style and style.spacing or beautiful.taglist_spacing) + if w.set_spacing and (style and style.spacing or beautiful.tasklist_spacing) then + w:set_spacing(style and style.spacing or beautiful.tasklist_spacing) end local queued_update = false From 56a2e988961e9e1f4317cc7039e166bc968e3d41 Mon Sep 17 00:00:00 2001 From: Kevin Zander Date: Mon, 16 Jan 2017 01:12:12 -0600 Subject: [PATCH 2/3] Add doc for taglist_spacing --- lib/awful/widget/taglist.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/awful/widget/taglist.lua b/lib/awful/widget/taglist.lua index 86a2ea9e..037a2cd8 100644 --- a/lib/awful/widget/taglist.lua +++ b/lib/awful/widget/taglist.lua @@ -111,6 +111,10 @@ taglist.filter = {} -- @beautiful beautiful.taglist_font -- @param string +--- The space between the taglist elements. +-- @beautiful beautiful.taglist_spacing +-- @tparam[opt=0] number spacing The spacing between tags. + --- The main shape used for the elements. -- This will be the fallback for state specific shapes. -- To get a shape for the whole taglist, use `wibox.container.background`. From 74b5ac72dad84f97f586091050993a9e0b959d2a Mon Sep 17 00:00:00 2001 From: Kevin Zander Date: Mon, 16 Jan 2017 01:58:26 -0600 Subject: [PATCH 3/3] Fix incorrect variable lookup for theme.tasklist_bg_image_* --- lib/awful/widget/tasklist.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/awful/widget/tasklist.lua b/lib/awful/widget/tasklist.lua index 6c448a34..eb0bffba 100644 --- a/lib/awful/widget/tasklist.lua +++ b/lib/awful/widget/tasklist.lua @@ -208,10 +208,11 @@ local function tasklist_label(c, args, tb) local bg_urgent = args.bg_urgent or theme.tasklist_bg_urgent or theme.bg_urgent or bg_normal local fg_minimize = util.ensure_pango_color(args.fg_minimize or theme.tasklist_fg_minimize or theme.fg_minimize, fg_normal) local bg_minimize = args.bg_minimize or theme.tasklist_bg_minimize or theme.bg_minimize or bg_normal - local bg_image_normal = args.bg_image_normal or theme.bg_image_normal - local bg_image_focus = args.bg_image_focus or theme.bg_image_focus - local bg_image_urgent = args.bg_image_urgent or theme.bg_image_urgent - local bg_image_minimize = args.bg_image_minimize or theme.bg_image_minimize + -- FIXME v5, remove the fallback theme.bg_image_* variables, see GH#1403 + local bg_image_normal = args.bg_image_normal or theme.tasklist_bg_image_normal or theme.bg_image_normal + local bg_image_focus = args.bg_image_focus or theme.tasklist_bg_image_focus or theme.bg_image_focus + local bg_image_urgent = args.bg_image_urgent or theme.tasklist_bg_image_urgent or theme.bg_image_urgent + local bg_image_minimize = args.bg_image_minimize or theme.tasklist_bg_image_minimize or theme.bg_image_minimize local tasklist_disable_icon = args.tasklist_disable_icon or theme.tasklist_disable_icon or false local font = args.font or theme.tasklist_font or theme.font or "" local font_focus = args.font_focus or theme.tasklist_font_focus or theme.font_focus or font or ""