mirror of https://github.com/lcpz/lain.git
reverted bb3a0c1 and fixed scr_pos pointers in calendar widget
This commit is contained in:
parent
e43585e947
commit
f291bd62b7
|
@ -111,21 +111,21 @@ function calendar:attach(widget, args)
|
|||
calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF"
|
||||
calendar.bg = args.bg or beautiful.bg_normal or "#FFFFFF"
|
||||
calendar.position = args.position or "top_right"
|
||||
calendar.scr_pos = args.scr_pos or 1
|
||||
calendar.scr_pos = args.scr_pos or mouse.screen
|
||||
|
||||
calendar.offset = 0
|
||||
calendar.notify_icon = nil
|
||||
|
||||
widget:connect_signal("mouse::enter", function () calendar:show(0, 0, scr_pos) end)
|
||||
widget:connect_signal("mouse::enter", function () calendar:show(0, 0, calendar.scr_pos) end)
|
||||
widget:connect_signal("mouse::leave", function () calendar:hide() end)
|
||||
widget:buttons(awful.util.table.join( awful.button({ }, 1, function ()
|
||||
calendar:show(0, -1, scr_pos) end),
|
||||
calendar:show(0, -1, calendar.scr_pos) end),
|
||||
awful.button({ }, 3, function ()
|
||||
calendar:show(0, 1, scr_pos) end),
|
||||
calendar:show(0, 1, calendar.scr_pos) end),
|
||||
awful.button({ }, 4, function ()
|
||||
calendar:show(0, -1, scr_pos) end),
|
||||
calendar:show(0, -1, calendar.scr_pos) end),
|
||||
awful.button({ }, 5, function ()
|
||||
calendar:show(0, 1, scr_pos) end)))
|
||||
calendar:show(0, 1, calendar.scr_pos) end)))
|
||||
end
|
||||
|
||||
return setmetatable(calendar, { __call = function(_, ...) return create(...) end })
|
||||
|
|
|
@ -26,19 +26,21 @@ local setmetatable = setmetatable
|
|||
-- lain.widgets.fs
|
||||
local fs = {}
|
||||
|
||||
local notification = nil
|
||||
local fs_notification = nil
|
||||
fs_notification_preset = { fg = beautiful.fg_normal }
|
||||
|
||||
function fs:hide()
|
||||
if notification ~= nil then
|
||||
naughty.destroy(notification)
|
||||
notification = nil
|
||||
if fs_notification ~= nil then
|
||||
naughty.destroy(fs_notification)
|
||||
fs_notification = nil
|
||||
end
|
||||
end
|
||||
|
||||
function fs:show(t_out, scr)
|
||||
function fs:show(t_out)
|
||||
fs:hide()
|
||||
|
||||
naughty.notify({text=fs_notification_preset.screen})
|
||||
|
||||
local f = io.popen(helpers.scripts_dir .. "dfs")
|
||||
ws = f:read("*all"):gsub("\n*$", "")
|
||||
f:close()
|
||||
|
@ -46,8 +48,7 @@ function fs:show(t_out, scr)
|
|||
notification = naughty.notify({
|
||||
preset = fs_notification_preset,
|
||||
text = ws,
|
||||
timeout = t_out,
|
||||
screen = scr or 1
|
||||
timeout = t_out
|
||||
})
|
||||
end
|
||||
|
||||
|
@ -107,7 +108,7 @@ local function worker(args)
|
|||
end
|
||||
end
|
||||
|
||||
fs.widget:connect_signal('mouse::enter', function () fs:show(0, mouse.screen) end)
|
||||
fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
|
||||
fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
|
||||
|
||||
helpers.newtimer(partition, timeout, update)
|
||||
|
|
Loading…
Reference in New Issue