diff options
Diffstat (limited to '.config/awesome/ui/statusbar/panel/widgets/displays.lua')
| -rw-r--r-- | .config/awesome/ui/statusbar/panel/widgets/displays.lua | 78 |
1 files changed, 44 insertions, 34 deletions
diff --git a/.config/awesome/ui/statusbar/panel/widgets/displays.lua b/.config/awesome/ui/statusbar/panel/widgets/displays.lua index b52c986..bfb9113 100644 --- a/.config/awesome/ui/statusbar/panel/widgets/displays.lua +++ b/.config/awesome/ui/statusbar/panel/widgets/displays.lua @@ -1,37 +1,43 @@ -local backlight = require "services.backlight" +-- local backlight = require "services.backlight" local battery = require "services.battery" local phosphor = require "assets.phosphor" -local qmath = require "quarrel.math" +-- local qmath = require "quarrel.math" +local C = require "ui.statusbar.consts" +local qcolor = require "quarrel.color" local qui = require "quarrel.ui" -local qvars = require "quarrel.vars" local wibox = require "wibox" local function create_display(icon, color) + -- the reason this is done is because ids can't be found with `get_children_by_id` across widget boundaries, + -- so we return it as a second value in order to manipulate the icon + local d_icon = qui.icon { + icon = icon, + color = color, + widget = { + id = "icon", + }, + } + return wibox.widget(qui.styled { widget = wibox.container.background, + bg = qcolor.palette.bg.high, { widget = wibox.container.margin, - margins = qvars.big_padding, + margins = qui.BIG_PADDING, { widget = wibox.container.place, { { widget = wibox.container.radialprogressbar, max_value = 100, - border_color = qvars.colors.black, + border_color = qcolor.palette.bg.lowest, color = color, - border_width = qvars.border_width * 2, - forced_height = qvars.element_size * 4, - forced_width = qvars.element_size * 4, + border_width = qui.BORDER_WIDTH * 2, + forced_height = C.ELEMENT_SIZE * 4, + forced_width = C.ELEMENT_SIZE * 4, { widget = wibox.container.place, - qui.icon { - icon = icon, - color = color, - widget = { - id = "icon", - }, - }, + d_icon, }, id = "indicator", }, @@ -44,14 +50,15 @@ local function create_display(icon, color) }, }, layout = wibox.layout.fixed.vertical, - spacing = qvars.big_padding, + spacing = qui.BIG_PADDING, }, }, }, - }) + }), + d_icon end -local d_audio = create_display(phosphor.speaker_simple_high_fill, qvars.colors.fg) +local d_audio, d_audio_icon = create_display(phosphor.speaker_simple_high_fill, qcolor.palette.fg()) awesome.connect_signal("services::audio", function(volume) if not volume then return @@ -61,30 +68,33 @@ awesome.connect_signal("services::audio", function(volume) end) awesome.connect_signal("services::audio::icon", function(icon, color) d_audio:get_children_by_id("indicator")[1].color = color - d_audio:get_children_by_id("icon")[1].image = icon - d_audio:get_children_by_id("icon")[1].stylesheet = qui.recolor(color) + d_audio_icon.image = icon + d_audio_icon.stylesheet = qui.recolor(color) end) -local d_battery = create_display(phosphor.battery_vertical_warning_fill, qvars.colors.red) +local d_battery, d_battery_icon = create_display(phosphor.battery_vertical_warning_fill, qcolor.palette.red()) battery:connect_signal("level", function(_, level) d_battery:get_children_by_id("indicator")[1].value = level d_battery:get_children_by_id("text")[1].text = level .. "%" end) battery:connect_signal("icon", function(_, icon, color) d_battery:get_children_by_id("indicator")[1].color = color - d_battery:get_children_by_id("icon")[1].image = icon - d_battery:get_children_by_id("icon")[1].stylesheet = qui.recolor(color) + d_battery_icon.image = icon + d_battery_icon.stylesheet = qui.recolor(color) end) -local d_brightness = create_display(phosphor.sun_fill, qvars.colors.fg) -backlight:connect_signal("value", function(_, brightness) - brightness = math.floor(qmath.translate_range(brightness, 0, 255, 0, 100)) - d_brightness:get_children_by_id("indicator")[1].value = brightness - d_brightness:get_children_by_id("text")[1].text = brightness .. "%" -end) -backlight:connect_signal("icon", function(_, icon, color) - d_brightness:get_children_by_id("icon")[1].image = icon - d_brightness:get_children_by_id("icon")[1].stylesheet = qui.recolor(color) -end) +-- local d_brightness, d_brightness_icon = create_display(phosphor.sun_fill, qcolor.palette.fg()) +-- backlight:connect_signal("value", function(_, brightness) +-- brightness = math.floor(qmath.translate_range(brightness, 0, 255, 0, 100)) +-- d_brightness:get_children_by_id("indicator")[1].value = brightness +-- d_brightness:get_children_by_id("text")[1].text = brightness .. "%" +-- end) +-- backlight:connect_signal("icon", function(_, icon, color) +-- d_brightness_icon.image = icon +-- d_brightness_icon.stylesheet = qui.recolor(color) +-- end) -return { audio = d_audio, battery = d_battery, brightness = d_brightness } +return { + audio = d_audio, + battery = d_battery, --[[brightness = d_brightness]] +} |