diff options
author | Pavel Makhov <pmakhov@theoctavegroup.com> | 2019-05-03 15:23:12 -0400 |
---|---|---|
committer | Pavel Makhov <pmakhov@theoctavegroup.com> | 2019-05-03 15:23:12 -0400 |
commit | f77df958104badf284061603e4e945b32ac6aeb6 (patch) | |
tree | c5baa0866a94db6ec3b67ec58895a375f3de4d21 /volumearc-widget/volumearc.lua | |
parent | 768b979f87fb374b607075651591425bbcda9dd6 (diff) | |
parent | 429e6eb54a5bab17d7adba8956fcbc0a63257ed5 (diff) |
fix conflicts
Diffstat (limited to 'volumearc-widget/volumearc.lua')
-rw-r--r-- | volumearc-widget/volumearc.lua | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/volumearc-widget/volumearc.lua b/volumearc-widget/volumearc.lua index 4a91cd3..62b18ab 100644 --- a/volumearc-widget/volumearc.lua +++ b/volumearc-widget/volumearc.lua @@ -27,8 +27,8 @@ local function worker(args) local args = args or {} - local main_color = args.main_color or beautiful.widget_main_color - local mute_color = args.mute_color or beautiful.widget_red + local main_color = args.main_color or beautiful.fg_color + local mute_color = args.mute_color or beautiful.fg_urgent local path_to_icon = args.path_to_icon or PATH_TO_ICON local thickness = args.thickness or 2 local height = args.height or 18 @@ -38,7 +38,6 @@ local function worker(args) local dec_volume_cmd = args.dec_volume_cmd or DEC_VOLUME_CMD local tog_volume_cmd = args.tog_volume_cmd or TOG_VOLUME_CMD - local icon = { id = "icon", image = path_to_icon, @@ -59,8 +58,8 @@ local function worker(args) } local update_graphic = function(widget, stdout, _, _, _) - local mute = string.match(stdout, "%[(o%D%D?)%]") - local volume = string.match(stdout, "(%d?%d?%d)%%") + local mute = string.match(stdout, "%[(o%D%D?)%]") -- \[(o\D\D?)\] - [on] or [off] + local volume = string.match(stdout, "(%d?%d?%d)%%") -- (\d?\d?\d)\%) volume = tonumber(string.format("% 3d", volume)) widget.value = volume / 100; |