From: copycat-killer Date: Sun, 22 Jan 2017 01:13:02 +0000 (+0100) Subject: small fixes X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/f82f0ed20542258833e866c8f33bc54c57c3b863?ds=inline;hp=--cc small fixes --- f82f0ed20542258833e866c8f33bc54c57c3b863 diff --git a/util/init.lua b/util/init.lua index 5596afa..3db478d 100644 --- a/util/init.lua +++ b/util/init.lua @@ -166,6 +166,7 @@ end -- On the fly useless gaps change function util.useless_gaps_resize(thatmuch) + beautiful.useless_gap = beautiful.useless_gap or 0 beautiful.useless_gap = tonumber(beautiful.useless_gap) + thatmuch awful.layout.arrange(awful.screen.focused()) end diff --git a/util/separators.lua b/util/separators.lua index af3e3a8..abf57c4 100644 --- a/util/separators.lua +++ b/util/separators.lua @@ -8,15 +8,11 @@ --]] local wibox = require("wibox") -local beautiful = require("beautiful") local gears = require("gears") -- Lain Cairo separators util submodule -- lain.util.separators -local separators = {} - -local height = beautiful.separators_height or 0 -local width = beautiful.separators_width or 9 +local separators = { height = 0, width = 9 } -- [[ Arrow @@ -24,7 +20,9 @@ local width = beautiful.separators_width or 9 function separators.arrow_right(col1, col2) local widget = wibox.widget.base.make_widget() - widget.fit = function(m, w, h) return width, height end + widget.fit = function(m, w, h) + return separators.width, separators.height + end widget.draw = function(mycross, wibox, cr, width, height) if col2 ~= "alpha" then @@ -62,7 +60,9 @@ end function separators.arrow_left(col1, col2) local widget = wibox.widget.base.make_widget() - widget.fit = function(m, w, h) return width, height end + widget.fit = function(m, w, h) + return separators.width, separators.height + end widget.draw = function(mycross, wibox, cr, width, height) if col1 ~= "alpha" then diff --git a/widgets/contrib/tpbat/init.lua b/widgets/contrib/tpbat/init.lua index 0a22526..8b53a4b 100644 --- a/widgets/contrib/tpbat/init.lua +++ b/widgets/contrib/tpbat/init.lua @@ -34,22 +34,20 @@ local smapi = require("smapi") local tpbat = { } local tpbat_notification = nil -function tpbat:hide() - if tpbat_notification ~= nil - then - naughty.destroy(tpbat_notification) - tpbat_notification = nil - end +function tpbat.hide() + if not tpbat.notification then return end + naughty.destroy(tpbat.notification) + tpbat.notification = nil end -function tpbat:show(t_out) - tpbat:hide() +function tpbat.show(t_out) + tpbat.hide() local bat = self.bat - local t_out = t_out or 0 if bat == nil or not bat:installed() then return end + local t_out = t_out or 0 local mfgr = bat:get('manufacturer') or "no_mfgr" local model = bat:get('model') or "no_model" local chem = bat:get('chemistry') or "no_chem" @@ -73,7 +71,7 @@ function tpbat:show(t_out) .. string.format("\n%s \t\t\t %s", status:upper(), msg) tpbat_notification = naughty.notify({ - preset = { fg = beautiful.fg_normal }, + preset = naughty.config.defaults, text = str, timeout = t_out, screen = client.focus and client.focus.screen or 1 @@ -161,8 +159,8 @@ function tpbat.register(args) newtimer("tpbat-" .. bat.name, timeout, update) - widget:connect_signal('mouse::enter', function () tpbat:show() end) - widget:connect_signal('mouse::leave', function () tpbat:hide() end) + widget:connect_signal('mouse::enter', function () tpbat.show() end) + widget:connect_signal('mouse::leave', function () tpbat.hide() end) return tpbat.widget end diff --git a/widgets/fs.lua b/widgets/fs.lua index faa8038..391c260 100644 --- a/widgets/fs.lua +++ b/widgets/fs.lua @@ -61,7 +61,14 @@ local function worker(args) fs.options = args.options fs.followtag = args.followtag or false - fs.notification_preset = args.notification_preset or naughty.config.defaults + fs.notification_preset = args.notification_preset + + if not fs.notification_preset then + fs.notification_preset = naughty.config.defaults + fs.notification_preset.font = "Monospace 10" + fs.notification_preset.fg = "#FFFFFF" + fs.notification_preset.bg = "#000000" + end fs.widget = wibox.widget.textbox()