Merge pull request #377 from sim590/menu-iterator

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

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index fb9c2e489301cbb48fd729ac2c82b96dce8734fa..b253d4b3ed8d6754e8ce9e46350352acd09d9d58 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -1,10 +1,9 @@
-
 --[[
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Luke Bonham                     
-      * (c) 2013, Rman                            
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013, Luca CPZ
+      * (c) 2013, Rman
+
 --]]
 
 local helpers        = require("lain.helpers")
@@ -108,15 +107,22 @@ local function factory(args)
         alsabar.update(function()
             local preset = alsabar.notification_preset
 
+            preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
+
             if alsabar._playback == "off" then
-                preset.title = string.format("%s - Muted", alsabar.channel)
-            else
-                preset.title = string.format("%s - %s%%", alsabar.channel, alsabar._current_level)
+                preset.title = preset.title .. " Muted"
+            end
+
+            local wib = awful.screen.focused().mywibox
+
+            local tot = wib.height
+            if wib.position == "left" or wib.position == "right" then
+                tot = wib.width
             end
 
-            int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height)
+            int = math.modf((alsabar._current_level / 100) * tot)
             preset.text = string.format("[%s%s]", string.rep("|", int),
-                          string.rep(" ", awful.screen.focused().mywibox.height - int))
+                          string.rep(" ", tot - int))
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end