vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compile when OpenGL is not available. 

svn path=/trunk/KDE/kdebase/workspace/; revision=1032334
icc-effect-5.14.5
Lucas Murray 2009-10-07 15:10:15 +00:00
parent 5fdf18e65f
commit f1460a0429
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
effects/logout/logout.cpp
View File

@ -110,11 +110,11 @@ void LogoutEffect::prePaintScreen( ScreenPrePaintData& data, int time )
frameDelay = 2; frameDelay = 2;
} }
} }
#endif
if( frameDelay ) if( frameDelay )
--frameDelay; --frameDelay;
else else
#endif
{ {
if( logoutWindow != NULL && !logoutWindowClosed ) if( logoutWindow != NULL && !logoutWindowClosed )
progress = qMin( 1.0, progress + time / animationTime( 2000.0 )); 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() void LogoutEffect::postPaintScreen()
{ {
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
if(( progress != 0.0 && progress != 1.0 ) || frameDelay ) if(( progress != 0.0 && progress != 1.0 ) || frameDelay )
{
effects->addRepaintFull(); effects->addRepaintFull();
} #else
if( progress != 0.0 && progress != 1.0 )
effects->addRepaintFull();
#endif
if( progress > 0.0 ) if( progress > 0.0 )
{
logoutWindowPassed = false; logoutWindowPassed = false;
}
effects->postPaintScreen(); effects->postPaintScreen();
} }