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

Coverswitch: Fade windows not on the current desktop in and out

Browse source 
when the effect is started and stopped.

svn path=/trunk/KDE/kdebase/workspace/; revision=802483
This commit is contained in:
Sebastian Kügler 2008-04-29 16:20:06 +00:00
parent 4f9cb481c2
commit d35fe96770
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
effects/coverswitch.cpp
View file

@ -172,11 +172,11 @@ void CoverSwitchEffect::paintScreen( int mask, QRegion region, ScreenPaintData&
int leftIndex = index +1; int leftIndex = index +1;
if( leftIndex == tempList.count() ) if( leftIndex == tempList.count() )
leftIndex = 0; leftIndex = 0;
EffectWindow* frontWindow = tempList[ index ]; EffectWindow* frontWindow = tempList[ index ];
QList< EffectWindow* > leftWindows; QList< EffectWindow* > leftWindows;
QList< EffectWindow* > rightWindows; QList< EffectWindow* > rightWindows;
bool evenWindows = ( tempList.count() % 2 == 0 ) ? true : false; bool evenWindows = ( tempList.count() % 2 == 0 ) ? true : false;
int leftWindowCount = 0; int leftWindowCount = 0;
if( evenWindows ) if( evenWindows )
@ -245,7 +245,7 @@ void CoverSwitchEffect::paintScreen( int mask, QRegion region, ScreenPaintData&
glDisable( GL_BLEND ); glDisable( GL_BLEND );
} }
paintScene( frontWindow, &leftWindows, &rightWindows ); paintScene( frontWindow, &leftWindows, &rightWindows );
glPopMatrix(); glPopMatrix();
glPopAttrib(); glPopAttrib();
glMatrixMode( GL_PROJECTION ); glMatrixMode( GL_PROJECTION );
@ -319,7 +319,7 @@ void CoverSwitchEffect::paintScreen( int mask, QRegion region, ScreenPaintData&
void CoverSwitchEffect::postPaintScreen() void CoverSwitchEffect::postPaintScreen()
{ {
if( ( mActivated && ( animation || start ) ) || stop || stopRequested ) if( ( mActivated && ( animation || start ) ) || stop || stopRequested )
{ {
if( timeLine.value() == 1.0 ) if( timeLine.value() == 1.0 )
{ {
timeLine.setProgress(0.0); timeLine.setProgress(0.0);
@ -531,7 +531,7 @@ void CoverSwitchEffect::paintScene( EffectWindow* frontWindow, QList< EffectWind
} }
} }
} }
void CoverSwitchEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data ) void CoverSwitchEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data )
{ {
if( mActivated || stop || stopRequested ) if( mActivated || stop || stopRequested )
@ -548,9 +548,16 @@ void CoverSwitchEffect::paintWindow( EffectWindow* w, int mask, QRegion region,
return; return;
} }
} }
if ( ( start || stop ) && !w->isOnCurrentDesktop() )
{
if (stop) // Fade out windows not on the current desktop
data.opacity = (1.0 - timeLine.value());
else // Fade in Windows from other desktops when animation is started
data.opacity = timeLine.value();
}
effects->paintWindow( w, mask, region, data ); effects->paintWindow( w, mask, region, data );
} }
void CoverSwitchEffect::tabBoxAdded( int mode ) void CoverSwitchEffect::tabBoxAdded( int mode )
{ {
if( effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this ) if( effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this )