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

messageTray: Don't animate the desktop clone for a failed tray grab

Browse Source 
If we fail to grab for the message tray, we shouldn't be animating
the desktop clone. This is a regression from commit fe124e6.

https://bugzilla.gnome.org/show_bug.cgi?id=685342
This commit is contained in:
Jasper St. Pierre 2012-10-02 20:24:56 -03:00
parent 0192a6cb12
commit 7d6c85be42
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/messageTray.js
View File

@ -2028,7 +2028,7 @@ const MessageTray = new Lang.Class({
let trayShouldBeVisible = (this._summaryState == State.SHOWING || let trayShouldBeVisible = (this._summaryState == State.SHOWING ||
this._summaryState == State.SHOWN); this._summaryState == State.SHOWN);
if (!trayIsVisible && trayShouldBeVisible) if (!trayIsVisible && trayShouldBeVisible)
this._showTray(); trayShouldBeVisible = this._showTray();
else if (trayIsVisible && !trayShouldBeVisible) else if (trayIsVisible && !trayShouldBeVisible)
this._hideTray(); this._hideTray();
@ -2078,7 +2078,7 @@ const MessageTray = new Lang.Class({
modal: modal, modal: modal,
onUngrab: Lang.bind(this, this._escapeTray) })) { onUngrab: Lang.bind(this, this._escapeTray) })) {
this._traySummoned = false; this._traySummoned = false;
return; return false;
} }
this._tween(this.actor, '_trayState', State.SHOWN, this._tween(this.actor, '_trayState', State.SHOWN,
@ -2090,6 +2090,8 @@ const MessageTray = new Lang.Class({
if (this._overviewVisible) { if (this._overviewVisible) {
this._lightbox.show(); this._lightbox.show();
} }
return true;
}, },
_showDesktopClone: function() { _showDesktopClone: function() {