Fix for Plasma 5.25 (#9)

zzag · Jun 17, 2022 · 0af28c1 · 0af28c1
1 parent 44c02fb
commit 0af28c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/slidingnotificationseffect.cpp b/src/slidingnotificationseffect.cpp
@@ -42,15 +42,7 @@ void SlidingNotificationsEffect::prePaintWindow(EffectWindow *window, WindowPreP
     auto it = m_animations.find(window);
     if (it != m_animations.end()) {
         data.setTransformed();
-        if (window->isDeleted()) {
-            window->enablePainting(EffectWindow::PAINT_DISABLED_BY_DELETE);
-        }
-
-        if (!it->lastTimestamp) {
-            it->lastTimestamp = presentTime;
-        }
-        it->timeline.update(presentTime - it->lastTimestamp.value());
-        it->lastTimestamp = presentTime;
+        it->timeline.advance(presentTime);
     }
 
     effects->prePaintWindow(window, data, presentTime);
@@ -174,6 +166,7 @@ void SlidingNotificationsEffect::slotWindowClosed(EffectWindow *window)
     forceContrastEffect(window);
 
     SlideAnimation animation;
+    animation.visibleRef = KWin::EffectWindowVisibleRef(window, EffectWindow::PAINT_DISABLED_BY_DELETE);
     animation.timeline.setEasingCurve(m_slideOutCurve);
     animation.timeline.setDuration(m_slideDuration);
 

diff --git a/src/slidingnotificationseffect.h b/src/slidingnotificationseffect.h
@@ -15,8 +15,8 @@ using namespace KWin; // sue me...
 class SlideAnimation
 {
 public:
-    std::optional<std::chrono::milliseconds> lastTimestamp;
     TimeLine timeline;
+    KWin::EffectWindowVisibleRef visibleRef;
 
     QRect clip;
     QPointF startOffset;