Merge pull request #398 from BarbUk/feature/tpbat/configurable-battery-thresholds

[etc/awesome.git] / widget / pulsebar.lua

diff --git a/widget/pulsebar.lua b/widget/pulsebar.lua
index 7a0a3d4d9de5b0ce4288871bd3f39a1b1b790a62..158e639cb9e17a2e893beb0304e3e7068dfbfe68 100644 (file)
--- a/widget/pulsebar.lua
+++ b/widget/pulsebar.lua
@@ -1,7 +1,7 @@
 --[[
 
      Licensed under GNU General Public License v2
 --[[
 
      Licensed under GNU General Public License v2

-      * (c) 2013, Luke Bonham
+      * (c) 2013, Luca CPZ

       * (c) 2013, Rman
 
 --]]
       * (c) 2013, Rman
 
 --]]


@@ -123,9 +123,23 @@ local function factory(args)
                 preset.title = preset.title .. " muted"
             end
 
                 preset.title = preset.title .. " muted"
             end
 

-            int = math.modf((pulsebar._current_level / 100) * awful.screen.focused().mywibox.height)
+            -- tot is the maximum number of ticks to display in the notification
+            -- fallback: default horizontal wibox height
+            local wib, tot = awful.screen.focused().mywibox, 20
+
+            -- if we can grab mywibox, tot is defined as its height if
+            -- horizontal, or width otherwise
+            if wib then
+                if wib.position == "left" or wib.position == "right" then
+                    tot = wib.width
+                else
+                    tot = wib.height
+                end
+            end
+
+            int = math.modf((pulsebar._current_level / 100) * tot)

             preset.text = string.format("[%s%s]", string.rep("|", int),
             preset.text = string.format("[%s%s]", string.rep("|", int),

-                          string.rep(" ", awful.screen.focused().mywibox.height - int))
+                          string.rep(" ", tot - int))

 
             if pulsebar.followtag then preset.screen = awful.screen.focused() end
 
 
             if pulsebar.followtag then preset.screen = awful.screen.focused() end