Merge branch 'Plasma/5.14'

2018-10-30 22:39:29 +02:00 · 2018-10-30 22:39:29 +02:00 · bdcd42d858
commit bdcd42d858
parent c0344daa09 558b86e9f6
1 changed files with 25 additions and 2 deletions
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@ -1392,8 +1392,31 @@ bool DesktopGridEffect::isActive() const

 bool DesktopGridEffect::isRelevantWithPresentWindows(EffectWindow *w) const
 {
-    return !(w->isDesktop() || w->isDock() || w->isSkipSwitcher() || w->isOnScreenDisplay()) &&
-            w->isCurrentTab() && w->isOnCurrentActivity();
+    if (w->isSpecialWindow() || w->isUtility()) {
+        return false;
+    }
+
+    if (w->isSkipSwitcher()) {
+        return false;
+    }
+
+    if (w->isDeleted()) {
+        return false;
+    }
+
+    if (!w->acceptsFocus()) {
+        return false;
+    }
+
+    if (!w->isCurrentTab()) {
+        return false;
+    }
+
+    if (!w->isOnCurrentActivity()) {
+        return false;
+    }
+
+    return true;
 }

 /************************************************