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

Avoid doing expensive work when not mapped

Browse Source 
For some unknown reason we were connecting to app-added and
app-removed on ShellAppMonitor in the AppDisplay class, which
never made any use of the data.  Simply don't connect to those
signals for now.  In the future we should have AppDisplay
be using the AppIcon class which will more correctly handle
dynamic changes.

In the AppWell, avoid doing the full relayout until we're
actually mapped.

https://bugzilla.gnome.org/show_bug.cgi?id=597169
This commit is contained in:
Colin Walters 2009-10-02 20:17:34 -04:00
parent 64cd51667d
commit 2f6c951997
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/ui/appDisplay.js
View File

@ -192,14 +192,6 @@ AppDisplay.prototype = {
this._appsStale = true; this._appsStale = true;
this._redisplay(GenericDisplay.RedisplayFlags.NONE); this._redisplay(GenericDisplay.RedisplayFlags.NONE);
})); }));
this._appMonitor.connect('app-added', Lang.bind(this, function(monitor) {
this._appsStale = true;
this._redisplay(GenericDisplay.RedisplayFlags.NONE);
}));
this._appMonitor.connect('app-removed', Lang.bind(this, function(monitor) {
this._appsStale = true;
this._redisplay(GenericDisplay.RedisplayFlags.NONE);
}));
this._focusInMenus = true; this._focusInMenus = true;
this._activeMenuIndex = -1; this._activeMenuIndex = -1;
@ -770,6 +762,9 @@ AppWell.prototype = {
x_align: Big.BoxAlignment.CENTER }); x_align: Big.BoxAlignment.CENTER });
this.actor._delegate = this; this.actor._delegate = this;
this._pendingRedisplay = false;
this.actor.connect('notify::mapped', Lang.bind(this, this._onMappedNotify));
this._grid = new WellGrid(); this._grid = new WellGrid();
this.actor.append(this._grid.actor, Big.BoxPackFlags.EXPAND); this.actor.append(this._grid.actor, Big.BoxPackFlags.EXPAND);
@ -809,7 +804,20 @@ AppWell.prototype = {
values[id] = index; return values; }, {}); values[id] = index; return values; }, {});
}, },
_onMappedNotify: function() {
let mapped = this.actor.mapped;
if (mapped && this._pendingRedisplay)
this._redisplay();
},
_redisplay: function () { _redisplay: function () {
let mapped = this.actor.mapped;
if (!mapped) {
this._pendingRedisplay = true;
return;
}
this._pendingRedisplay = false;
this._grid.removeAll(); this._grid.removeAll();
let favoriteIds = this._appSystem.get_favorites(); let favoriteIds = this._appSystem.get_favorites();