awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1404 from Veratil/tasklist-spacing-fix 

Tasklist spacing fix + taglist spacing doc addition
This commit is contained in:
Emmanuel Lepage Vallée 2017-01-16 23:39:53 -05:00 committed by GitHub
parent 2affe3f6f5 74b5ac72da
commit a9e8cc3dab
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/awful/widget/taglist.lua
View File

@ -111,6 +111,10 @@ taglist.filter = {}
-- @beautiful beautiful.taglist_font -- @beautiful beautiful.taglist_font
-- @param string -- @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. --- The main shape used for the elements.
-- This will be the fallback for state specific shapes. -- This will be the fallback for state specific shapes.
-- To get a shape for the whole taglist, use `wibox.container.background`. -- To get a shape for the whole taglist, use `wibox.container.background`.

15
lib/awful/widget/tasklist.lua
View File

@ -139,7 +139,7 @@ local instances
--- The space between the tasklist elements. --- The space between the tasklist elements.
-- @beautiful beautiful.tasklist_spacing -- @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. --- The default tasklist elements shape.
-- @beautiful beautiful.tasklist_shape -- @beautiful beautiful.tasklist_shape
@ -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 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 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_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 -- FIXME v5, remove the fallback theme.bg_image_* variables, see GH#1403
local bg_image_focus = args.bg_image_focus or theme.bg_image_focus local bg_image_normal = args.bg_image_normal or theme.tasklist_bg_image_normal or theme.bg_image_normal
local bg_image_urgent = args.bg_image_urgent or theme.bg_image_urgent local bg_image_focus = args.bg_image_focus or theme.tasklist_bg_image_focus or theme.bg_image_focus
local bg_image_minimize = args.bg_image_minimize or theme.bg_image_minimize 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 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 = 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 "" local font_focus = args.font_focus or theme.tasklist_font_focus or theme.font_focus or font or ""
@ -404,8 +405,8 @@ function tasklist.new(screen, filter, buttons, style, update_function, base_widg
local data = setmetatable({}, { __mode = 'k' }) local data = setmetatable({}, { __mode = 'k' })
if w.set_spacing and (style and style.spacing or beautiful.taglist_spacing) then if w.set_spacing and (style and style.spacing or beautiful.tasklist_spacing) then
w:set_spacing(style and style.spacing or beautiful.taglist_spacing) w:set_spacing(style and style.spacing or beautiful.tasklist_spacing)
end end
local queued_update = false local queued_update = false