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

background: Don't require passing in a background to _updateBackground()

Browse Source 
To make debugging background issues easier.
This commit is contained in:
Jasper St. Pierre 2014-01-13 17:12:16 -05:00
parent a4e019442f
commit 933f38390b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/background.js
View File

@ -733,17 +733,17 @@ const BackgroundManager = new Lang.Class({
} }
}, },
_updateBackground: function(background) { _updateBackground: function() {
let newBackground = this._createBackground(); let newBackground = this._createBackground();
newBackground.vignetteSharpness = background.vignetteSharpness; newBackground.vignetteSharpness = this.background.vignetteSharpness;
newBackground.brightness = background.brightness; newBackground.brightness = this.background.brightness;
newBackground.visible = background.visible; newBackground.visible = this.background.visible;
newBackground.loadedSignalId = newBackground.connect('loaded', newBackground.loadedSignalId = newBackground.connect('loaded',
Lang.bind(this, function() { Lang.bind(this, function() {
newBackground.disconnect(newBackground.loadedSignalId); newBackground.disconnect(newBackground.loadedSignalId);
newBackground.loadedSignalId = 0; newBackground.loadedSignalId = 0;
Tweener.addTween(background.actor, Tweener.addTween(this.background.actor,
{ opacity: 0, { opacity: 0,
time: FADE_ANIMATION_TIME, time: FADE_ANIMATION_TIME,
transition: 'easeOutQuad', transition: 'easeOutQuad',
@ -755,8 +755,7 @@ const BackgroundManager = new Lang.Class({
newBackground.actor.destroy(); newBackground.actor.destroy();
} }
background.actor.destroy(); this.background.actor.destroy();
this.emit('changed'); this.emit('changed');
}) })
}); });
@ -783,7 +782,7 @@ const BackgroundManager = new Lang.Class({
background.changeSignalId = background.connect('changed', Lang.bind(this, function() { background.changeSignalId = background.connect('changed', Lang.bind(this, function() {
background.disconnect(background.changeSignalId); background.disconnect(background.changeSignalId);
background.changeSignalId = 0; background.changeSignalId = 0;
this._updateBackground(background); this._updateBackground();
})); }));
background.actor.connect('destroy', Lang.bind(this, function() { background.actor.connect('destroy', Lang.bind(this, function() {