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

sync with the fade popup, looks less weird

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1017403
This commit is contained in:
Marco Martin 2009-08-30 15:15:52 +00:00
parent 906503c2f2
commit 5b61e0909c
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
effects/slidingpopups/slidingpopups.cpp
View file

@ -29,6 +29,9 @@ KWIN_EFFECT( slidingpopups, SlidingPopupsEffect )
SlidingPopupsEffect::SlidingPopupsEffect() SlidingPopupsEffect::SlidingPopupsEffect()
{ {
KConfigGroup conf = effects->effectConfig( "Fade" );
mFadeInTime = animationTime( conf, "FadeInTime", 150 );
mFadeOutTime = animationTime( conf, "FadeOutTime", 150 );
mAtom = XInternAtom( display(), "_KDE_SLIDE", False ); mAtom = XInternAtom( display(), "_KDE_SLIDE", False );
effects->registerPropertyType( mAtom, true ); effects->registerPropertyType( mAtom, true );
// TODO hackish way to announce support, make better after 4.0 // TODO hackish way to announce support, make better after 4.0
@ -135,7 +138,7 @@ void SlidingPopupsEffect::windowAdded( EffectWindow* w )
propertyNotify( w, mAtom ); propertyNotify( w, mAtom );
if( w->isOnCurrentDesktop() && mWindowsData.contains( w ) ) if( w->isOnCurrentDesktop() && mWindowsData.contains( w ) )
{ {
mAppearingWindows[ w ].setDuration( animationTime( 250 )); mAppearingWindows[ w ].setDuration( animationTime( mFadeInTime ));
mAppearingWindows[ w ].setProgress( 0.0 ); mAppearingWindows[ w ].setProgress( 0.0 );
mAppearingWindows[ w ].setCurveShape( TimeLine::EaseOutCurve ); mAppearingWindows[ w ].setCurveShape( TimeLine::EaseOutCurve );
@ -150,7 +153,7 @@ void SlidingPopupsEffect::windowClosed( EffectWindow* w )
{ {
w->refWindow(); w->refWindow();
mAppearingWindows.remove( w ); mAppearingWindows.remove( w );
mDisappearingWindows[ w ].setDuration( animationTime( 250 )); mDisappearingWindows[ w ].setDuration( animationTime( mFadeOutTime ));
mDisappearingWindows[ w ].setProgress( 0.0 ); mDisappearingWindows[ w ].setProgress( 0.0 );
mDisappearingWindows[ w ].setCurveShape( TimeLine::EaseOutCurve ); mDisappearingWindows[ w ].setCurveShape( TimeLine::EaseOutCurve );

2
effects/slidingpopups/slidingpopups.h
View file

@ -60,6 +60,8 @@ class SlidingPopupsEffect
QHash< const EffectWindow*, TimeLine > mAppearingWindows; QHash< const EffectWindow*, TimeLine > mAppearingWindows;
QHash< const EffectWindow*, TimeLine > mDisappearingWindows; QHash< const EffectWindow*, TimeLine > mDisappearingWindows;
QHash< const EffectWindow*, Data > mWindowsData; QHash< const EffectWindow*, Data > mWindowsData;
int mFadeInTime;
int mFadeOutTime;
}; };
} // namespace } // namespace