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

taglist/tasklist: Fix the fallback font. 

When beautiful.font isn't set, it fell back to "". That value isn't
actually the same as the "default" Pango font. Better use `nil`.
This commit is contained in:
Emmanuel Lepage Vallee 2021-11-13 00:12:44 -08:00
parent 686c4fec22
commit b8dbba34db
2 changed files with 7 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

@ -251,7 +251,7 @@ function taglist.taglist_label(t, args)
local taglist_squares_unsel_empty = args.squares_unsel_empty or theme.taglist_squares_unsel_empty
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 font = args.font or theme.taglist_font or theme.font
local text = nil
local sel = capi.client.focus
local bg_color = nil
@ -361,7 +361,7 @@ function taglist.taglist_label(t, args)
end
if not tag.getproperty(t, "icon_only") then
text = "<span font_desc='"..font.."'>"
text = "<span font_desc='"..(font or "").."'>"
if fg_color then
text = text .. "<span color='" .. gcolor.ensure_pango_color(fg_color) ..
"'>" .. (gstring.xml_escape(t.name) or "") .. "</span>"

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

@ -335,12 +335,12 @@ local function tasklist_label(c, args, tb)
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 tasklist_disable_icon = args.disable_icon or args.tasklist_disable_icon or theme.tasklist_disable_icon or false
local disable_task_name = args.disable_task_name or theme.tasklist_disable_task_name 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 ""
local font_minimized = args.font_minimized or theme.tasklist_font_minimized or theme.font_minimized or font or ""
local font_urgent = args.font_urgent or theme.tasklist_font_urgent or theme.font_urgent or font or ""
local font = args.font or theme.tasklist_font or theme.font
local font_focus = args.font_focus or theme.tasklist_font_focus or theme.font_focus or font
local font_minimized = args.font_minimized or theme.tasklist_font_minimized or theme.font_minimized or font
local font_urgent = args.font_urgent or theme.tasklist_font_urgent or theme.font_urgent or font
local text = ""
local name = ""
local bg