From 31e664783f36b65bc0f815d4984cb66fa05b19b7 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 12 Dec 2019 15:31:56 +0200 Subject: [PATCH] Revert "[effects/fallapart] Override scale, fade, and glide effect" This reverts commit 1747e497e4a23c2f0524455a7e608c64b017bbd7. Unfortunately, this patch causes fall apart effect to override sliding popups effect, which we really don't want to do. --- effects/fallapart/fallapart.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/effects/fallapart/fallapart.cpp b/effects/fallapart/fallapart.cpp index 5e08fd971d..df623fb836 100644 --- a/effects/fallapart/fallapart.cpp +++ b/effects/fallapart/fallapart.cpp @@ -163,6 +163,9 @@ void FallApartEffect::slotWindowClosed(EffectWindow* c) return; if (!c->isVisible()) return; + const void* e = c->data(WindowClosedGrabRole).value(); + if (e && e != this) + return; c->setData(WindowClosedGrabRole, QVariant::fromValue(static_cast(this))); windows[ c ] = 0; c->refWindow();