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

messageTray: Make Source usable without subclassing

Browse Source 
Rather than ask most users of Source to subclass it to simply set their icon,
just allow them to create a new instance and add it without any complex magic.

https://bugzilla.gnome.org/show_bug.cgi?id=661236
This commit is contained in:
Jasper St. Pierre 2011-10-07 18:31:26 -04:00
parent 61a17d7fab
commit c6fabe504a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/messageTray.js
View File

@ -960,8 +960,10 @@ const Source = new Lang.Class({
ICON_SIZE: 24, ICON_SIZE: 24,
_init: function(title) { _init: function(title, iconName, iconType) {
this.title = title; this.title = title;
this.iconName = iconName;
this.iconType = iconType;
this.actor = new Shell.GenericContainer(); this.actor = new Shell.GenericContainer();
this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth)); this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
@ -991,6 +993,8 @@ const Source = new Lang.Class({
this.isMuted = false; this.isMuted = false;
this.notifications = []; this.notifications = [];
this._setSummaryIcon(this.createNotificationIcon());
}, },
_getPreferredWidth: function (actor, forHeight, alloc) { _getPreferredWidth: function (actor, forHeight, alloc) {
@ -1061,10 +1065,12 @@ const Source = new Lang.Class({
}, },
// Called to create a new icon actor (of size this.ICON_SIZE). // Called to create a new icon actor (of size this.ICON_SIZE).
// Must be overridden by the subclass if you do not pass icons // Provides a sane default implementation, override if you need
// explicitly to the Notification() constructor. // something more fancy.
createNotificationIcon: function() { createNotificationIcon: function() {
throw new Error('no implementation of createNotificationIcon in ' + this); return new St.Icon({ icon_name: this.iconName,
icon_type: this.iconType,
icon_size: this.ICON_SIZE });
}, },
// Unlike createNotificationIcon, this always returns the same actor; // Unlike createNotificationIcon, this always returns the same actor;
@ -1115,16 +1121,14 @@ const Source = new Lang.Class({
}, },
//// Protected methods //// //// Protected methods ////
// The subclass must call this at least once to set the summary icon.
_setSummaryIcon: function(icon) { _setSummaryIcon: function(icon) {
if (this._iconBin.child) if (this._iconBin.child)
this._iconBin.child.destroy(); this._iconBin.child.destroy();
this._iconBin.child = icon; this._iconBin.child = icon;
}, },
// Default implementation is to do nothing, but subclasses can override
open: function(notification) { open: function(notification) {
this.emit('opened', notification);
}, },
destroyNonResidentNotifications: function() { destroyNonResidentNotifications: function() {