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

modified activeChange animation so that it seems to start earlier (e.g. with first step being a non-zero fraction of the final glow) 

svn path=/trunk/KDE/kdebase/workspace/; revision=1034229
icc-effect-5.14.5
Hugo Pereira Da Costa 2009-10-12 07:26:07 +00:00
parent 3c3d093d2b
commit c5641a3827
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
clients/oxygen/oxygenclient.cpp
View File

@ -96,8 +96,8 @@ namespace Oxygen
widget()->setAutoFillBackground( false );
// initialize timeLine
timeLine_.setFrameRange( 0, maxAnimationIndex );
timeLine_.setCurveShape( QTimeLine::EaseInOutCurve );
timeLine_.setFrameRange( maxAnimationIndex/5, maxAnimationIndex );
timeLine_.setCurveShape( QTimeLine::EaseOutCurve );
connect( &timeLine_, SIGNAL( frameChanged( int ) ), widget(), SLOT( update() ) );
connect( &timeLine_, SIGNAL( finished() ), widget(), SLOT( update() ) );
@ -689,14 +689,7 @@ namespace Oxygen
void OxygenClient::activeChange( void )
{
// update size grip so that it gets the right color
// also make sure it is remaped to from z stack,
// unless hidden
if( hasSizeGrip() && !(isShade() || isMaximized() ))
{
sizeGrip().activeChange();
sizeGrip().update();
}
KCommonDecorationUnstable::activeChange();
// reset animation
if( animateActiveChange() )
@ -706,7 +699,14 @@ namespace Oxygen
{ timeLine_.start(); }
}
KCommonDecorationUnstable::activeChange();
// update size grip so that it gets the right color
// also make sure it is remaped to from z stack,
// unless hidden
if( hasSizeGrip() && !(isShade() || isMaximized() ))
{
sizeGrip().activeChange();
sizeGrip().update();
}
}
@ -840,8 +840,14 @@ namespace Oxygen
{
TileSet *tileSet( 0 );
if( configuration().useOxygenShadows() && timeLineIsRunning() ) tileSet = oxygenShadowCache()->tileSet( this, timeLine_.currentFrame() );
else tileSet = oxygenShadowCache()->tileSet( this );
if( configuration().useOxygenShadows() && timeLineIsRunning() )
{
int frame = timeLine_.currentFrame();
if( timeLine_.direction() == QTimeLine::Backward ) frame -= timeLine_.startFrame();
tileSet = oxygenShadowCache()->tileSet( this, frame );
} else tileSet = oxygenShadowCache()->tileSet( this );
if( !isMaximized() ) tileSet->render( frame.adjusted( 4, 4, -4, -4), &painter, TileSet::Ring);
else if( isShade() ) tileSet->render( frame.adjusted( 0, 4, 0, -4), &painter, TileSet::Bottom);

6
clients/oxygen/oxygenclient.h
View File

@ -114,7 +114,11 @@ namespace Oxygen
//! return animation opacity
qreal opacity( void ) const
{ return qreal( timeLine_.currentFrame() )/qreal( timeLine_.endFrame() ); }
{
int frame( timeLine_.currentFrame() );
if( timeLine_.direction() == QTimeLine::Backward ) frame -= timeLine_.startFrame();
return qreal( frame )/qreal( timeLine_.endFrame() );
}
//! palette background
QPalette backgroundPalette( const QWidget*, QPalette ) const;