[gnome-shell] messageTray: Fizzle out hover notifications where the values are the same

[Jasper St. Pierre <jstpierre src gnome org>]

commit 91405583fdb89483f6718598b47d8cd4536a7e5a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Mar 11 15:36:56 2013 -0400

    messageTray: Fizzle out hover notifications where the values are the same
    
    notify::* doesn't guarantee that the value has changed, only that it
    may have been. We need to ensure that we track the old value to make sure
    we don't do things like overwrite timeouts if they already exist.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=695659

 js/ui/messageTray.js |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index d78cece..bdb33d9 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1636,7 +1636,18 @@ const MessageTray = new Lang.Class({
         this._traySummoned = false;
         this._useLongerTrayLeftTimeout = false;
         this._trayLeftTimeoutId = 0;
+
+        // pointerInTray is sort of a misnomer -- it tracks whether
+        // a message tray notification should expand. The value is
+        // partially driven by the hover state of the tray, but has
+        // a lot of complex state related to timeouts and the current
+        // state of the pointer when a notification pops up.
         this._pointerInTray = false;
+
+        // This tracks this.actor.hover and is used to fizzle
+        // out non-changing hover notifications in onTrayHoverChanged.
+        this._trayHovered = false;
+
         this._keyboardVisible = false;
         this._notificationClosed = false;
         this._notificationState = State.HIDDEN;
@@ -2080,7 +2091,11 @@ const MessageTray = new Lang.Class({
     },
 
     _onTrayHoverChanged: function() {
-        if (this.actor.hover) {
+        if (this.actor.hover == this._trayHovered)
+            return;
+
+        this._trayHovered = this.actor.hover;
+        if (this._trayHovered) {
             // No dwell inside notifications at the bottom of the screen
             this._cancelTrayDwell();
 
@@ -2088,13 +2103,6 @@ const MessageTray = new Lang.Class({
             if (this._trayState == State.HIDDEN && this._notificationState == State.HIDDEN)
                 return;
 
-            // Don't do anything if this._useLongerTrayLeftTimeout is true, meaning the notification 
originally
-            // popped up under the pointer, but this._trayLeftTimeoutId is 0, meaning the pointer didn't 
leave
-            // the tray yet. We need to check for this case because sometimes _onTrayHoverChanged() gets 
called
-            // multiple times while this.actor.hover is true.
-            if (this._useLongerTrayLeftTimeout && !this._trayLeftTimeoutId)
-                return;
-
             this._useLongerTrayLeftTimeout = false;
             if (this._trayLeftTimeoutId) {
                 Mainloop.source_remove(this._trayLeftTimeoutId);
@@ -2561,7 +2569,11 @@ const MessageTray = new Lang.Class({
         this._notificationRemoved = false;
         this._closeButton.hide();
         this._pointerInTray = false;
-        this.actor.hover = false; // Clutter doesn't emit notify::hover when actors move
+
+        // Clutter will send a leave-event the next time the mouse
+        // moves, but we need to set this here now to update the
+        // state machine.
+        this.actor.hover = false;
         this._notificationBin.child = null;
         this._notificationWidget.hide();
     },