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

messageTray: Remove the stackedNotification tracking complexity

Browse Source 
We only have one signal left to track, but since it's destroy it
doesn't matter if it's disconnected or not since it will eventually
be GC'd.
This commit is contained in:
Jasper St. Pierre
2013-08-02 00:18:55 -04:00
parent 6521951e82
commit de050991d4
1 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
js/ui/messageTray.js
View File

@ -1448,25 +1448,17 @@ const SummaryItem = new Lang.Class({
if (this.notificationStack.get_n_children() > 0) if (this.notificationStack.get_n_children() > 0)
return; return;
for (let i = 0; i < this.source.notifications.length; i++) { this.source.notifications.forEach(Lang.bind(this, this._appendNotificationToStack));
this._appendNotificationToStack(this.source.notifications[i]);
}
this.scrollTo(St.Side.BOTTOM); this.scrollTo(St.Side.BOTTOM);
}, },
doneShowingNotificationStack: function() { doneShowingNotificationStack: function() {
for (let i = 0; i < this._stackedNotifications.length; i++) { this.source.notifications.forEach(Lang.bind(this, function(notification) {
let stackedNotification = this._stackedNotifications[i];
let notification = stackedNotification.notification;
notification.collapseCompleted(); notification.collapseCompleted();
notification.disconnect(stackedNotification.notificationDestroyedId);
if (notification.actor.get_parent() == this.notificationStack)
this.notificationStack.remove_actor(notification.actor);
notification.setIconVisible(true); notification.setIconVisible(true);
notification.enableScrolling(true); notification.enableScrolling(true);
} this.notificationStack.remove_actor(notification.actor);
this._stackedNotifications = []; }));
}, },
_notificationAddedToSource: function(source, notification) { _notificationAddedToSource: function(source, notification) {
@ -1474,17 +1466,21 @@ const SummaryItem = new Lang.Class({
this._appendNotificationToStack(notification); this._appendNotificationToStack(notification);
}, },
_contentUpdated: function() {
this.source.notifications.forEach(function(notification, i) {
notification.setIconVisible(i == 0);
});
this.emit('content-updated');
},
_appendNotificationToStack: function(notification) { _appendNotificationToStack: function(notification) {
let stackedNotification = {}; notification.connect('destroy', Lang.bind(this, this._contentUpdated));
stackedNotification.notification = notification;
stackedNotification.notificationDestroyedId = notification.connect('destroy', Lang.bind(this, this._notificationDestroyed));
this._stackedNotifications.push(stackedNotification);
if (!this.source.isChat) if (!this.source.isChat)
notification.enableScrolling(false); notification.enableScrolling(false);
if (this.notificationStack.get_n_children() > 0)
notification.setIconVisible(false);
this.notificationStack.add(notification.actor);
notification.expand(false); notification.expand(false);
this.notificationStack.add(notification.actor);
this._contentUpdated();
}, },
// scrollTo: // scrollTo:
@ -1498,28 +1494,6 @@ const SummaryItem = new Lang.Class({
else if (side == St.Side.BOTTOM) else if (side == St.Side.BOTTOM)
adjustment.value = adjustment.upper; adjustment.value = adjustment.upper;
}, },
_contentUpdated: function() {
this.emit('content-updated');
},
_notificationDestroyed: function(notification) {
for (let i = 0; i < this._stackedNotifications.length; i++) {
if (this._stackedNotifications[i].notification == notification) {
let stackedNotification = this._stackedNotifications[i];
notification.disconnect(stackedNotification.notificationDestroyedId);
this._stackedNotifications.splice(i, 1);
if (notification.actor.get_parent() == this.notificationStack)
this.notificationStack.remove_actor(notification.actor);
this._contentUpdated();
break;
}
}
let firstNotification = this._stackedNotifications[0];
if (firstNotification)
firstNotification.notification.setIconVisible(true);
}
}); });
Signals.addSignalMethods(SummaryItem.prototype); Signals.addSignalMethods(SummaryItem.prototype);