yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimize Fade Effect

Browse source 
Remove windows from the hash after an animation is finished.
By that it is possible that the FadeEffect goes into an
inactive state.

REVIEW: 102452
This commit is contained in:
Martin Gräßlin 2011-08-27 13:19:56 +02:00
parent fe4329a252
commit 557b3ce0de
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
effects/fade/fade.cpp
View file

@ -48,9 +48,6 @@ void FadeEffect::reconfigure(ReconfigureFlags)
windows.clear();
if (!fadeWindows)
return;
foreach (EffectWindow * w, effects->stackingOrder())
if (w && isFadeWindow(w)) // TODO: Apparently w can == NULL here?
windows[ w ] = WindowInfo();
}
void FadeEffect::prePaintScreen(ScreenPrePaintData& data, int time)
@ -86,6 +83,11 @@ void FadeEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int t
// but only if the total change is less than the
// maximum possible change
w->addRepaintFull();
} else {
if (windows[w].deleted) {
w->unrefWindow();
}
windows.remove(w);
}
}
}
@ -141,17 +143,17 @@ void FadeEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPa
|| windows[ w ].brightness != data.brightness)
w->addRepaintFull();
return;
} else {
windows.remove(w);
}
windows[ w ].fadeInStep = 0.0;
windows[ w ].fadeOutStep = 0.0;
}
effects->paintWindow(w, mask, region, data);
}
void FadeEffect::slotWindowOpacityChanged(EffectWindow* w, qreal old_opacity)
{
if (!windows.contains(w))
windows[ w ].opacity = old_opacity;
if (!windows.contains(w) || !isFadeWindow(w))
return;
if (windows[ w ].opacity == 1.0)
windows[ w ].opacity -= 0.1 / fadeOutTime;
w->addRepaintFull();