Fix OpenGL-less compile and make the effect actually display something
to the user if blur is not supported (Screen appears to freeze). svn path=/trunk/KDE/kdebase/workspace/; revision=926527
This commit is contained in:
parent
3f5a338234
commit
792c7439f8
1 changed files with 5 additions and 1 deletions
|
@ -93,13 +93,15 @@ void LogoutEffect::paintWindow( EffectWindow* w, int mask, QRegion region, Windo
|
|||
{
|
||||
if( progress > 0.0 )
|
||||
{
|
||||
if( w == logoutWindow )
|
||||
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
|
||||
if( blurSupported && w == logoutWindow )
|
||||
{
|
||||
windowOpacity = data.opacity;
|
||||
data.opacity = 0.0; // Cheat, we need the opacity for later but don't want to blur it
|
||||
}
|
||||
else
|
||||
{
|
||||
#endif
|
||||
if( effects->saturationSupported() )
|
||||
{
|
||||
data.saturation *= ( 1.0 - progress * 0.8 );
|
||||
|
@ -107,7 +109,9 @@ void LogoutEffect::paintWindow( EffectWindow* w, int mask, QRegion region, Windo
|
|||
}
|
||||
else // When saturation isn't supported then reduce brightness a bit more
|
||||
data.brightness *= ( 1.0 - progress * 0.6 );
|
||||
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
|
||||
}
|
||||
#endif
|
||||
}
|
||||
effects->paintWindow( w, mask, region, data );
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue