X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f58970997ea2130947aae58a88019b4b70478d68..bd636ca4184bb83db3db02a2ee34d8cf80f22c24:/widget/alsabar.lua diff --git a/widget/alsabar.lua b/widget/alsabar.lua index ea78ec5..b86c085 100644 --- a/widget/alsabar.lua +++ b/widget/alsabar.lua @@ -6,12 +6,14 @@ --]] -local helpers = require("lain.helpers") -local awful = require("awful") -local naughty = require("naughty") -local wibox = require("wibox") - -local math, string, type, tonumber = math, string, type, tonumber +local helpers = require("lain.helpers") +local awful = require("awful") +local naughty = require("naughty") +local wibox = require("wibox") +local math = math +local string = string +local type = type +local tonumber = tonumber -- ALSA volume bar -- lain.widget.alsabar @@ -46,8 +48,7 @@ local function factory(args) alsabar.notification_preset = args.notification_preset if not alsabar.notification_preset then - alsabar.notification_preset = {} - alsabar.notification_preset.font = "Monospace 10" + alsabar.notification_preset = { font = "Monospace 10" } end local format_cmd = string.format("%s get %s", alsabar.cmd, alsabar.channel) @@ -113,16 +114,21 @@ local function factory(args) end -- 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 + local tot = alsabar.notification_preset.max_ticks + + if not tot then + local wib = awful.screen.focused().mywibox + -- 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 + -- fallback: default horizontal wibox height else - tot = wib.height + tot = 20 end end