{alsa,pulse}bar: consider wibar orientation when calculating notification size; #384

diff --git a/widget/alsabar.lua b/widget/alsabar.lua
index 125b992055a1ce6fe2cdd91f7d48514630da652d..b253d4b3ed8d6754e8ce9e46350352acd09d9d58 100644 (file)
--- a/widget/alsabar.lua
+++ b/widget/alsabar.lua
@@ -113,9 +113,16 @@ local function factory(args)
                 preset.title = preset.title .. " Muted"
             end
 
                 preset.title = preset.title .. " Muted"
             end
 

-            int = math.modf((alsabar._current_level / 100) * awful.screen.focused().mywibox.height)
+            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) * 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 alsabar.followtag then preset.screen = awful.screen.focused() end
 
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end
 

diff --git a/widget/pulsebar.lua b/widget/pulsebar.lua
index 78b7d49e385ea5f150b581846f82e0c1b265326a..30fbb40c4557ee547e189c31268528bd6069be9b 100644 (file)
--- a/widget/pulsebar.lua
+++ b/widget/pulsebar.lua
@@ -123,9 +123,16 @@ 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)
+            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((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