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

messageTray: Drop Shell.GenericContainer usage

Browse Source 
Nothing particularly outstanding with this class - it was
a straightforward removal and subclassing.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/153
This commit is contained in:
Georges Basile Stavracas Neto 2018-07-06 10:55:23 +02:00
parent fc342fe8c5
commit ac314cfb05
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
js/ui/messageTray.js
View File

@ -587,16 +587,16 @@ var NotificationBanner = new Lang.Class({
var SourceActor = new Lang.Class({ var SourceActor = new Lang.Class({
Name: 'SourceActor', Name: 'SourceActor',
Extends: St.Widget,
_init(source, size) { _init(source, size) {
this.parent();
this._source = source; this._source = source;
this._size = size; this._size = size;
this.actor = new Shell.GenericContainer(); this.actor = this;
this.actor.connect('get-preferred-width', this._getPreferredWidth.bind(this)); this.connect('destroy', () => {
this.actor.connect('get-preferred-height', this._getPreferredHeight.bind(this));
this.actor.connect('allocate', this._allocate.bind(this));
this.actor.connect('destroy', () => {
this._source.disconnect(this._iconUpdatedId); this._source.disconnect(this._iconUpdatedId);
this._actorDestroyed = true; this._actorDestroyed = true;
}); });
@ -604,10 +604,11 @@ var SourceActor = new Lang.Class({
let scale_factor = St.ThemeContext.get_for_stage(global.stage).scale_factor; let scale_factor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
this._iconBin = new St.Bin({ x_fill: true, this._iconBin = new St.Bin({ x_fill: true,
x_expand: true,
height: size * scale_factor, height: size * scale_factor,
width: size * scale_factor }); width: size * scale_factor });
this.actor.add_actor(this._iconBin); this.add_actor(this._iconBin);
this._iconUpdatedId = this._source.connect('icon-updated', this._updateIcon.bind(this)); this._iconUpdatedId = this._source.connect('icon-updated', this._updateIcon.bind(this));
this._updateIcon(); this._updateIcon();
@ -618,21 +619,6 @@ var SourceActor = new Lang.Class({
this._iconSet = true; this._iconSet = true;
}, },
_getPreferredWidth(actor, forHeight, alloc) {
let [min, nat] = this._iconBin.get_preferred_width(forHeight);
alloc.min_size = min; alloc.nat_size = nat;
},
_getPreferredHeight(actor, forWidth, alloc) {
let [min, nat] = this._iconBin.get_preferred_height(forWidth);
alloc.min_size = min; alloc.nat_size = nat;
},
_allocate(actor, box, flags) {
// the iconBin should fill our entire box
this._iconBin.allocate(box, flags);
},
_updateIcon() { _updateIcon() {
if (this._actorDestroyed) if (this._actorDestroyed)
return; return;
@ -665,23 +651,23 @@ var SourceActorWithLabel = new Lang.Class({
this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y'); this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y');
}); });
this.actor.add_actor(this._counterBin); this.add_actor(this._counterBin);
this._countUpdatedId = this._source.connect('count-updated', this._updateCount.bind(this)); this._countUpdatedId = this._source.connect('count-updated', this._updateCount.bind(this));
this._updateCount(); this._updateCount();
this.actor.connect('destroy', () => { this.connect('destroy', () => {
this._source.disconnect(this._countUpdatedId); this._source.disconnect(this._countUpdatedId);
}); });
}, },
_allocate(actor, box, flags) { vfunc_allocate(box, flags) {
this.parent(actor, box, flags); this.parent(box, flags);
let childBox = new Clutter.ActorBox(); let childBox = new Clutter.ActorBox();
let [minWidth, minHeight, naturalWidth, naturalHeight] = this._counterBin.get_preferred_size(); let [minWidth, minHeight, naturalWidth, naturalHeight] = this._counterBin.get_preferred_size();
let direction = this.actor.get_text_direction(); let direction = this.get_text_direction();
if (direction == Clutter.TextDirection.LTR) { if (direction == Clutter.TextDirection.LTR) {
// allocate on the right in LTR // allocate on the right in LTR

4
js/ui/screenShield.js
View File

@ -150,7 +150,7 @@ var NotificationsBox = new Lang.Class({
_makeNotificationSource(source, box) { _makeNotificationSource(source, box) {
let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE); let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE);
box.add(sourceActor.actor, { y_fill: true }); box.add(sourceActor, { y_fill: true });
let textBox = new St.BoxLayout({ vertical: true }); let textBox = new St.BoxLayout({ vertical: true });
box.add(textBox, { y_fill: false, y_align: St.Align.START }); box.add(textBox, { y_fill: false, y_align: St.Align.START });
@ -172,7 +172,7 @@ var NotificationsBox = new Lang.Class({
let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE); let sourceActor = new MessageTray.SourceActor(source, SUMMARY_ICON_SIZE);
let sourceBin = new St.Bin({ y_align: St.Align.START, let sourceBin = new St.Bin({ y_align: St.Align.START,
x_align: St.Align.START, x_align: St.Align.START,
child: sourceActor.actor }); child: sourceActor });
box.add(sourceBin); box.add(sourceBin);
let textBox = new St.BoxLayout({ vertical: true }); let textBox = new St.BoxLayout({ vertical: true });