]> 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:

Merge pull request #37 from almonteb/fix/today
authorLuke Bonham <copycat-killer@users.noreply.github.com>
Wed, 9 Apr 2014 19:04:48 +0000 (21:04 +0200)
committerLuke Bonham <copycat-killer@users.noreply.github.com>
Wed, 9 Apr 2014 19:04:48 +0000 (21:04 +0200)
Show today when navigating back to the current month in the calendar

1  2 
widgets/calendar.lua

diff --combined widgets/calendar.lua
index f83b9662546a0c68ff3ce5350ad63aacd203d979,60d0997b4bf6d1e49d88cf40a715acf538af6159..f3d7b8a809f11871b213f16ae4f2da1ce24f3f18
@@@ -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 })