From 37be26fdf632443c3be0ae9759c162660455ac58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sun, 8 Aug 2010 08:32:09 +0000 Subject: [PATCH] Enable new EffectFrame cross fading in FlipSwitch svn path=/trunk/KDE/kdebase/workspace/; revision=1160534 --- effects/flipswitch/flipswitch.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/effects/flipswitch/flipswitch.cpp b/effects/flipswitch/flipswitch.cpp index 2aa0feda01..aba7c64278 100644 --- a/effects/flipswitch/flipswitch.cpp +++ b/effects/flipswitch/flipswitch.cpp @@ -52,6 +52,7 @@ FlipSwitchEffect::FlipSwitchEffect() m_captionFont.setBold( true ); m_captionFont.setPointSize( m_captionFont.pointSize() * 2 ); m_captionFrame->setFont( m_captionFont ); + m_captionFrame->enableCrossFade( true ); KActionCollection* actionCollection = new KActionCollection( this ); KAction* a = ( KAction* )actionCollection->addAction( "FlipSwitchCurrent" ); @@ -408,6 +409,10 @@ void FlipSwitchEffect::paintScreen( int mask, QRegion region, ScreenPaintData& d if( m_windowTitle ) { // Render the caption frame + if( m_animation ) + { + m_captionFrame->setCrossFadeProgress( m_timeLine.value() ); + } m_captionFrame->render( region, m_startStopTimeLine.value() ); } }