diff --git a/effects/desktopgrid/desktopgrid.h b/effects/desktopgrid/desktopgrid.h --- a/effects/desktopgrid/desktopgrid.h +++ b/effects/desktopgrid/desktopgrid.h @@ -175,9 +175,6 @@ // Shortcut - needed to toggle the effect QList shortcut; - // State of WindowForceBlurRole before this effect - QMap m_windowForceBlurRoleState; - PresentWindowsEffectProxy* m_proxy; QList m_managers; bool m_usePresentWindows; diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp --- a/effects/desktopgrid/desktopgrid.cpp +++ b/effects/desktopgrid/desktopgrid.cpp @@ -164,7 +164,6 @@ } for (auto const &w : effects->stackingOrder()) { - m_windowForceBlurRoleState[w] = w->data(WindowForceBlurRole).toBool(); w->setData(WindowForceBlurRole, QVariant(true)); } @@ -257,7 +256,7 @@ } for (auto &w : effects->stackingOrder()) { - w->setData(WindowForceBlurRole, m_windowForceBlurRoleState.value(w, false)); + w->setData(WindowForceBlurRole, QVariant()); } effects->postPaintScreen(); diff --git a/effects/maximize/package/contents/code/maximize.js b/effects/maximize/package/contents/code/maximize.js --- a/effects/maximize/package/contents/code/maximize.js +++ b/effects/maximize/package/contents/code/maximize.js @@ -19,7 +19,6 @@ /*global effect, effects, animate, animationTime, Effect*/ var maximizeEffect = { duration: animationTime(250), - windowForceBlurRoleState: false, loadConfig: function () { "use strict"; maximizeEffect.duration = animationTime(250); @@ -29,7 +28,6 @@ if (!window.oldGeometry) { return; } - maximizeEffect.windowForceBlurRoleState = window.data(Effect.WindowForceBlurRole); window.setData(Effect.WindowForceBlurRole, true); var oldGeometry, newGeometry; oldGeometry = window.oldGeometry; @@ -76,7 +74,7 @@ } }, restoreForceBlurState: function(window) { - window.setData(Effect.WindowForceBlurRole, maximizeEffect.windowForceBlurRoleState); + window.setData(Effect.WindowForceBlurRole, null); }, geometryChange: function (window, oldGeometry) { "use strict"; diff --git a/effects/presentwindows/presentwindows.h b/effects/presentwindows/presentwindows.h --- a/effects/presentwindows/presentwindows.h +++ b/effects/presentwindows/presentwindows.h @@ -309,9 +309,6 @@ // Grid layout info QList m_gridSizes; - // State of WindowForceBlurRole before this effect - QMap m_windowForceBlurRoleState; - // Filter box EffectFrame* m_filterFrame; QString m_windowFilter; diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp --- a/effects/presentwindows/presentwindows.cpp +++ b/effects/presentwindows/presentwindows.cpp @@ -244,8 +244,8 @@ m_windowData.clear(); foreach (EffectWindow * w, effects->stackingOrder()) { - w->setData(WindowForceBlurRole, QVariant(m_windowForceBlurRoleState.value(w, false))); - w->setData(WindowForceBackgroundContrastRole, QVariant(false)); + w->setData(WindowForceBlurRole, QVariant()); + w->setData(WindowForceBackgroundContrastRole, QVariant()); } effects->setActiveFullScreenEffect(NULL); effects->addRepaintFull(); @@ -1584,7 +1584,6 @@ setHighlightedWindow(effects->activeWindow()); foreach (EffectWindow * w, effects->stackingOrder()) { - m_windowForceBlurRoleState[w] = w->data(WindowForceBlurRole).toBool(); w->setData(WindowForceBlurRole, QVariant(true)); w->setData(WindowForceBackgroundContrastRole, QVariant(true)); } diff --git a/effects/slideback/slideback.h b/effects/slideback/slideback.h --- a/effects/slideback/slideback.h +++ b/effects/slideback/slideback.h @@ -66,8 +66,6 @@ int m_tabboxActive; QList clippedRegions; - QMap m_windowForceBlurRoleState; - QRect getSlideDestination(const QRect &windowUnderGeometry, const QRect &windowOverGeometry); bool isWindowUsable(EffectWindow *w); bool intersects(EffectWindow *windowUnder, const QRect &windowOverGeometry); diff --git a/effects/slideback/slideback.cpp b/effects/slideback/slideback.cpp --- a/effects/slideback/slideback.cpp +++ b/effects/slideback/slideback.cpp @@ -151,7 +151,6 @@ } for (auto const &w : effects->stackingOrder()) { - m_windowForceBlurRoleState[w] = w->data(WindowForceBlurRole).toBool(); w->setData(WindowForceBlurRole, QVariant(true)); } @@ -165,7 +164,7 @@ } for (auto &w : effects->stackingOrder()) { - w->setData(WindowForceBlurRole, m_windowForceBlurRoleState.value(w, false)); + w->setData(WindowForceBlurRole, QVariant()); } effects->postPaintScreen();