Merge branch 'everslick-master'

[etc/awesome.git] / widgets / calendar.lua

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 2ed26a0041a51bb2350f6eb4c37aae1da6a24720..b811f705733fb2a62797c3e8bed1b1b028f53bd9 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -91,9 +91,9 @@ function calendar:show(t_out, inc_offset, scr)
     f:close()
 
     if calendar.followmouse then
     f:close()
 
     if calendar.followmouse then

-        local scrp = mouse.screen
+        scrp = mouse.screen

     else
     else

-        local scrp = scr or calendar.scr_pos
+        scrp = scr or calendar.scr_pos

     end
 
     cal_notification = naughty.notify({
     end
 
     cal_notification = naughty.notify({


@@ -117,11 +117,14 @@ function calendar:attach(widget, args)
                            beautiful.font:find(" "))
     calendar.font_size   = tonumber(args.font_size) or 11
     calendar.fg          = args.fg or beautiful.fg_normal or "#FFFFFF"
                            beautiful.font:find(" "))
     calendar.font_size   = tonumber(args.font_size) or 11
     calendar.fg          = args.fg or beautiful.fg_normal or "#FFFFFF"

-    calendar.bg          = args.bg or beautiful.bg_normal or "#FFFFFF"
+    calendar.bg          = args.bg or beautiful.bg_normal or "#000000"

     calendar.position    = args.position or "top_right"
     calendar.scr_pos     = args.scr_pos or 1
     calendar.followmouse = args.followmouse or false
 
     calendar.position    = args.position or "top_right"
     calendar.scr_pos     = args.scr_pos or 1
     calendar.followmouse = args.followmouse or false
 

+    calendar.fg = string.sub(calendar.fg, 1, 7)
+    calendar.bg = string.sub(calendar.bg, 1, 7)
+

     calendar.offset      = 0
     calendar.notify_icon = nil
 
     calendar.offset      = 0
     calendar.notify_icon = nil