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

Sliding Popups effect can read the fade in and out duration from the property.

Browse source 
Added for the usecase of Yakuake.

svn path=/trunk/KDE/kdebase/workspace/; revision=1160205
This commit is contained in:
Martin Gräßlin 2010-08-07 11:41:01 +00:00
parent b216a23908
commit b5377e5834
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
effects/slidingpopups/slidingpopups.cpp
View file

@ -145,7 +145,7 @@ void SlidingPopupsEffect::windowAdded( EffectWindow* w )
propertyNotify( w, mAtom );
if( w->isOnCurrentDesktop() && mWindowsData.contains( w ) )
{
mAppearingWindows[ w ].setDuration( animationTime( mFadeInTime ) );
mAppearingWindows[ w ].setDuration( mWindowsData[ w ].fadeInDuration );
mAppearingWindows[ w ].setProgress( 0.0 );
mAppearingWindows[ w ].setCurveShape( TimeLine::EaseOutCurve );
@ -163,7 +163,7 @@ void SlidingPopupsEffect::windowClosed( EffectWindow* w )
{
w->refWindow();
mAppearingWindows.remove( w );
mDisappearingWindows[ w ].setDuration( animationTime( mFadeOutTime ));
mDisappearingWindows[ w ].setDuration( mWindowsData[ w ].fadeOutDuration );
mDisappearingWindows[ w ].setProgress( 0.0 );
mDisappearingWindows[ w ].setCurveShape( TimeLine::EaseOutCurve );
@ -196,6 +196,19 @@ void SlidingPopupsEffect::propertyNotify( EffectWindow* w, long a )
Data animData;
animData.start = d[ 0 ];
animData.from = (Position)d[ 1 ];
if( data.length() >= (int)(sizeof( long ) * 3) )
{
animData.fadeInDuration = d[2];
if( data.length() >= (int)(sizeof( long ) * 4) )
animData.fadeOutDuration = d[3];
else
animData.fadeOutDuration = d[2];
}
else
{
animData.fadeInDuration = animationTime( mFadeInTime );
animData.fadeOutDuration = animationTime( mFadeOutTime );
}
mWindowsData[ w ] = animData;
}
} // namespace

2
effects/slidingpopups/slidingpopups.h
View file

@ -55,6 +55,8 @@ class SlidingPopupsEffect
int start; //point in screen coordinates where the window starts
//to animate, from decides if this point is an x or an y
Position from;
int fadeInDuration;
int fadeOutDuration;
};
long mAtom;
QHash< const EffectWindow*, TimeLine > mAppearingWindows;