From c846e5e31ac14ba6b9125d6caa630caad1dda8ec Mon Sep 17 00:00:00 2001 From: Nick Diego Yamane Date: Thu, 17 Aug 2017 15:45:50 -0400 Subject: [PATCH] task widget: Check if mouse is still over attached widget in aync show This fixes issue #356. Using an approach similar to what is implemented in other lain widgets (e.g: calendar). That is, checking the mouse is still over the target widget inside the `helpers.async` function call in `task.show()`. Signed-off-by: Nick Diego Yamane --- widget/contrib/task.lua | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/widget/contrib/task.lua b/widget/contrib/task.lua index 69d9fd0..302642e 100644 --- a/widget/contrib/task.lua +++ b/widget/contrib/task.lua @@ -10,6 +10,7 @@ local helpers = require("lain.helpers") local markup = require("lain.util").markup local awful = require("awful") local naughty = require("naughty") +local mouse = mouse local string = { format = string.format, gsub = string.gsub } -- Taskwarrior notification @@ -23,7 +24,6 @@ function task.hide() end function task.show(scr) - task.hide() if task.followtag then task.notification_preset.screen = awful.screen.focused() @@ -32,12 +32,27 @@ function task.show(scr) end helpers.async({ awful.util.shell, "-c", task.show_cmd }, function(f) - task.notification = naughty.notify({ - preset = task.notification_preset, - title = "task next", - text = markup.font(task.notification_preset.font, - awful.util.escape(f:gsub("\n*$", ""))) - }) + local widget_focused = true + + if mouse.current_widgets then + widget_focused = false + for _,v in ipairs(mouse.current_widgets) do + if task.widget == v then + widget_focused = true + break + end + end + end + + if widget_focused then + task.hide() + task.notification = naughty.notify({ + preset = task.notification_preset, + title = "task next", + text = markup.font(task.notification_preset.font, + awful.util.escape(f:gsub("\n*$", ""))) + }) + end end) end @@ -65,6 +80,7 @@ function task.attach(widget, args) task.prompt_text = args.prompt_text or "Enter task command: " task.followtag = args.followtag or false task.notification_preset = args.notification_preset + task.widget = widget if not task.notification_preset then task.notification_preset = { -- 2.39.5