Merge pull request #279 from renatofdds/patch-1

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 9755dc0405e072980b6e937d8e47acb8206c0432..7c446480c0cf6955698f8b5fd5835cd44ac8db3c 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -92,8 +92,9 @@ end
 
 helpers.timer_table = {}
 
 
 helpers.timer_table = {}
 

-function helpers.newtimer(_name, timeout, fun, nostart)
-    local name = timeout
+function helpers.newtimer(name, timeout, fun, nostart, stoppable)
+    if not name or #name == 0 then return end
+    name = (stoppable and name) or timeout

     if not helpers.timer_table[name] then
         helpers.timer_table[name] = timer({ timeout = timeout })
         helpers.timer_table[name]:start()
     if not helpers.timer_table[name] then
         helpers.timer_table[name] = timer({ timeout = timeout })
         helpers.timer_table[name]:start()


@@ -102,6 +103,7 @@ function helpers.newtimer(_name, timeout, fun, nostart)
     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end
     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end

+    return stoppable and helpers.timer_table[name]

 end
 
 -- }}}
 end
 
 -- }}}


@@ -175,9 +177,9 @@ function helpers.spairs(t)
     end
 end
 
     end
 end
 

--- create a lain textbox widget
+-- create a textbox with no spacing issues

 function helpers.make_widget_textbox()
 function helpers.make_widget_textbox()

-    local w = wibox.widget.textbox('')
+    local w = wibox.widget.textbox()

     local t = wibox.widget.base.make_widget(w)
     t.widget = w
     return t
     local t = wibox.widget.base.make_widget(w)
     t.widget = w
     return t