yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix effect script parsing

Browse source 
REVIEW: 109987
This commit is contained in:
Thomas Lübking 2013-04-13 12:13:22 +02:00
parent 8cf6e39eab
commit 3faecf5075
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripting/scriptedeffect.cpp
View file

@ -188,6 +188,7 @@ QList<AnimationSettings> animationSettings(QScriptContext *context, ScriptedEffe
if (value.isObject()) {
AnimationSettings s = animationSettingsFromObject(value);
const uint set = s.set | settings.at(0).set;
// Catch show stoppers (incompletable animation)
if (!(set & AnimationSettings::Type)) {
context->throwError(QScriptContext::TypeError, "Type property missing in animation options");
continue;
@ -196,10 +197,14 @@ QList<AnimationSettings> animationSettings(QScriptContext *context, ScriptedEffe
context->throwError(QScriptContext::TypeError, "Duration property missing in animation options");
continue;
}
if (!s.set & AnimationSettings::Curve) {
// Complete local animations from global settings
if (!(s.set & AnimationSettings::Duration)) {
s.duration = settings.at(0).duration;
}
if (!(s.set & AnimationSettings::Curve)) {
s.curve = settings.at(0).curve;
}
if (!s.set & AnimationSettings::Delay) {
if (!(s.set & AnimationSettings::Delay)) {
s.delay = settings.at(0).delay;
}
settings << s;
@ -217,6 +222,8 @@ QList<AnimationSettings> animationSettings(QScriptContext *context, ScriptedEffe
context->throwError(QScriptContext::TypeError, "Duration property missing in animation options");
settings.clear();
}
} else if (!(settings.at(0).set & AnimationSettings::Type)) { // invalid global
settings.removeAt(0); // -> get rid of it, only used to complete the others
}
return settings;
@ -247,7 +254,6 @@ QScriptValue kwinEffectAnimate(QScriptContext *context, QScriptEngine *engine)
setting.curve,
setting.delay));
}
return engine->newVariant(animIds);
}