alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

provide a short-circuit path for checking the js anims so we don't check over and over again

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1138329
This commit is contained in:
Aaron J. Seigo 2010-06-15 18:02:44 +00:00
parent 3e4c38bbf4
commit 5df21d2137
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
animations/animationscriptengine.cpp
View File

@ -49,6 +49,7 @@ namespace AnimationScriptEngine
QScriptEngine* inst = 0; QScriptEngine* inst = 0;
QHash<QString, QScriptValue> s_animFuncs; QHash<QString, QScriptValue> s_animFuncs;
QSet<QString> s_animFailures;
QString s_prefix; QString s_prefix;
QScriptValue animation(const QString &anim) QScriptValue animation(const QString &anim)
@ -61,9 +62,20 @@ bool isAnimationRegistered(const QString &anim)
return s_animFuncs.contains(anim); return s_animFuncs.contains(anim);
} }
void addToLoadFailures(const QString &anim)
{
s_animFailures.insert(anim);
}
bool animationFailedToLoad(const QString &anim)
{
return s_animFailures.contains(anim);
}
void clearAnimations() void clearAnimations()
{ {
s_animFuncs.clear(); s_animFuncs.clear();
s_animFailures.clear();
delete inst; delete inst;
inst = 0; inst = 0;
} }

2
animations/animationscriptengine_p.h
View File

@ -39,6 +39,8 @@ bool isAnimationRegistered(const QString &anim);
QScriptEngine* globalEngine(); QScriptEngine* globalEngine();
QScriptValue animation(const QString &anim); QScriptValue animation(const QString &anim);
bool loadScript(const QString &path, const QString &prefix = QString()); bool loadScript(const QString &path, const QString &prefix = QString());
void addToLoadFailures(const QString &anim);
bool animationFailedToLoad(const QString &anim);
} }

7
animator.cpp
View File

@ -183,19 +183,26 @@ QEasingCurve Animator::create(Animator::CurveShape type)
Plasma::Animation *Animator::create(const QString &anim, QObject *parent) Plasma::Animation *Animator::create(const QString &anim, QObject *parent)
{ {
if (AnimationScriptEngine::animationFailedToLoad(anim)) {
return 0;
}
if (!AnimationScriptEngine::isAnimationRegistered(anim)) { if (!AnimationScriptEngine::isAnimationRegistered(anim)) {
const QString path = Theme::defaultTheme()->animationPath(anim); const QString path = Theme::defaultTheme()->animationPath(anim);
if (path.isEmpty()) { if (path.isEmpty()) {
AnimationScriptEngine::addToLoadFailures(anim);
//kError() << "************ failed to find script file for animation" << anim; //kError() << "************ failed to find script file for animation" << anim;
return 0; return 0;
} }
if (!AnimationScriptEngine::loadScript(path)) { if (!AnimationScriptEngine::loadScript(path)) {
AnimationScriptEngine::addToLoadFailures(anim);
return 0; return 0;
} }
if (!AnimationScriptEngine::isAnimationRegistered(anim)) { if (!AnimationScriptEngine::isAnimationRegistered(anim)) {
//kError() << "successfully loaded script file" << path << ", but did not get animation object for" << anim; //kError() << "successfully loaded script file" << path << ", but did not get animation object for" << anim;
AnimationScriptEngine::addToLoadFailures(anim);
return 0; return 0;
} }
} }