small fixes

This commit is contained in:
copycat-killer 2017-01-22 02:13:02 +01:00
parent fadc722655
commit f82f0ed205
4 changed files with 26 additions and 20 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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()