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

messageTray: don't assume we're always visible in the overview

Browse Source 
Since we'll hide the message tray when searching in a future commit.

https://bugzilla.gnome.org/show_bug.cgi?id=682050
This commit is contained in:
Tanner Doshier 2012-08-16 18:26:10 -05:00 committed by Cosimo Cecchi
parent cfed6e401d
commit 53cff07eef
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/messageTray.js
View File

@ -1507,7 +1507,7 @@ const MessageTray = new Lang.Class({
this._overviewVisible = true; this._overviewVisible = true;
this._grabHelper.ungrab(); // drop modal grab if necessary this._grabHelper.ungrab(); // drop modal grab if necessary
this.actor.add_style_pseudo_class('overview'); this.actor.add_style_pseudo_class('overview');
this._updateState(); this.show();
})); }));
Main.overview.connect('hiding', Lang.bind(this, Main.overview.connect('hiding', Lang.bind(this,
function() { function() {
@ -1790,6 +1790,11 @@ const MessageTray = new Lang.Class({
this._updateState(); this._updateState();
}, },
show: function() {
this._traySummoned = true;
this._updateState();
},
_onNotify: function(source, notification) { _onNotify: function(source, notification) {
if (this._summaryBoxPointerItem && this._summaryBoxPointerItem.source == source) { if (this._summaryBoxPointerItem && this._summaryBoxPointerItem.source == source) {
if (this._summaryBoxPointerState == State.HIDING) { if (this._summaryBoxPointerState == State.HIDING) {
@ -2036,14 +2041,14 @@ const MessageTray = new Lang.Class({
} }
// Summary // Summary
let summarySummoned = this._pointerInSummary || this._overviewVisible || this._traySummoned; let summarySummoned = this._pointerInSummary || this._traySummoned;
let summaryPinned = this._pointerInTray || summarySummoned || this._locked; let summaryPinned = this._pointerInTray || summarySummoned || this._locked;
let summaryHovered = this._pointerInTray || this._pointerInSummary; let summaryHovered = this._pointerInTray || this._pointerInSummary;
let notificationsVisible = this._notificationState != State.HIDDEN; let notificationsVisible = this._notificationState != State.HIDDEN;
let notificationsDone = !notificationsVisible && !notificationsPending; let notificationsDone = !notificationsVisible && !notificationsPending;
let summaryOptionalInOverview = this._overviewVisible && !this._locked && !summaryHovered; let summaryOptionalInOverview = !this._locked && !summaryHovered;
let mustHideSummary = (notificationsPending && (notificationUrgent || summaryOptionalInOverview)) let mustHideSummary = (notificationsPending && (notificationUrgent || summaryOptionalInOverview))
|| notificationsVisible || !Main.sessionMode.hasNotifications; || notificationsVisible || !Main.sessionMode.hasNotifications;