awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reverted bb3a0c1 and fixed scr_pos pointers in calendar widget

This commit is contained in:
luke bonham 2015-07-29 12:16:13 +02:00 committed by copycat-killer
parent e43585e947
commit f291bd62b7
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widgets/calendar.lua
View File

@ -111,21 +111,21 @@ function calendar:attach(widget, args)
calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF" calendar.fg = args.fg or beautiful.fg_normal or "#FFFFFF"
calendar.bg = args.bg or beautiful.bg_normal or "#FFFFFF" calendar.bg = args.bg or beautiful.bg_normal or "#FFFFFF"
calendar.position = args.position or "top_right" 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.offset = 0
calendar.notify_icon = nil 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:connect_signal("mouse::leave", function () calendar:hide() end)
widget:buttons(awful.util.table.join( awful.button({ }, 1, function () 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 () awful.button({ }, 3, function ()
calendar:show(0, 1, scr_pos) end), calendar:show(0, 1, calendar.scr_pos) end),
awful.button({ }, 4, function () awful.button({ }, 4, function ()
calendar:show(0, -1, scr_pos) end), calendar:show(0, -1, calendar.scr_pos) end),
awful.button({ }, 5, function () awful.button({ }, 5, function ()
calendar:show(0, 1, scr_pos) end))) calendar:show(0, 1, calendar.scr_pos) end)))
end end
return setmetatable(calendar, { __call = function(_, ...) return create(...) end }) return setmetatable(calendar, { __call = function(_, ...) return create(...) end })

17
widgets/fs.lua
View File

@ -26,19 +26,21 @@ local setmetatable = setmetatable
-- lain.widgets.fs -- lain.widgets.fs
local fs = {} local fs = {}
local notification = nil local fs_notification = nil
fs_notification_preset = { fg = beautiful.fg_normal } fs_notification_preset = { fg = beautiful.fg_normal }
function fs:hide() function fs:hide()
if notification ~= nil then if fs_notification ~= nil then
naughty.destroy(notification) naughty.destroy(fs_notification)
notification = nil fs_notification = nil
end end
end end
function fs:show(t_out, scr) function fs:show(t_out)
fs:hide() fs:hide()
naughty.notify({text=fs_notification_preset.screen})
local f = io.popen(helpers.scripts_dir .. "dfs") local f = io.popen(helpers.scripts_dir .. "dfs")
ws = f:read("*all"):gsub("\n*$", "") ws = f:read("*all"):gsub("\n*$", "")
f:close() f:close()
@ -46,8 +48,7 @@ function fs:show(t_out, scr)
notification = naughty.notify({ notification = naughty.notify({
preset = fs_notification_preset, preset = fs_notification_preset,
text = ws, text = ws,
timeout = t_out, timeout = t_out
screen = scr or 1
}) })
end end
@ -107,7 +108,7 @@ local function worker(args)
end end
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) fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
helpers.newtimer(partition, timeout, update) helpers.newtimer(partition, timeout, update)