summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-06-02 13:28:18 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-06-02 17:39:52 -0400
commit094669baee661086ac639e1813e704c0eff10149 (patch)
tree309e2ce71cad6529590822731580fd67f1682cb4
parentf6b5385495ca281f16d19c64aa6423e57857875c (diff)
messageTray: Clear the pointer left timeout when showing a notification
When the pointer leaves the notification area, we queue a timeout to hide the notification after a little while. If the user is hovering over a notification and clicks the X button to close the notification, we will destroy the notification, which causes a "pointer left" event on the notification area. This queues a timeout which erroneously fires after the next notification in the queue shows up. The code and state machine are too complex to properly make sure this timeout doesn't fire when there is no notification up next, so instead just clear it when showing a notification to make sure that any previously queued timeout doesn't apply to us. https://bugzilla.gnome.org/show_bug.cgi?id=731118
-rw-r--r--js/ui/messageTray.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 971c451a..d7d09814 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2631,6 +2631,8 @@ const MessageTray = new Lang.Class({
// the mouse is moving towards it or within it.
this._lastSeenMouseX = x;
this._lastSeenMouseY = y;
+
+ this._resetNotificationLeftTimeout();
},
_updateShowingNotification: function() {