From: Luke Bonham Date: Wed, 9 Apr 2014 19:04:48 +0000 (+0200) Subject: Merge pull request #37 from almonteb/fix/today X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/98c69dc64d151fa737e9466f6c545045f102589f?ds=sidebyside;hp=-c Merge pull request #37 from almonteb/fix/today Show today when navigating back to the current month in the calendar --- 98c69dc64d151fa737e9466f6c545045f102589f diff --combined widgets/calendar.lua index f83b966,60d0997..f3d7b8a --- a/widgets/calendar.lua +++ b/widgets/calendar.lua @@@ -39,7 -39,9 +39,9 @@@ function calendar:show(t_out, inc_offse local today = tonumber(os.date('%d')) local init_t = calendar.cal .. ' | sed -r -e "s/(^| )( ' - if offs == 0 + calendar.offset = calendar.offset + offs + + if offs == 0 or calendar.offset == 0 then -- current month showing, today highlighted if today >= 10 then @@@ -61,7 -63,6 +63,6 @@@ local month = tonumber(os.date('%m')) local year = tonumber(os.date('%Y')) - calendar.offset = calendar.offset + offs month = month + calendar.offset if month > 12 then @@@ -120,11 -121,7 +121,11 @@@ function calendar:attach(widget, args widget:buttons(awful.util.table.join( awful.button({ }, 1, function () calendar:show(0, -1) end), awful.button({ }, 3, function () - calendar:show(0, 1) end) )) + calendar:show(0, 1) end), + awful.button({ }, 4, function () + calendar:show(0, -1) end), + awful.button({ }, 5, function () + calendar:show(0, 1) end))) end return setmetatable(calendar, { __call = function(_, ...) return create(...) end })