From b91c6fce83c2d7a1dc3d1f1ff3c809d4838439a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 14 Nov 2007 15:58:57 +0000 Subject: [PATCH] Make the logout fade effect activate also while playing logout sound and killing applications. A bit hackish way of triggering it. svn path=/trunk/KDE/kdebase/workspace/; revision=736707 --- effects/logout.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/effects/logout.cpp b/effects/logout.cpp index e68f5ba47b..f1ec5c4eec 100644 --- a/effects/logout.cpp +++ b/effects/logout.cpp @@ -28,7 +28,7 @@ LogoutEffect::LogoutEffect() void LogoutEffect::prePaintScreen( ScreenPrePaintData& data, int time ) { if( logout_window != NULL ) - progress = qBound( 0., progress + time / 4000., 1. ); + progress = qBound( 0., progress + time / 2000., 1. ); else if( progress != 0 ) progress = qBound( 0., progress - time / 500., 1. ); effects->prePaintScreen( data, time ); @@ -82,8 +82,11 @@ void LogoutEffect::windowClosed( EffectWindow* w ) bool LogoutEffect::isLogoutDialog( EffectWindow* w ) { // TODO there should be probably a better way (window type?) - if( w->windowClass() == "ksmserver ksmserver" && w->windowRole() == "logoutdialog" ) + if( w->windowClass() == "ksmserver ksmserver" + && ( w->windowRole() == "logoutdialog" || w->windowRole() == "logouteffect" )) + { return true; + } return false; }