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

[libkwineffects] Port AnimationEffect to new connect syntax

Browse source 
Summary: Connecting with the new syntax is faster and also type checked.

Test Plan: Scripted effects still work as expected.

Reviewers: #kwin, graesslin

Reviewed By: #kwin, graesslin

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18393
This commit is contained in:
Vlad Zagorodniy 2019-01-19 20:27:17 +02:00
parent 6740db7a6c
commit cd0f954ab1
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libkwineffects/kwinanimationeffect.cpp
View file

@ -82,8 +82,8 @@ void AnimationEffect::init()
* connect it we can provide auto-referencing of animated and closed windows, since at the time * connect it we can provide auto-referencing of animated and closed windows, since at the time
* our slot will be called, the slot of the subclass has been (SIGNAL/SLOT connections are FIFO) * our slot will be called, the slot of the subclass has been (SIGNAL/SLOT connections are FIFO)
* and has pot. started an animation so we have the window in our hash :) */ * and has pot. started an animation so we have the window in our hash :) */
connect ( effects, SIGNAL(windowClosed(KWin::EffectWindow*)), SLOT(_windowClosed(KWin::EffectWindow*)) ); connect(effects, &EffectsHandler::windowClosed, this, &AnimationEffect::_windowClosed);
connect ( effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), SLOT(_windowDeleted(KWin::EffectWindow*)) ); connect(effects, &EffectsHandler::windowDeleted, this, &AnimationEffect::_windowDeleted);
} }
bool AnimationEffect::isActive() const bool AnimationEffect::isActive() const
@ -226,12 +226,12 @@ quint64 AnimationEffect::p_animate( EffectWindow *w, Attribute a, uint meta, int
if (!d->m_isInitialized) if (!d->m_isInitialized)
init(); // needs to ensure the window gets removed if deleted in the same event cycle init(); // needs to ensure the window gets removed if deleted in the same event cycle
if (d->m_animations.isEmpty()) { if (d->m_animations.isEmpty()) {
connect (effects, SIGNAL(windowGeometryShapeChanged(KWin::EffectWindow*,QRect)), connect(effects, &EffectsHandler::windowGeometryShapeChanged,
SLOT(_expandedGeometryChanged(KWin::EffectWindow*,QRect))); this, &AnimationEffect::_expandedGeometryChanged);
connect (effects, SIGNAL(windowStepUserMovedResized(KWin::EffectWindow*,QRect)), connect(effects, &EffectsHandler::windowStepUserMovedResized,
SLOT(_expandedGeometryChanged(KWin::EffectWindow*,QRect))); this, &AnimationEffect::_expandedGeometryChanged);
connect (effects, SIGNAL(windowPaddingChanged(KWin::EffectWindow*,QRect)), connect(effects, &EffectsHandler::windowPaddingChanged,
SLOT(_expandedGeometryChanged(KWin::EffectWindow*,QRect))); this, &AnimationEffect::_expandedGeometryChanged);
} }
AniMap::iterator it = d->m_animations.find(w); AniMap::iterator it = d->m_animations.find(w);
if (it == d->m_animations.end()) if (it == d->m_animations.end())
@ -284,7 +284,7 @@ quint64 AnimationEffect::p_animate( EffectWindow *w, Attribute a, uint meta, int
d->m_animationsTouched = true; d->m_animationsTouched = true;
if (delay > 0) { if (delay > 0) {
QTimer::singleShot(delay, this, SLOT(triggerRepaint())); QTimer::singleShot(delay, this, &AnimationEffect::triggerRepaint);
const QSize &s = effects->virtualScreenSize(); const QSize &s = effects->virtualScreenSize();
if (waitAtSource) if (waitAtSource)
w->addLayerRepaint(0, 0, s.width(), s.height()); w->addLayerRepaint(0, 0, s.width(), s.height());
@ -565,12 +565,12 @@ void AnimationEffect::clipWindow(const EffectWindow *w, const AniData &anim, Win
void AnimationEffect::disconnectGeometryChanges() void AnimationEffect::disconnectGeometryChanges()
{ {
disconnect (effects,SIGNAL(windowGeometryShapeChanged(KWin::EffectWindow*,QRect)), disconnect(effects, &EffectsHandler::windowGeometryShapeChanged,
this, SLOT(_expandedGeometryChanged(KWin::EffectWindow*,QRect))); this, &AnimationEffect::_expandedGeometryChanged);
disconnect (effects,SIGNAL(windowStepUserMovedResized(KWin::EffectWindow*,QRect)), disconnect(effects, &EffectsHandler::windowStepUserMovedResized,
this, SLOT(_expandedGeometryChanged(KWin::EffectWindow*,QRect))); this, &AnimationEffect::_expandedGeometryChanged);
disconnect (effects,SIGNAL(windowPaddingChanged(KWin::EffectWindow*,QRect)), disconnect(effects, &EffectsHandler::windowPaddingChanged,
this, SLOT(_expandedGeometryChanged(KWin::EffectWindow*,QRect))); this, &AnimationEffect::_expandedGeometryChanged);
} }