isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

messageTray: Don't hide the banner after NOTIFICATION_TIMEOUT

Browse Source 
... if the notification originally popped up under the pointer, and
the pointer is moving inside it.

https://bugzilla.gnome.org/show_bug.cgi?id=682238
This commit is contained in:
Debarshi Ray 2012-09-03 18:29:39 +02:00
parent f177bd0b51
commit ca4b86e7ca
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/messageTray.js
View File

@ -2135,9 +2135,10 @@ const MessageTray = new Lang.Class({
// explicitly mouses away from it and then mouses back in. // explicitly mouses away from it and then mouses back in.
this._showNotificationMouseX = x; this._showNotificationMouseX = x;
this._showNotificationMouseY = y; this._showNotificationMouseY = y;
// We save the y coordinate of the mouse at the time when we started showing the notification // We save the coordinates of the mouse at the time when we started showing the notification
// and then we update it in _notifiationTimeout() if the mouse is moving towards the // and then we update it in _notificationTimeout(). We don't pop down the notification if
// notification. We don't pop down the notification if the mouse is moving towards it. // the mouse is moving towards it or within it.
this._lastSeenMouseX = x;
this._lastSeenMouseY = y; this._lastSeenMouseY = y;
}, },
@ -2205,13 +2206,20 @@ const MessageTray = new Lang.Class({
// hide it yet. (We just create a new timeout (and destroy // hide it yet. (We just create a new timeout (and destroy
// the old one) each time because the bookkeeping is // the old one) each time because the bookkeeping is
// simpler.) // simpler.)
this._lastSeenMouseY = y; this._updateNotificationTimeout(1000);
} else if (this._useLongerTrayLeftTimeout && !this._trayLeftTimeoutId &&
(x != this._lastSeenMouseX || y != this._lastSeenMouseY)) {
// Refresh the timeout if the notification originally
// popped up under the pointer, and the pointer is hovering
// inside it.
this._updateNotificationTimeout(1000); this._updateNotificationTimeout(1000);
} else { } else {
this._notificationTimeoutId = 0; this._notificationTimeoutId = 0;
this._updateState(); this._updateState();
} }
this._lastSeenMouseX = x;
this._lastSeenMouseY = y;
return false; return false;
}, },