yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable new EffectFrame cross fading in FlipSwitch

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1160534
This commit is contained in:
Martin Gräßlin 2010-08-08 08:32:09 +00:00
parent b974f403f7
commit 37be26fdf6
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
effects/flipswitch/flipswitch.cpp
View file

@ -52,6 +52,7 @@ FlipSwitchEffect::FlipSwitchEffect()
m_captionFont.setBold( true ); m_captionFont.setBold( true );
m_captionFont.setPointSize( m_captionFont.pointSize() * 2 ); m_captionFont.setPointSize( m_captionFont.pointSize() * 2 );
m_captionFrame->setFont( m_captionFont ); m_captionFrame->setFont( m_captionFont );
m_captionFrame->enableCrossFade( true );
KActionCollection* actionCollection = new KActionCollection( this ); KActionCollection* actionCollection = new KActionCollection( this );
KAction* a = ( KAction* )actionCollection->addAction( "FlipSwitchCurrent" ); KAction* a = ( KAction* )actionCollection->addAction( "FlipSwitchCurrent" );
@ -408,6 +409,10 @@ void FlipSwitchEffect::paintScreen( int mask, QRegion region, ScreenPaintData& d
if( m_windowTitle ) if( m_windowTitle )
{ {
// Render the caption frame // Render the caption frame
if( m_animation )
{
m_captionFrame->setCrossFadeProgress( m_timeLine.value() );
}
m_captionFrame->render( region, m_startStopTimeLine.value() ); m_captionFrame->render( region, m_startStopTimeLine.value() );
} }
} }