]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix calender widget not highlighting date
author2009 <justin.endacott@gmail.com>
Wed, 1 Feb 2017 09:08:55 +0000 (19:08 +1000)
committerGitHub <noreply@github.com>
Wed, 1 Feb 2017 09:08:55 +0000 (19:08 +1000)
- os.date was returning the day as 01 which meant the calendar icon was looking for 01.png instead of 1.png
- looks like the cal command pads the singe didgets which the gsub didn't account for

widgets/calendar.lua

index 17fc45d8996d56d8ae6557812cc9425914b15fd2..ef6c5e7577143d9492d62ad6c3a098154ec6db44 100644 (file)
@@ -38,7 +38,7 @@ function calendar.show(t_out, inc_offset, scr)
 
     if current_month then -- today highlighted
         calendar.offset = 0
-        calendar.notify_icon = string.format("%s%s.png", calendar.icons, today)
+        calendar.notify_icon = string.format("%s%s.png", calendar.icons, tonumber(today))
         f = calendar.cal
     else -- no current month showing, no day to highlight
        local month = tonumber(os.date("%m"))
@@ -68,7 +68,7 @@ function calendar.show(t_out, inc_offset, scr)
 
     helpers.async(f, function(ws)
         fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
-        ws = ws:gsub("%c%[%d+[m]?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
+        ws = ws:gsub("%c%[+%d+[m]?%s?%d+%c%[+%d+[m]?", markup.bold(markup.color(bg, fg, today:gsub("^0", " "))))
         calendar.hide()
         calendar.notification = naughty.notify({
             preset      = calendar.notification_preset,