awesomewm-mirrors
/
awesome-wm-widgets
mirror of https://github.com/streetturtle/awesome-wm-widgets.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #277 from Aire-One/274-make-beautiful-optional 

[fs-widget] Implement an alternative config pattern
This commit is contained in:
streetturtle 2021-06-28 15:07:02 -04:00 committed by GitHub
parent 88e37c2fec 45ec8f85b8
commit 4859e55c24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fs-widget/fs-widget.lua
View File

@ -34,37 +34,27 @@ config.popup_bar_border_color = '#535d6c66'
local function worker(user_args) local function worker(user_args)
local args = user_args or {} local args = user_args or {}
if beautiful ~= nil then -- Setup config for the widget instance.
config.widget_bar_color = beautiful.fg_normal -- The `_config` table will keep the first existing value after checking
config.widget_border_color = beautiful.bg_focus -- in this order: user parameter > beautiful > module default.
config.widget_onclick_bg = beautiful.bg_focus local _config = {}
config.widget_background_color = beautiful.bg_normal for prop, value in pairs(config) do
_config[prop] = args[prop] or beautiful[prop] or value
config.popup_bg = beautiful.bg_normal
config.popup_border_color = beautiful.bg_focus
config.popup_bar_color = beautiful.fg_normal
config.popup_bar_border_color = beautiful.bg_focus
config.popup_bar_background_color = beautiful.bg_normal
config.popup_bar_border_color = beautiful.bg_focus
end
for prop, value in pairs(args) do
config[prop] = value
end end
storage_bar_widget = wibox.widget { storage_bar_widget = wibox.widget {
{ {
id = 'progressbar', id = 'progressbar',
color = config.widget_bar_color, color = _config.widget_bar_color,
max_value = 100, max_value = 100,
forced_height = 20, forced_height = 20,
forced_width = config.widget_width, forced_width = _config.widget_width,
paddings = 2, paddings = 2,
margins = 4, margins = 4,
border_width = 1, border_width = 1,
border_radius = 2, border_radius = 2,
border_color = config.widget_border_color, border_color = _config.widget_border_color,
background_color = config.widget_background_color, background_color = _config.widget_background_color,
widget = wibox.widget.progressbar widget = wibox.widget.progressbar
}, },
shape = function(cr, width, height) shape = function(cr, width, height)
@ -99,12 +89,12 @@ local function worker(user_args)
disk_header:ajust_ratio(1, 0, 0.3, 0.7) disk_header:ajust_ratio(1, 0, 0.3, 0.7)
local popup = awful.popup { local popup = awful.popup {
bg = config.popup_bg, bg = _config.popup_bg,
ontop = true, ontop = true,
visible = false, visible = false,
shape = gears.shape.rounded_rect, shape = gears.shape.rounded_rect,
border_width = config.popup_border_width, border_width = _config.popup_border_width,
border_color = config.popup_border_color, border_color = _config.popup_border_color,
maximum_width = 400, maximum_width = 400,
offset = { y = 5 }, offset = { y = 5 },
widget = {} widget = {}
@ -117,7 +107,7 @@ local function worker(user_args)
popup.visible = not popup.visible popup.visible = not popup.visible
storage_bar_widget:set_bg('#00000000') storage_bar_widget:set_bg('#00000000')
else else
storage_bar_widget:set_bg(config.widget_background_color) storage_bar_widget:set_bg(_config.widget_background_color)
popup:move_next_to(mouse.current_widget_geometry) popup:move_next_to(mouse.current_widget_geometry)
end end
end) end)
@ -125,7 +115,7 @@ local function worker(user_args)
) )
local disks = {} local disks = {}
watch([[bash -c "df | tail -n +2"]], config.refresh_rate, watch([[bash -c "df | tail -n +2"]], _config.refresh_rate,
function(widget, stdout) function(widget, stdout)
for line in stdout:gmatch("[^\r\n$]+") do for line in stdout:gmatch("[^\r\n$]+") do
local filesystem, size, used, avail, perc, mount = local filesystem, size, used, avail, perc, mount =
@ -139,12 +129,12 @@ local function worker(user_args)
disks[mount].perc = perc disks[mount].perc = perc
disks[mount].mount = mount disks[mount].mount = mount
if disks[mount].mount == config.mounts[1] then if disks[mount].mount == _config.mounts[1] then
widget:set_value(tonumber(disks[mount].perc)) widget:set_value(tonumber(disks[mount].perc))
end end
end end
for k, v in ipairs(config.mounts) do for k, v in ipairs(_config.mounts) do
local row = wibox.widget { local row = wibox.widget {
{ {
@ -153,17 +143,17 @@ local function worker(user_args)
widget = wibox.widget.textbox widget = wibox.widget.textbox
}, },
{ {
color = config.popup_bar_color, color = _config.popup_bar_color,
max_value = 100, max_value = 100,
value = tonumber(disks[v].perc), value = tonumber(disks[v].perc),
forced_height = 20, forced_height = 20,
paddings = 1, paddings = 1,
margins = 4, margins = 4,
border_width = 1, border_width = 1,
border_color = config.popup_bar_border_color, border_color = _config.popup_bar_border_color,
background_color = config.popup_bar_background_color, background_color = _config.popup_bar_background_color,
bar_border_width = 1, bar_border_width = 1,
bar_border_color = config.popup_bar_border_color, bar_border_color = _config.popup_bar_border_color,
widget = wibox.widget.progressbar, widget = wibox.widget.progressbar,
}, },
{ {