diff --git a/libkwineffects/anidata.cpp b/libkwineffects/anidata.cpp --- a/libkwineffects/anidata.cpp +++ b/libkwineffects/anidata.cpp @@ -31,6 +31,16 @@ using namespace KWin; static const int Gaussian = 46; +FullScreenEffectLock::FullScreenEffectLock(Effect *effect) +{ + effects->setActiveFullScreenEffect(effect); +} + +FullScreenEffectLock::~FullScreenEffectLock() +{ + effects->setActiveFullScreenEffect(nullptr); +} + AniData::AniData() : attribute(AnimationEffect::Opacity) , customCurve(0) // Linear diff --git a/libkwineffects/anidata_p.h b/libkwineffects/anidata_p.h --- a/libkwineffects/anidata_p.h +++ b/libkwineffects/anidata_p.h @@ -27,6 +27,20 @@ namespace KWin { +/** + * Wraps effects->setActiveFullScreenEffect for the duration of it's lifespan + */ +class FullScreenEffectLock +{ +public: + FullScreenEffectLock(Effect *effect); + ~FullScreenEffectLock(); +private: + Q_DISABLE_COPY(FullScreenEffectLock) + void *d; //unused currently +}; +typedef QSharedPointer FullScreenEffectLockPtr; + class KWINEFFECTS_EXPORT AniData { public: AniData(); diff --git a/libkwineffects/kwinanimationeffect.h b/libkwineffects/kwinanimationeffect.h --- a/libkwineffects/kwinanimationeffect.h +++ b/libkwineffects/kwinanimationeffect.h @@ -88,20 +88,6 @@ bool valid; }; -/** - * Wraps effects->setActiveFullScreenEffect for the duration of it's lifespan - */ -class FullScreenEffectLock -{ -public: - FullScreenEffectLock(Effect *effect); - ~FullScreenEffectLock(); -private: - Q_DISABLE_COPY(FullScreenEffectLock) - void *d; //unused currently -}; -typedef QSharedPointer FullScreenEffectLockPtr; - class AniData; class AnimationEffectPrivate; class KWINEFFECTS_EXPORT AnimationEffect : public Effect diff --git a/libkwineffects/kwinanimationeffect.cpp b/libkwineffects/kwinanimationeffect.cpp --- a/libkwineffects/kwinanimationeffect.cpp +++ b/libkwineffects/kwinanimationeffect.cpp @@ -965,14 +965,4 @@ return d->m_animations; } -FullScreenEffectLock::FullScreenEffectLock(Effect *effect) -{ - effects->setActiveFullScreenEffect(effect); -} - -FullScreenEffectLock::~FullScreenEffectLock() -{ - effects->setActiveFullScreenEffect(nullptr); -} - #include "moc_kwinanimationeffect.cpp"