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

protect against cancel of just ended animations

Browse source
This commit is contained in:
Thomas Lübking 2016-02-03 12:53:37 +01:00
parent 4f66f324d7
commit 07cc30d136
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libkwineffects/kwinanimationeffect.cpp
View file

@ -38,10 +38,15 @@ QElapsedTimer AnimationEffect::s_clock;
class AnimationEffectPrivate { class AnimationEffectPrivate {
public: public:
AnimationEffectPrivate() { m_animated = m_damageDirty = m_animationsTouched = m_isInitialized = false; } AnimationEffectPrivate()
{
m_animated = m_damageDirty = m_animationsTouched = m_isInitialized = false;
m_justEndedAnimation = 0;
}
AnimationEffect::AniMap m_animations; AnimationEffect::AniMap m_animations;
EffectWindowList m_zombies; EffectWindowList m_zombies;
bool m_animated, m_damageDirty, m_needSceneRepaint, m_animationsTouched, m_isInitialized; bool m_animated, m_damageDirty, m_needSceneRepaint, m_animationsTouched, m_isInitialized;
quint64 m_justEndedAnimation; // protect against cancel
}; };
} }
@ -231,6 +236,8 @@ quint64 AnimationEffect::p_animate( EffectWindow *w, Attribute a, uint meta, int
bool AnimationEffect::cancel(quint64 animationId) bool AnimationEffect::cancel(quint64 animationId)
{ {
Q_D(AnimationEffect); Q_D(AnimationEffect);
if (animationId == d->m_justEndedAnimation)
return true; // this is just ending, do not try to cancel it but fake success
for (AniMap::iterator entry = d->m_animations.begin(), mapEnd = d->m_animations.end(); entry != mapEnd; ++entry) { for (AniMap::iterator entry = d->m_animations.begin(), mapEnd = d->m_animations.end(); entry != mapEnd; ++entry) {
for (QList<AniData>::iterator anim = entry->first.begin(), animEnd = entry->first.end(); anim != animEnd; ++anim) { for (QList<AniData>::iterator anim = entry->first.begin(), animEnd = entry->first.end(); anim != animEnd; ++anim) {
if (quint64(&(*anim)) == animationId) { if (quint64(&(*anim)) == animationId) {
@ -245,6 +252,7 @@ bool AnimationEffect::cancel(quint64 animationId)
} }
if (d->m_animations.isEmpty()) if (d->m_animations.isEmpty())
disconnectGeometryChanges(); disconnectGeometryChanges();
d->m_animationsTouched = true; // could be called from animationEnded
return true; return true;
} }
} }
@ -292,7 +300,9 @@ void AnimationEffect::prePaintScreen( ScreenPrePaintData& data, int time )
oldW->unreferencePreviousWindowPixmap(); oldW->unreferencePreviousWindowPixmap();
effects->addRepaint(oldW->expandedGeometry()); effects->addRepaint(oldW->expandedGeometry());
} }
d->m_justEndedAnimation = quint64(&(*anim));
animationEnded(oldW, anim->attribute, anim->meta); animationEnded(oldW, anim->attribute, anim->meta);
d->m_justEndedAnimation = 0;
// NOTICE animationEnded is an external call and might have called "::animate" // NOTICE animationEnded is an external call and might have called "::animate"
// as a result our iterators could now point random junk on the heap // as a result our iterators could now point random junk on the heap
// so we've to restore the former states, ie. find our window list and animation // so we've to restore the former states, ie. find our window list and animation