Merge pull request #427 from Luka5W/master

complete redesign of #417, working now (tm)
This commit is contained in:
streetturtle 2023-11-23 20:57:10 -05:00 committed by GitHub
commit 4a807514c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions

View File

@ -70,10 +70,10 @@ local function worker(user_args)
border = '#75715E' border = '#75715E'
}, },
naughty = { naughty = {
bg = beautiful.notification_bg or beautiful.bg, bg = beautiful.notification_bg or beautiful.bg or beautiful.bg_normal,
fg = beautiful.notification_fg or beautiful.fg, fg = beautiful.notification_fg or beautiful.fg or beautiful.fg_normal,
focus_date_bg = beautiful.notification_fg or beautiful.fg, focus_date_bg = beautiful.notification_fg or beautiful.fg or beautiful.fg_normal,
focus_date_fg = beautiful.notification_bg or beautiful.bg, focus_date_fg = beautiful.notification_bg or beautiful.bg or beautiful.bg_normal,
weekend_day_bg = beautiful.bg_focus, weekend_day_bg = beautiful.bg_focus,
weekday_fg = beautiful.fg, weekday_fg = beautiful.fg,
header_fg = beautiful.fg, header_fg = beautiful.fg,
@ -155,11 +155,14 @@ local function worker(user_args)
widget:set_markup(props.markup(widget:get_text())) widget:set_markup(props.markup(widget:get_text()))
end end
-- Change bg color for weekends -- Change bg color for weekends
local default_bg
if (flag == "normal") then
local d = { year = date.year, month = (date.month or 1), day = (date.day or 1) } local d = { year = date.year, month = (date.month or 1), day = (date.day or 1) }
local weekday = tonumber(os.date('%w', os.time(d))) local weekday = tonumber(os.date('%w', os.time(d)))
local default_bg = (flag == 'focus' or flag == 'normal') and (weekday == 0 or weekday == 6) default_bg = (weekday == 0 or weekday == 6)
and calendar_themes[theme].weekend_day_bg and calendar_themes[theme].weekend_day_bg
or calendar_themes[theme].bg or calendar_themes[theme].bg
end
local ret = wibox.widget { local ret = wibox.widget {
{ {
{ {
@ -174,7 +177,7 @@ local function worker(user_args)
shape_border_color = props.border_color or '#000000', shape_border_color = props.border_color or '#000000',
shape_border_width = props.border_width or 0, shape_border_width = props.border_width or 0,
fg = props.fg_color or calendar_themes[theme].fg, fg = props.fg_color or calendar_themes[theme].fg,
bg = default_bg, bg = props.bg_color or default_bg,
widget = wibox.container.background widget = wibox.container.background
} }