From: luke bonham Date: Tue, 28 Jul 2015 18:43:47 +0000 (+0200) Subject: allow to define in supported widgets which don't allow it already X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/2e8fd41bc3ca120ae71658aeda98bcb91a0fd9d9?ds=inline;hp=--cc allow to define in supported widgets which don't allow it already --- 2e8fd41bc3ca120ae71658aeda98bcb91a0fd9d9 diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua index 6425926..3b8039f 100644 --- a/widgets/contrib/task.lua +++ b/widgets/contrib/task.lua @@ -31,7 +31,7 @@ function task:hide() end end -function task:show() +function task:show(scr_pos) task:hide() local f, c_text @@ -51,6 +51,7 @@ function task:show() fg = task.fg, bg = task.bg, timeout = task.timeout, + screen = scr_pos or 1 }) end @@ -106,6 +107,7 @@ function task:prompt_search() fg = task.fg, bg = task.bg, timeout = task.timeout, + screen = mouse.screen }) end, nil, @@ -122,11 +124,12 @@ function task:attach(widget, args) task.bg = args.bg or beautiful.bg_normal or "#FFFFFF" task.position = args.position or "top_right" task.timeout = args.timeout or 7 + task.scr_pos = args.scr_pos or 1 task.notify_icon = icons_dir .. "/taskwarrior/task.png" task.notify_icon_small = icons_dir .. "/taskwarrior/tasksmall.png" - widget:connect_signal("mouse::enter", function () task:show() end) + widget:connect_signal("mouse::enter", function () task:show(scr_pos) end) widget:connect_signal("mouse::leave", function () task:hide() end) end diff --git a/widgets/fs.lua b/widgets/fs.lua index 07490fa..dbd45bf 100644 --- a/widgets/fs.lua +++ b/widgets/fs.lua @@ -36,7 +36,7 @@ function fs:hide() end end -function fs:show(t_out) +function fs:show(t_out, scr) fs:hide() local f = io.popen(helpers.scripts_dir .. "dfs") @@ -44,9 +44,10 @@ function fs:show(t_out) f:close() notification = naughty.notify({ - preset = fs_notification_preset, - text = ws, + preset = fs_notification_preset, + text = ws, timeout = t_out, + screen = scr or 1 }) end @@ -106,7 +107,7 @@ local function worker(args) end end - fs.widget:connect_signal('mouse::enter', function () fs:show(0) end) + fs.widget:connect_signal('mouse::enter', function () fs:show(0, mouse.screen) end) fs.widget:connect_signal('mouse::leave', function () fs:hide() end) helpers.newtimer(partition, timeout, update) diff --git a/widgets/imap.lua b/widgets/imap.lua index ea62cc7..a17b02f 100644 --- a/widgets/imap.lua +++ b/widgets/imap.lua @@ -76,7 +76,7 @@ local function worker(args) end naughty.notify({ preset = mail_notification_preset, - text = nt, + text = nt }) end