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

Merge remote-tracking branch 'origin/KDE/4.8'

Browse source
This commit is contained in:
Philipp Knechtges 2012-01-12 20:53:09 +01:00
commit 815a0fe681
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
effects/fade/fade.cpp
View file

@ -169,12 +169,14 @@ void FadeEffect::slotWindowAdded(EffectWindow* w)
void FadeEffect::slotWindowClosed(EffectWindow* w) void FadeEffect::slotWindowClosed(EffectWindow* w)
{ {
if (!fadeWindows || !isFadeWindow(w)) // In the cases, where we are still fading in or are not responsible, we do not fade out.
if (!fadeWindows || !isFadeWindow(w) || windows.contains(w)) {
return; return;
if (!windows.contains(w)) }
windows[ w ].opacity = w->opacity(); windows[ w ].opacity = w->opacity();
if (windows[ w ].opacity == 1.0) if (windows[ w ].opacity == 1.0) {
windows[ w ].opacity -= 0.1 / fadeOutTime; windows[ w ].opacity -= 0.1 / fadeOutTime;
}
windows[ w ].deleted = true; windows[ w ].deleted = true;
w->refWindow(); w->refWindow();
w->addRepaintFull(); w->addRepaintFull();