Merge pull request #468 from scattagain/master

Changed how shape is configured for the volume widget

Author: streetturtle

volume-widget/README.md

@@ -141,7 +141,7 @@ _Note:_ if you are changing icons, the folder should contain following .svg imag
 | `bg_color` | `#ffffff11` | Color of the bar's background |
 | `width` | 50 | The bar width |
 | `margins` | 10 | Top and bottom margins (if your wibar is 22 px high, bar will be 2 px = 22 - 2*10) |
-| `shape` | `bar` | [gears.shape](https://awesomewm.org/doc/api/libraries/gears.shape.html), could be `octogon`, `hexagon`, `powerline`, etc |
+| `shape` | `gears.shape.bar` | A shape painter function (see [gears.shape](https://awesomewm.org/doc/api/libraries/gears.shape.html)) |
 | `with_icon` | true | Show volume icon|
 
 _Note:_ I didn't figure out how does the `forced_height` property of progressbar widget work (maybe it doesn't work at all), thus there is a workaround with margins.
@@ -155,5 +155,5 @@ _Note:_ I didn't figure out how does the `forced_height` property of progressbar
 | `bg_color` | `#ffffff11` | Color of the bar's background |
 | `width` | 10 | The bar width |
 | `margins` | 20 | Top and bottom margins (if your wibar is 22 px high, bar will be 2 px = 22 - 2*10) |
-| `shape` | `bar` | [gears.shape](https://awesomewm.org/doc/api/libraries/gears.shape.html), could be `octogon`, `hexagon`, `powerline`, etc |
+| `shape` | `gears.shape.bar` | A shape painter function (see [gears.shape](https://awesomewm.org/doc/api/libraries/gears.shape.html)) |
 | `with_icon` | true | Show volume icon| 

volume-widget/widgets/horizontal-bar-widget.lua

@@ -14,7 +14,7 @@ function widget.get_widget(widgets_args)
     local bg_color = args.bg_color or '#ffffff11'
     local width = args.width or 50
     local margins = args.margins or 10
-    local shape = args.shape or 'bar'
+    local shape = args.shape or gears.shape.bar
     local with_icon = args.with_icon == true and true or false
 
     local bar = wibox.widget {
@@ -36,7 +36,8 @@ function widget.get_widget(widgets_args)
             color = main_color,
             margins = { top = margins, bottom = margins },
             background_color = bg_color,
-            shape = gears.shape[shape],
+            shape = shape,
+            bar_shape = shape,
             widget = wibox.widget.progressbar,
         },
         spacing = 4,

volume-widget/widgets/vertical-bar-widget.lua

@@ -14,7 +14,7 @@ function widget.get_widget(widgets_args)
     local bg_color = args.bg_color or '#ffffff11'
     local width = args.width or 10
     local margins = args.height or 2
-    local shape = args.shape or 'bar'
+    local shape = args.shape or gears.shape.bar
     local with_icon = args.with_icon == true and true or false
 
     local bar = wibox.widget {
@@ -38,7 +38,8 @@ function widget.get_widget(widgets_args)
                 margins = { top = margins, bottom = margins },
                 color = main_color,
                 background_color = bg_color,
-                shape = gears.shape[shape],
+                shape = shape,
+                bar_shape = shape,
                 widget = wibox.widget.progressbar,
             },
             forced_width = width,