[gnome-shell] background: Keep the state of key frame files on Animation
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] background: Keep the state of key frame files on Animation
- Date: Thu, 14 Mar 2013 21:48:35 +0000 (UTC)
commit 3a27d0b8496534d4975fec645a965bc702edc9cf
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Mar 14 17:03:25 2013 -0400
background: Keep the state of key frame files on Animation
This gets us from a mix of pure getters and class state
to just class state.
https://bugzilla.gnome.org/show_bug.cgi?id=695882
js/ui/background.js | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/js/ui/background.js b/js/ui/background.js
index a63d29e..e86dd6e 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -384,7 +384,8 @@ const Background = new Lang.Class({
_updateAnimation: function() {
this._updateAnimationTimeoutId = 0;
- let files = this._animation.getKeyFrameFiles(this._layoutManager.monitors[this._monitorIndex]);
+ this._animation.update(this._layoutManager.monitors[this._monitorIndex]);
+ let files = this._animation.keyFrameFiles;
if (!files) {
this._setLoaded();
@@ -589,7 +590,7 @@ const Animation = new Lang.Class({
params = Params.parse(params, { filename: null });
this.filename = params.filename;
- this._keyFrames = [];
+ this.keyFrameFiles = [];
this.duration = 0.0;
this.transitionProgress = 0.0;
this.loaded = false;
@@ -610,26 +611,24 @@ const Animation = new Lang.Class({
}));
},
- getKeyFrameFiles: function(monitor) {
+ update: function(monitor) {
+ this.keyFrameFiles = [];
+
if (!this._show)
- return null;
+ return;
if (this._show.get_num_slides() < 1)
- return null;
+ return;
let [progress, duration, isFixed, file1, file2] = this._show.get_current_slide(monitor.width,
monitor.height);
this.transitionProgress = progress;
- let files = [];
-
if (file1)
- files.push(file1);
+ this.keyFrameFiles.push(file1);
if (file2)
- files.push(file2);
-
- return files;
+ this.keyFrameFiles.push(file2);
},
});
Signals.addSignalMethods(Animation.prototype);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]