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

Do not activate the effect with nothing to show.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=804228
This commit is contained in:
Luboš Luňák 2008-05-05 11:58:53 +00:00
parent 4851bff561
commit f9ce0427e8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
effects/presentwindows.cpp
View file

@ -304,8 +304,6 @@ void PresentWindowsEffect::setActive(bool active)
if( mActivated ) if( mActivated )
{ {
mWindowData.clear(); mWindowData.clear();
effectActivated();
mActiveness = 0;
windowFilter.clear(); windowFilter.clear();
mWindowsToPresent.clear(); mWindowsToPresent.clear();
const EffectWindowList& originalwindowlist = effects->stackingOrder(); const EffectWindowList& originalwindowlist = effects->stackingOrder();
@ -320,6 +318,13 @@ void PresentWindowsEffect::setActive(bool active)
continue; continue;
mWindowsToPresent.append(window); mWindowsToPresent.append(window);
} }
if( mWindowsToPresent.isEmpty())
{
mActivated = false; // don't activate with nothing to show
return;
}
mActiveness = 0;
effectActivated();
rearrangeWindows(); rearrangeWindows();
setHighlightedWindow( effects->activeWindow()); setHighlightedWindow( effects->activeWindow());
} }