Fix compile when OpenGL is not available.
svn path=/trunk/KDE/kdebase/workspace/; revision=1032334
This commit is contained in:
parent
5fdf18e65f
commit
f1460a0429
1 changed files with 7 additions and 5 deletions
|
@ -110,11 +110,11 @@ void LogoutEffect::prePaintScreen( ScreenPrePaintData& data, int time )
|
|||
frameDelay = 2;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if( frameDelay )
|
||||
--frameDelay;
|
||||
else
|
||||
#endif
|
||||
{
|
||||
if( logoutWindow != NULL && !logoutWindowClosed )
|
||||
progress = qMin( 1.0, progress + time / animationTime( 2000.0 ));
|
||||
|
@ -234,14 +234,16 @@ void LogoutEffect::paintScreen( int mask, QRegion region, ScreenPaintData& data
|
|||
|
||||
void LogoutEffect::postPaintScreen()
|
||||
{
|
||||
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
|
||||
if(( progress != 0.0 && progress != 1.0 ) || frameDelay )
|
||||
{
|
||||
effects->addRepaintFull();
|
||||
}
|
||||
#else
|
||||
if( progress != 0.0 && progress != 1.0 )
|
||||
effects->addRepaintFull();
|
||||
#endif
|
||||
|
||||
if( progress > 0.0 )
|
||||
{
|
||||
logoutWindowPassed = false;
|
||||
}
|
||||
effects->postPaintScreen();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue