diff --git a/effects/slidingpopups/slidingpopups.cpp b/effects/slidingpopups/slidingpopups.cpp
index 7e55ac28e..f63a07038 100644
--- a/effects/slidingpopups/slidingpopups.cpp
+++ b/effects/slidingpopups/slidingpopups.cpp
@@ -1,404 +1,416 @@
 /********************************************************************
  KWin - the KDE window manager
  This file is part of the KDE project.
 
 Copyright (C) 2009 Marco Martin notmart@gmail.com
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #include "slidingpopups.h"
 #include "slidingpopupsconfig.h"
 
 #include <QApplication>
 #include <QFontMetrics>
 
 #include <KWayland/Server/surface_interface.h>
 #include <KWayland/Server/slide_interface.h>
 #include <KWayland/Server/display.h>
 
 namespace KWin
 {
 
 SlidingPopupsEffect::SlidingPopupsEffect()
 {
     initConfig<SlidingPopupsConfig>();
     KWayland::Server::Display *display = effects->waylandDisplay();
     if (display) {
         display->createSlideManager(this)->create();
     }
 
     mSlideLength = QFontMetrics(qApp->font()).height() * 8;
 
     mAtom = effects->announceSupportProperty("_KDE_SLIDE", this);
     connect(effects, SIGNAL(windowAdded(KWin::EffectWindow*)), this, SLOT(slotWindowAdded(KWin::EffectWindow*)));
     connect(effects, &EffectsHandler::windowClosed, this, &SlidingPopupsEffect::slideOut);
     connect(effects, SIGNAL(windowDeleted(KWin::EffectWindow*)), this, SLOT(slotWindowDeleted(KWin::EffectWindow*)));
     connect(effects, SIGNAL(propertyNotify(KWin::EffectWindow*,long)), this, SLOT(slotPropertyNotify(KWin::EffectWindow*,long)));
     connect(effects, &EffectsHandler::windowShown, this, &SlidingPopupsEffect::slideIn);
     connect(effects, &EffectsHandler::windowHidden, this, &SlidingPopupsEffect::slideOut);
     connect(effects, &EffectsHandler::xcbConnectionChanged, this,
         [this] {
             mAtom = effects->announceSupportProperty(QByteArrayLiteral("_KDE_SLIDE"), this);
         }
     );
     reconfigure(ReconfigureAll);
 }
 
 SlidingPopupsEffect::~SlidingPopupsEffect()
 {
 }
 
 bool SlidingPopupsEffect::supported()
 {
      return effects->animationsSupported();
 }
 
 void SlidingPopupsEffect::reconfigure(ReconfigureFlags flags)
 {
     Q_UNUSED(flags)
     SlidingPopupsConfig::self()->read();
-    mFadeInTime = std::chrono::milliseconds(
+    m_slideInDuration = std::chrono::milliseconds(
         static_cast<int>(animationTime(SlidingPopupsConfig::slideInTime() != 0 ? SlidingPopupsConfig::slideInTime() : 150)));
-    mFadeOutTime = std::chrono::milliseconds(
+    m_slideOutDuration = std::chrono::milliseconds(
         static_cast<int>(animationTime(SlidingPopupsConfig::slideOutTime() != 0 ? SlidingPopupsConfig::slideOutTime() : 250)));
 
     auto animationIt = m_animations.begin();
     while (animationIt != m_animations.end()) {
         const auto duration = ((*animationIt).kind == AnimationKind::In)
-            ? mFadeInTime
-            : mFadeOutTime;
+            ? m_slideInDuration
+            : m_slideOutDuration;
         (*animationIt).timeLine.setDuration(duration);
         ++animationIt;
     }
 
-    QHash< const EffectWindow*, Data >::iterator wIt = mWindowsData.begin();
-    while (wIt != mWindowsData.end()) {
-        wIt.value().fadeInDuration = mFadeInTime;
-        wIt.value().fadeOutDuration = mFadeOutTime;
-        ++wIt;
+    auto dataIt = m_animationsData.begin();
+    while (dataIt != m_animationsData.end()) {
+        (*dataIt).slideInDuration = m_slideInDuration;
+        (*dataIt).slideOutDuration = m_slideOutDuration;
+        ++dataIt;
     }
 }
 
 void SlidingPopupsEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time)
 {
     auto animationIt = m_animations.find(w);
     if (animationIt == m_animations.end()) {
         effects->prePaintWindow(w, data, time);
         return;
     }
 
     (*animationIt).timeLine.update(std::chrono::milliseconds(time));
     data.setTransformed();
     w->enablePainting(EffectWindow::PAINT_DISABLED | EffectWindow::PAINT_DISABLED_BY_DELETE);
 
     effects->prePaintWindow(w, data, time);
 }
 
 void SlidingPopupsEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data)
 {
     auto animationIt = m_animations.constFind(w);
     if (animationIt == m_animations.constEnd()) {
         effects->paintWindow(w, mask, region, data);
         return;
     }
 
-    const int start = mWindowsData[ w ].start;
-
-    int slideLength;
-    if (mWindowsData[ w ].slideLength > 0) {
-        slideLength = mWindowsData[ w ].slideLength;
-    } else {
-        slideLength = mSlideLength;
-    }
+    const AnimationData &animData = m_animationsData[w];
+    const int slideLength = (animData.slideLength > 0) ? animData.slideLength : mSlideLength;
 
     const QRect screenRect = effects->clientArea(FullScreenArea, w->screen(), w->desktop());
     int splitPoint = 0;
     const QRect geo = w->expandedGeometry();
     const qreal t = (*animationIt).timeLine.value();
 
-    switch(mWindowsData[ w ].from) {
-    case West:
+    switch(animData.location) {
+    case Location::Left:
         if (slideLength < geo.width()) {
             data.multiplyOpacity(t);
         }
         data.translate(-interpolate(qMin(geo.width(), slideLength), 0.0, t));
-        splitPoint = geo.width() - (geo.x() + geo.width() - screenRect.x() - start);
+        splitPoint = geo.width() - (geo.x() + geo.width() - screenRect.x() - animData.offset);
         region = QRegion(geo.x() + splitPoint, geo.y(), geo.width() - splitPoint, geo.height());
         break;
-    case North:
+    case Location::Top:
         if (slideLength < geo.height()) {
             data.multiplyOpacity(t);
         }
         data.translate(0.0, -interpolate(qMin(geo.height(), slideLength), 0.0, t));
-        splitPoint = geo.height() - (geo.y() + geo.height() - screenRect.y() - start);
+        splitPoint = geo.height() - (geo.y() + geo.height() - screenRect.y() - animData.offset);
         region = QRegion(geo.x(), geo.y() + splitPoint, geo.width(), geo.height() - splitPoint);
         break;
-    case East:
+    case Location::Right:
         if (slideLength < geo.width()) {
             data.multiplyOpacity(t);
         }
         data.translate(interpolate(qMin(geo.width(), slideLength), 0.0, t));
-        splitPoint = screenRect.x() + screenRect.width() - geo.x() - start;
+        splitPoint = screenRect.x() + screenRect.width() - geo.x() - animData.offset;
         region = QRegion(geo.x(), geo.y(), splitPoint, geo.height());
         break;
-    case South:
+    case Location::Bottom:
     default:
         if (slideLength < geo.height()) {
             data.multiplyOpacity(t);
         }
         data.translate(0.0, interpolate(qMin(geo.height(), slideLength), 0.0, t));
-        splitPoint = screenRect.y() + screenRect.height() - geo.y() - start;
+        splitPoint = screenRect.y() + screenRect.height() - geo.y() - animData.offset;
         region = QRegion(geo.x(), geo.y(), geo.width(), splitPoint);
     }
 
     effects->paintWindow(w, mask, region, data);
 }
 
 void SlidingPopupsEffect::postPaintWindow(EffectWindow* w)
 {
     auto animationIt = m_animations.find(w);
     if (animationIt != m_animations.end()) {
         if ((*animationIt).timeLine.done()) {
             if (w->isDeleted()) {
                 w->unrefWindow();
             } else {
                 w->setData(WindowForceBackgroundContrastRole, QVariant());
                 w->setData(WindowForceBlurRole, QVariant());
             }
             m_animations.erase(animationIt);
         }
         w->addRepaintFull();
     }
 
     effects->postPaintWindow(w);
 }
 
 void SlidingPopupsEffect::slotWindowAdded(EffectWindow *w)
 {
     //X11
     if (mAtom != XCB_ATOM_NONE) {
         slotPropertyNotify(w, mAtom);
     }
 
     //Wayland
     if (auto surf = w->surface()) {
         slotWaylandSlideOnShowChanged(w);
         connect(surf, &KWayland::Server::SurfaceInterface::slideOnShowHideChanged, this, [this, surf] {
             slotWaylandSlideOnShowChanged(effects->findWindow(surf));
         });
     }
 
     slideIn(w);
 }
 
 void SlidingPopupsEffect::slotWindowDeleted(EffectWindow* w)
 {
     m_animations.remove(w);
-    mWindowsData.remove(w);
+    m_animationsData.remove(w);
     effects->addRepaint(w->expandedGeometry());
 }
 
 void SlidingPopupsEffect::slotPropertyNotify(EffectWindow* w, long a)
 {
     if (!w || a != mAtom || mAtom == XCB_ATOM_NONE)
         return;
 
     QByteArray data = w->readProperty(mAtom, mAtom, 32);
 
     if (data.length() < 1) {
         // Property was removed, thus also remove the effect for window
         if (w->data(WindowClosedGrabRole).value<void *>() == this) {
             w->setData(WindowClosedGrabRole, QVariant());
         }
         m_animations.remove(w);
-        mWindowsData.remove(w);
+        m_animationsData.remove(w);
         return;
     }
 
     auto* d = reinterpret_cast< uint32_t* >(data.data());
-    Data animData;
-    animData.start = d[ 0 ];
-    animData.from = (Position)d[ 1 ];
+    AnimationData &animData = m_animationsData[w];
+    animData.offset = d[ 0 ];
+
+    switch (d[1]) {
+    case 0: // West
+        animData.location = Location::Left;
+        break;
+    case 1: // North
+        animData.location = Location::Top;
+        break;
+    case 2: // East
+        animData.location = Location::Right;
+        break;
+    case 3: // South
+    default:
+        animData.location = Location::Bottom;
+        break;
+    }
+
     //custom duration
     animData.slideLength = 0;
     if (data.length() >= (int)(sizeof(uint32_t) * 3)) {
-        animData.fadeInDuration = std::chrono::milliseconds(d[2]);
+        animData.slideInDuration = std::chrono::milliseconds(d[2]);
         if (data.length() >= (int)(sizeof(uint32_t) * 4))
             //custom fadein
-            animData.fadeOutDuration = std::chrono::milliseconds(d[3]);
+            animData.slideOutDuration = std::chrono::milliseconds(d[3]);
         else
             //custom fadeout
-            animData.fadeOutDuration = std::chrono::milliseconds(d[2]);
+            animData.slideOutDuration = std::chrono::milliseconds(d[2]);
 
         //do we want an actual slide?
         if (data.length() >= (int)(sizeof(uint32_t) * 5))
             animData.slideLength = d[4];
     } else {
-        animData.fadeInDuration = mFadeInTime;
-        animData.fadeOutDuration = mFadeOutTime;
+        animData.slideInDuration = m_slideInDuration;
+        animData.slideOutDuration = m_slideOutDuration;
     }
-    mWindowsData[ w ] = animData;
+
     setupAnimData(w);
 }
 
 void SlidingPopupsEffect::setupAnimData(EffectWindow *w)
 {
     const QRect screenRect = effects->clientArea(FullScreenArea, w->screen(), effects->currentDesktop());
     const QRect windowGeo = w->geometry();
-    if (mWindowsData[w].start == -1) {
-        switch (mWindowsData[w].from) {
-        case West:
-            mWindowsData[w].start = qMax(windowGeo.left() - screenRect.left(), 0);
+    AnimationData &animData = m_animationsData[w];
+
+    if (animData.offset == -1) {
+        switch (animData.location) {
+        case Location::Left:
+            animData.offset = qMax(windowGeo.left() - screenRect.left(), 0);
             break;
-        case North:
-            mWindowsData[w].start = qMax(windowGeo.top() - screenRect.top(), 0);
+        case Location::Top:
+            animData.offset = qMax(windowGeo.top() - screenRect.top(), 0);
             break;
-        case East:
-            mWindowsData[w].start = qMax(screenRect.right() - windowGeo.right(), 0);
+        case Location::Right:
+            animData.offset = qMax(screenRect.right() - windowGeo.right(), 0);
             break;
-        case South:
+        case Location::Bottom:
         default:
-            mWindowsData[w].start = qMax(screenRect.bottom() - windowGeo.bottom(), 0);
+            animData.offset = qMax(screenRect.bottom() - windowGeo.bottom(), 0);
             break;
         }
     }
     // sanitize
-    switch (mWindowsData[w].from) {
-    case West:
-        mWindowsData[w].start = qMax(windowGeo.left() - screenRect.left(), mWindowsData[w].start);
+    switch (animData.location) {
+    case Location::Left:
+        animData.offset = qMax(windowGeo.left() - screenRect.left(), animData.offset);
         break;
-    case North:
-        mWindowsData[w].start = qMax(windowGeo.top() - screenRect.top(), mWindowsData[w].start);
+    case Location::Top:
+        animData.offset = qMax(windowGeo.top() - screenRect.top(), animData.offset);
         break;
-    case East:
-        mWindowsData[w].start = qMax(screenRect.right() - windowGeo.right(), mWindowsData[w].start);
+    case Location::Right:
+        animData.offset = qMax(screenRect.right() - windowGeo.right(), animData.offset);
         break;
-    case South:
+    case Location::Bottom:
     default:
-        mWindowsData[w].start = qMax(screenRect.bottom() - windowGeo.bottom(), mWindowsData[w].start);
+        animData.offset = qMax(screenRect.bottom() - windowGeo.bottom(), animData.offset);
         break;
     }
 
     // Grab the window, so other windowClosed effects will ignore it
     w->setData(WindowClosedGrabRole, QVariant::fromValue(static_cast<void*>(this)));
 }
 
 void SlidingPopupsEffect::slotWaylandSlideOnShowChanged(EffectWindow* w)
 {
     if (!w) {
         return;
     }
 
     KWayland::Server::SurfaceInterface *surf = w->surface();
     if (!surf) {
         return;
     }
 
     if (surf->slideOnShowHide()) {
-        Data animData;
-        animData.start = surf->slideOnShowHide()->offset();
+        AnimationData &animData = m_animationsData[w];
+
+        animData.offset = surf->slideOnShowHide()->offset();
 
         switch (surf->slideOnShowHide()->location()) {
         case KWayland::Server::SlideInterface::Location::Top:
-            animData.from = North;
+            animData.location = Location::Top;
             break;
         case KWayland::Server::SlideInterface::Location::Left:
-            animData.from = West;
+            animData.location = Location::Left;
             break;
         case KWayland::Server::SlideInterface::Location::Right:
-            animData.from = East;
+            animData.location = Location::Right;
             break;
         case KWayland::Server::SlideInterface::Location::Bottom:
         default:
-            animData.from = South;
+            animData.location = Location::Bottom;
             break;
         }
         animData.slideLength = 0;
-        animData.fadeInDuration = mFadeInTime;
-        animData.fadeOutDuration = mFadeOutTime;
-        mWindowsData[ w ] = animData;
+        animData.slideInDuration = m_slideInDuration;
+        animData.slideOutDuration = m_slideOutDuration;
 
         setupAnimData(w);
     }
 }
 
 void SlidingPopupsEffect::slideIn(EffectWindow *w)
 {
     if (effects->activeFullScreenEffect()) {
         return;
     }
 
     if (!w->isVisible()) {
         return;
     }
 
-    auto dataIt = mWindowsData.constFind(w);
-    if (dataIt == mWindowsData.constEnd()) {
+    auto dataIt = m_animationsData.constFind(w);
+    if (dataIt == m_animationsData.constEnd()) {
         return;
     }
 
     Animation &animation = m_animations[w];
     animation.kind = AnimationKind::In;
     animation.timeLine.reset();
     animation.timeLine.setDirection(TimeLine::Forward);
-    animation.timeLine.setDuration((*dataIt).fadeInDuration);
+    animation.timeLine.setDuration((*dataIt).slideInDuration);
     animation.timeLine.setEasingCurve(QEasingCurve::InOutSine);
 
     w->setData(WindowAddedGrabRole, QVariant::fromValue(static_cast<void*>(this)));
     w->setData(WindowForceBackgroundContrastRole, QVariant(true));
     w->setData(WindowForceBlurRole, QVariant(true));
 
     w->addRepaintFull();
 }
 
 void SlidingPopupsEffect::slideOut(EffectWindow *w)
 {
     if (effects->activeFullScreenEffect()) {
         return;
     }
 
     if (!w->isVisible()) {
         return;
     }
 
-    auto dataIt = mWindowsData.constFind(w);
-    if (dataIt == mWindowsData.constEnd()) {
+    auto dataIt = m_animationsData.constFind(w);
+    if (dataIt == m_animationsData.constEnd()) {
         return;
     }
 
     if (w->isDeleted()) {
         w->refWindow();
     }
 
     Animation &animation = m_animations[w];
     animation.kind = AnimationKind::Out;
     animation.timeLine.reset();
     animation.timeLine.setDirection(TimeLine::Backward);
-    animation.timeLine.setDuration((*dataIt).fadeOutDuration);
+    animation.timeLine.setDuration((*dataIt).slideOutDuration);
     animation.timeLine.setEasingCurve(QEasingCurve::InOutSine);
 
     w->setData(WindowClosedGrabRole, QVariant::fromValue(static_cast<void*>(this)));
     w->setData(WindowForceBackgroundContrastRole, QVariant(true));
     w->setData(WindowForceBlurRole, QVariant(true));
 
     w->addRepaintFull();
 }
 
 bool SlidingPopupsEffect::isActive() const
 {
     return !m_animations.isEmpty();
 }
 
 } // namespace
diff --git a/effects/slidingpopups/slidingpopups.h b/effects/slidingpopups/slidingpopups.h
index 0a4e489b9..6a085838e 100644
--- a/effects/slidingpopups/slidingpopups.h
+++ b/effects/slidingpopups/slidingpopups.h
@@ -1,108 +1,115 @@
 /********************************************************************
  KWin - the KDE window manager
  This file is part of the KDE project.
 
 Copyright (C) 2009 Marco Martin notmart@gmail.com
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 #ifndef KWIN_SLIDINGPOPUPS_H
 #define KWIN_SLIDINGPOPUPS_H
 
 // Include with base class for effects.
 #include <kwineffects.h>
 
 namespace KWin
 {
 
 class SlidingPopupsEffect
     : public Effect
 {
     Q_OBJECT
-    Q_PROPERTY(int fadeInTime READ fadeInTime)
-    Q_PROPERTY(int fadeOutTime READ fadeOutTime)
+    Q_PROPERTY(int slideInDuration READ slideInDuration)
+    Q_PROPERTY(int slideOutDuration READ slideOutDuration)
 public:
     SlidingPopupsEffect();
     ~SlidingPopupsEffect();
 
     virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time);
     virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data);
     virtual void postPaintWindow(EffectWindow* w);
     virtual void reconfigure(ReconfigureFlags flags);
     virtual bool isActive() const;
 
     int requestedEffectChainPosition() const override {
         return 40;
     }
 
     static bool supported();
 
     // TODO react also on virtual desktop changes
 
-    // for properties
-    int fadeInTime() const {
-        return mFadeInTime.count();
-    }
-    int fadeOutTime() const {
-        return mFadeOutTime.count();
-    }
+    int slideInDuration() const;
+    int slideOutDuration() const;
+
 public Q_SLOTS:
     void slotWindowAdded(KWin::EffectWindow *c);
     void slotWindowDeleted(KWin::EffectWindow *w);
     void slotPropertyNotify(KWin::EffectWindow *w, long a);
     void slotWaylandSlideOnShowChanged(EffectWindow* w);
 
     void slideIn(EffectWindow *w);
     void slideOut(EffectWindow *w);
 
 private:
     void setupAnimData(EffectWindow *w);
 
-    enum Position {
-        West = 0,
-        North = 1,
-        East = 2,
-        South = 3
-    };
-    struct Data {
-        int start; //point in screen coordinates where the window starts
-        //to animate, from decides if this point is an x or an y
-        Position from;
-        std::chrono::milliseconds fadeInDuration;
-        std::chrono::milliseconds fadeOutDuration;
-        int slideLength;
-    };
     long mAtom;
 
-    QHash< const EffectWindow*, Data > mWindowsData;
     int mSlideLength;
-    std::chrono::milliseconds mFadeInTime;
-    std::chrono::milliseconds mFadeOutTime;
+    std::chrono::milliseconds m_slideInDuration;
+    std::chrono::milliseconds m_slideOutDuration;
 
     enum class AnimationKind {
         In,
         Out
     };
 
     struct Animation {
         AnimationKind kind;
         TimeLine timeLine;
     };
     QHash<const EffectWindow*, Animation> m_animations;
+
+    enum class Location {
+        Left,
+        Top,
+        Right,
+        Bottom
+    };
+
+    struct AnimationData {
+        int offset;
+        Location location;
+        std::chrono::milliseconds slideInDuration;
+        std::chrono::milliseconds slideOutDuration;
+        int slideLength;
+    };
+    QHash<const EffectWindow*, AnimationData> m_animationsData;
 };
 
+inline int SlidingPopupsEffect::slideInDuration() const
+{
+    return m_slideInDuration.count();
+}
+
+inline int SlidingPopupsEffect::slideOutDuration() const
+{
+    return m_slideOutDuration.count();
+}
+
 } // namespace
 
 #endif