From 8ad1be28b05410672d5986be58a5c7c1f2e980a2 Mon Sep 17 00:00:00 2001 From: Nooo37 Date: Mon, 27 Sep 2021 14:59:09 +0200 Subject: [PATCH] refactor to {fg,bg}_{normal,focus}_inactive --- theme-var-template.lua | 6 ++++-- widget/tabbar/boxes.lua | 14 ++++++++------ widget/tabbar/default.lua | 14 ++++++++------ widget/tabbar/modern.lua | 14 ++++++++------ widget/tabbar/pure.lua | 14 ++++++++------ 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/theme-var-template.lua b/theme-var-template.lua index 48110f6..e4ef801 100644 --- a/theme-var-template.lua +++ b/theme-var-template.lua @@ -36,8 +36,10 @@ theme.tabbar_bg_normal = "#000000" -- background color of the focused client on theme.tabbar_fg_normal = "#ffffff" -- foreground color of the focused client on the tabbar theme.tabbar_bg_focus = "#1A2026" -- background color of unfocused clients on the tabbar theme.tabbar_fg_focus = "#ff0000" -- foreground color of unfocused clients on the tabbar -theme.tabbar_bg_inactive = nil -- background color of the current client on the tabbar when unfocused -theme.tabbar_fg_inactive = nil -- foreground color of the current client on the tabbar when unfocused +theme.tabbar_bg_focus_inactive = nil -- background color of the focused client on the tabbar when inactive +theme.tabbar_fg_focus_inactive = nil -- foreground color of the focused client on the tabbar when inactive +theme.tabbar_bg_normal_inactive = nil -- background color of unfocused clients on the tabbar when inactive +theme.tabbar_fg_normal_inactive = nil -- foreground color of unfocused clients on the tabbar when inactive -- mstab theme.mstab_bar_ontop = false -- whether you want to allow the bar to be ontop of clients diff --git a/widget/tabbar/boxes.lua b/widget/tabbar/boxes.lua index 7c38110..720f420 100644 --- a/widget/tabbar/boxes.lua +++ b/widget/tabbar/boxes.lua @@ -8,18 +8,20 @@ local bg_normal = beautiful.tabbar_bg_normal or beautiful.bg_normal or "#ffffff" local fg_normal = beautiful.tabbar_fg_normal or beautiful.fg_normal or "#000000" local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000" local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff" -local bg_inactive = beautiful.tabbar_bg_inactive or bg_focus -local fg_inactive = beautiful.tabbar_fg_inactive or fg_focus +local bg_focus_inactive = beautiful.tabbar_bg_focus_inactive or bg_focus +local fg_focus_inactive = beautiful.tabbar_fg_focus_inactive or fg_focus +local bg_normal_inactive = beautiful.tabbar_bg_normal_inactive or bg_normal +local fg_normal_inactive = beautiful.tabbar_fg_normal_inactive or fg_normal local font = beautiful.tabbar_font or beautiful.font or "Hack 15" local size = beautiful.tabbar_size or 40 local position = beautiful.tabbar_position or "bottom" local function create(c, focused_bool, buttons, inactive_bool) - local bg_temp = bg_normal - local fg_temp = fg_normal + local bg_temp = inactive_bool and bg_normal_inactive or bg_normal + local fg_temp = inactive_bool and fg_normal_inactive or fg_normal if focused_bool then - bg_temp = inactive_bool and bg_inactive or bg_focus - fg_temp = inactive_bool and fg_inactive or fg_focus + bg_temp = inactive_bool and bg_focus_inactive or bg_focus + fg_temp = inactive_bool and fg_focus_inactive or fg_focus end local wid_temp = wibox.widget({ { diff --git a/widget/tabbar/default.lua b/widget/tabbar/default.lua index 1588219..ad6b0b1 100644 --- a/widget/tabbar/default.lua +++ b/widget/tabbar/default.lua @@ -7,8 +7,10 @@ local bg_normal = beautiful.tabbar_bg_normal or beautiful.bg_normal or "#ffffff" local fg_normal = beautiful.tabbar_fg_normal or beautiful.fg_normal or "#000000" local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000" local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff" -local bg_inactive = beautiful.tabbar_bg_inactive or bg_focus -local fg_inactive = beautiful.tabbar_fg_inactive or fg_focus +local bg_focus_inactive = beautiful.tabbar_bg_focus_inactive or bg_focus +local fg_focus_inactive = beautiful.tabbar_fg_focus_inactive or fg_focus +local bg_normal_inactive = beautiful.tabbar_bg_normal_inactive or bg_normal +local fg_normal_inactive = beautiful.tabbar_fg_normal_inactive or fg_normal local font = beautiful.tabbar_font or beautiful.font or "Hack 15" local size = beautiful.tabbar_size or 20 local position = beautiful.tabbar_position or "top" @@ -16,11 +18,11 @@ local position = beautiful.tabbar_position or "top" local function create(c, focused_bool, buttons, inactive_bool) local flexlist = wibox.layout.flex.horizontal() local title_temp = c.name or c.class or "-" - local bg_temp = bg_normal - local fg_temp = fg_normal + local bg_temp = inactive_bool and bg_normal_inactive or bg_normal + local fg_temp = inactive_bool and fg_normal_inactive or fg_normal if focused_bool then - bg_temp = inactive_bool and bg_inactive or bg_focus - fg_temp = inactive_bool and fg_inactive or fg_focus + bg_temp = inactive_bool and bg_focus_inactive or bg_focus + fg_temp = inactive_bool and fg_focus_inactive or fg_focus end local text_temp = wibox.widget.textbox() text_temp.align = "center" diff --git a/widget/tabbar/modern.lua b/widget/tabbar/modern.lua index bce520a..5f48066 100644 --- a/widget/tabbar/modern.lua +++ b/widget/tabbar/modern.lua @@ -10,8 +10,10 @@ local bg_normal = beautiful.tabbar_bg_normal or beautiful.bg_normal or "#ffffff" local fg_normal = beautiful.tabbar_fg_normal or beautiful.fg_normal or "#000000" local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000" local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff" -local bg_inactive = beautiful.tabbar_bg_inactive or bg_focus -local fg_inactive = beautiful.tabbar_fg_inactive or fg_focus +local bg_focus_inactive = beautiful.tabbar_bg_focus_inactive or bg_focus +local fg_focus_inactive = beautiful.tabbar_fg_focus_inactive or fg_focus +local bg_normal_inactive = beautiful.tabbar_bg_normal_inactive or bg_normal +local fg_normal_inactive = beautiful.tabbar_fg_normal_inactive or fg_normal local font = beautiful.tabbar_font or beautiful.font or "Hack 15" local size = beautiful.tabbar_size or dpi(40) local border_radius = beautiful.mstab_border_radius @@ -71,11 +73,11 @@ end local function create(c, focused_bool, buttons, inactive_bool) -- local flexlist = wibox.layout.flex.horizontal() local title_temp = c.name or c.class or "-" - local bg_temp = bg_normal - local fg_temp = fg_normal + local bg_temp = inactive_bool and bg_normal_inactive or bg_normal + local fg_temp = inactive_bool and fg_normal_inactive or fg_normal if focused_bool then - bg_temp = inactive_bool and bg_inactive or bg_focus - fg_temp = inactive_bool and fg_inactive or fg_focus + bg_temp = inactive_bool and bg_focus_inactive or bg_focus + fg_temp = inactive_bool and fg_focus_inactive or fg_focus end local text_temp = wibox.widget.textbox() text_temp.align = "center" diff --git a/widget/tabbar/pure.lua b/widget/tabbar/pure.lua index 305a8c4..5be82e5 100644 --- a/widget/tabbar/pure.lua +++ b/widget/tabbar/pure.lua @@ -8,18 +8,20 @@ local bg_normal = beautiful.tabbar_bg_normal or beautiful.bg_normal or "#ffffff" local fg_normal = beautiful.tabbar_fg_normal or beautiful.fg_normal or "#000000" local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000" local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff" -local bg_inactive = beautiful.tabbar_bg_inactive or bg_focus -local fg_inactive = beautiful.tabbar_fg_inactive or fg_focus +local bg_focus_inactive = beautiful.tabbar_bg_focus_inactive or bg_focus +local fg_focus_inactive = beautiful.tabbar_fg_focus_inactive or fg_focus +local bg_normal_inactive = beautiful.tabbar_bg_normal_inactive or bg_normal +local fg_normal_inactive = beautiful.tabbar_fg_normal_inactive or fg_normal local font = beautiful.tabbar_font or beautiful.font or "Hack 15" local size = beautiful.tabbar_size or 20 local position = beautiful.tabbar_position or "top" local function create(c, focused_bool, buttons, inactive_bool) - local bg_temp = bg_normal - local fg_temp = fg_normal + local bg_temp = inactive_bool and bg_normal_inactive or bg_normal + local fg_temp = inactive_bool and fg_normal_inactive or fg_normal if focused_bool then - bg_temp = inactive_bool and bg_inactive or bg_focus - fg_temp = inactive_bool and fg_inactive or fg_focus + bg_temp = inactive_bool and bg_focus_inactive or bg_focus + fg_temp = inactive_bool and fg_focus_inactive or fg_focus end local wid_temp = wibox.widget({