From 53d8d9cac3dfa314b3b95a77971ac849177d8683 Mon Sep 17 00:00:00 2001 From: elenapan Date: Fri, 3 May 2019 18:06:25 +0300 Subject: [PATCH] added fallback values for text_taglist and icon_taglist Former-commit-id: 3e130fc6cf63f3dfc8563006a5a23aa431a8a611 Former-commit-id: f227bb50e03560487c39a3a7cead09fe7e5d4fb7 Former-commit-id: c78a13f89aa23036286bd9afc17cd73e1b6e0f44 Former-commit-id: 1ce34d6db3d7cff773e9f128fb7b1781dd896b3e --- config/awesome/noodle/icon_taglist.lua | 9 +++++---- config/awesome/noodle/text_taglist.lua | 9 ++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/awesome/noodle/icon_taglist.lua b/config/awesome/noodle/icon_taglist.lua index 425d6a4..5597213 100644 --- a/config/awesome/noodle/icon_taglist.lua +++ b/config/awesome/noodle/icon_taglist.lua @@ -65,14 +65,15 @@ local function update_widget() if s.tags[i] then tag_clients = s.tags[i]:clients() end + if s.tags[i] and s.tags[i].selected then - tag_icons[i].image = beautiful.taglist_icons_focused[i] + tag_icons[i].image = beautiful.taglist_icons_focused[i] or beautiful.awesome_icon elseif s.tags[i] and s.tags[i].urgent then - tag_icons[i].image = beautiful.taglist_icons_urgent[i] + tag_icons[i].image = beautiful.taglist_icons_urgent[i] or beautiful.awesome_icon elseif tag_clients and #tag_clients > 0 then - tag_icons[i].image = beautiful.taglist_icons_occupied[i] + tag_icons[i].image = beautiful.taglist_icons_occupied[i] or beautiful.awesome_icon else - tag_icons[i].image = beautiful.taglist_icons_empty[i] + tag_icons[i].image = beautiful.taglist_icons_empty[i] or beautiful.awesome_icon end end end diff --git a/config/awesome/noodle/text_taglist.lua b/config/awesome/noodle/text_taglist.lua index 0abb820..d256f3c 100644 --- a/config/awesome/noodle/text_taglist.lua +++ b/config/awesome/noodle/text_taglist.lua @@ -73,7 +73,6 @@ gears.table.join( end) )) - local function update_widget() for i = 1, ntags do local tag_clients @@ -81,13 +80,13 @@ local function update_widget() tag_clients = s.tags[i]:clients() end if s.tags[i] and s.tags[i].selected then - tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_focused[i], beautiful.taglist_text_color_focused[i]) + tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_focused[i] or tostring(i), beautiful.taglist_text_color_focused[i] or beautiful.fg_focus) elseif s.tags[i] and s.tags[i].urgent then - tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_urgent[i], beautiful.taglist_text_color_urgent[i]) + tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_urgent[i] or tostring(i), beautiful.taglist_text_color_urgent[i] or beautiful.fg_urgent) elseif tag_clients and #tag_clients > 0 then - tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_occupied[i], beautiful.taglist_text_color_occupied[i]) + tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_occupied[i] or tostring(i), beautiful.taglist_text_color_occupied[i] or beautiful.fg_normal) else - tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_empty[i], beautiful.taglist_text_color_empty[i]) + tag_text[i].markup = helpers.colorize_text(beautiful.taglist_text_empty[i] or tostring(i), beautiful.taglist_text_color_empty[i] or beautiful.fg_minimize) end end end