summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstreetturtle <streetturtle@users.noreply.github.com>2020-11-22 14:49:28 -0500
committerGitHub <noreply@github.com>2020-11-22 14:49:28 -0500
commit187393e40088a07dbd8c7e110b8a9ac4ee2915a7 (patch)
tree39c35e1919af8e76aae7d3d9ad9d7c1dcd3574d7
parent207ad20d7233992a4ad11cb22f77fb76ba8c02a4 (diff)
parent907a7c15fa414f44adb295fd8bd7163cb86582d9 (diff)
Merge pull request #216 from tasmo/main
[calendar] Add theme from local config
-rw-r--r--calendar-widget/README.md4
-rw-r--r--calendar-widget/calendar.lua18
2 files changed, 18 insertions, 4 deletions
diff --git a/calendar-widget/README.md b/calendar-widget/README.md
index c30fef6..77b8fe7 100644
--- a/calendar-widget/README.md
+++ b/calendar-widget/README.md
@@ -9,10 +9,11 @@ Calendar widget for Awesome WM - slightly improved version of the `wibox.widget.
| Name | Screenshot |
|---|---|
- |nord (default) | ![nord_theme](./nord.png) |
+ | nord (default) | ![nord_theme](./nord.png) |
| outrun | ![outrun_theme](./outrun.png) |
| light | ![outrun_theme](./light.png) |
| dark | ![outrun_theme](./dark.png) |
+ | naughty (default) | from local theme |
- setup widget placement
@@ -45,6 +46,7 @@ local cw = calendar_widget()
local cw = calendar_widget({
theme = 'outrun',
placement = 'bottom_right'
+ radius = 8
})
mytextclock:connect_signal("button::press",
function(_, _, _, button)
diff --git a/calendar-widget/calendar.lua b/calendar-widget/calendar.lua
index e15d094..5cf97c8 100644
--- a/calendar-widget/calendar.lua
+++ b/calendar-widget/calendar.lua
@@ -68,7 +68,18 @@ local function worker(args)
weekday_fg = '#FD971F',
header_fg = '#F92672',
border = '#75715E'
+ },
+ naughty = {
+ bg = beautiful.notification_bg or beautiful.bg,
+ fg = beautiful.notification_fg or beautiful.fg,
+ focus_date_bg = beautiful.notification_fg or beautiful.fg,
+ focus_date_fg = beautiful.notification_bg or beautiful.bg,
+ weekend_day_bg = beautiful.bg_focus,
+ weekday_fg = beautiful.fg,
+ header_fg = beautiful.fg,
+ border = beautiful.border_normal
}
+
}
local args = args or {}
@@ -78,11 +89,12 @@ local function worker(args)
preset = naughty.config.presets.critical,
title = 'Calendar Widget',
text = 'Theme "' .. args.theme .. '" not found, fallback to default'})
- args.theme = 'nord'
+ args.theme = 'naughty'
end
- local theme = args.theme or 'nord'
+ local theme = args.theme or 'naughty'
local placement = args.placement or 'top'
+ local radius = args.radius or 8
local styles = {}
@@ -175,7 +187,7 @@ local function worker(args)
local popup = awful.popup {
ontop = true,
visible = false,
- shape = gears.shape.rounded_rect,
+ shape = rounded_shape(radius),
offset = { y = 5 },
border_width = 1,
border_color = calendar_themes[theme].border,