Commit bdcd42d8 authored by Vlad Zahorodnii's avatar Vlad Zahorodnii

Merge branch 'Plasma/5.14'

parents c0344daa 558b86e9
...@@ -1392,8 +1392,31 @@ bool DesktopGridEffect::isActive() const ...@@ -1392,8 +1392,31 @@ bool DesktopGridEffect::isActive() const
bool DesktopGridEffect::isRelevantWithPresentWindows(EffectWindow *w) const bool DesktopGridEffect::isRelevantWithPresentWindows(EffectWindow *w) const
{ {
return !(w->isDesktop() || w->isDock() || w->isSkipSwitcher() || w->isOnScreenDisplay()) && if (w->isSpecialWindow() || w->isUtility()) {
w->isCurrentTab() && w->isOnCurrentActivity(); 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;
} }
/************************************************ /************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment