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

messageTray: Hook SourceActor up to source icon changes automatically

Browse Source 
Instead of manually tracking source icon changes, or requiring a manual
call to _setSummaryIcon, add a way to emit a signal when we're guaranteed
the icon has been changed, and then the source actor will automatically
update the icon.
_setSummaryIcon is still available for sources such as the notification
daemon, that require special treatment for the summary icon (to be used
with tray icons)

https://bugzilla.gnome.org/show_bug.cgi?id=680426
This commit is contained in:
Jasper St. Pierre
2012-07-23 01:07:51 -03:00
committed by Giovanni Campagna
parent b9226fbcbd
commit 5991c8dca3
4 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
js/ui/messageTray.js
View File

@ -1042,6 +1042,7 @@ const SourceActor = new Lang.Class({
_init: function(source, size) {
this._source = source;
this._size = size;
this.actor = new Shell.GenericContainer();
this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
@ -1067,10 +1068,14 @@ const SourceActor = new Lang.Class({
this._source.connect('count-updated', Lang.bind(this, this._updateCount));
this._updateCount();
this._source.connect('icon-updated', Lang.bind(this, this._updateIcon));
this._updateIcon();
},
setIcon: function(icon) {
this._iconBin.child = icon;
this._iconSet = true;
},
_getPreferredWidth: function (actor, forHeight, alloc) {
@ -1108,13 +1113,21 @@ const SourceActor = new Lang.Class({
this._counterBin.allocate(childBox, flags);
},
_updateIcon: function() {
if (this._actorDestroyed)
return;
if (!this._iconSet)
this._iconBin.child = this._source.createIcon(this._size);
},
_updateCount: function() {
if (this._actorDestroyed)
return;
this._counterBin.visible = this._source.countVisible;
this._counterLabel.set_text(this._source.count.toString());
},
}
});
const Source = new Lang.Class({
@ -1175,16 +1188,12 @@ const Source = new Lang.Class({
icon_size: size });
},
_ensureMainIcon: function(icon) {
_ensureMainIcon: function() {
if (this._mainIcon)
return false;
if (!icon)
icon = this.createIcon(this.ICON_SIZE);
return;
this._mainIcon = new SourceActor(this, this.ICON_SIZE);
this._mainIcon.setIcon(icon);
return true;
return;
},
// Unlike createIcon, this always returns the same actor;
@ -1236,10 +1245,15 @@ const Source = new Lang.Class({
return false;
},
iconUpdated: function() {
this.emit('icon-updated');
},
//// Protected methods ////
_setSummaryIcon: function(icon) {
if (!this._ensureMainIcon(icon))
this._mainIcon.setIcon(icon);
this._ensureMainIcon();
this._mainIcon.setIcon(icon);
this.iconUpdated();
},
open: function(notification) {