diff options
| author | David Tardon <dtardon@redhat.com> | 2012-11-12 12:35:45 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-11-22 10:47:16 +0100 |
| commit | e02f655318c14e58b151c9be0109f3100c38f876 (patch) | |
| tree | 514acca9b229e456d6c38ca158ccd095d381d838 /slideshow | |
| parent | d6ce23bbf2ea9a326eb377e6fcef3f6034c9c31a (diff) | |
fix Fade Smoothly transition
Change-Id: I833bd800491bce81ccaef97d9320a4df10aaff79
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/transitions/slidetransitionfactory.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 60ea705629cf..057c96e3bf92 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -1092,13 +1092,14 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( { // black page: boost::optional<SlideSharedPtr> leavingSlide; + boost::optional<RGBColor> aFadeColor; switch( nTransitionSubType ) { case animations::TransitionSubType::CROSSFADE: // crossfade needs no further setup, - // just blend new slide over existing - // background. + // just blend new slide over current + // slide. break; // TODO(F1): Implement toColor/fromColor fades @@ -1112,6 +1113,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( // effect really needs it. leavingSlide.reset( pLeavingSlide ); } + aFadeColor = rTransitionFadeColor; break; default: @@ -1124,8 +1126,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition( new FadingSlideChange( leavingSlide, pEnteringSlide, - comphelper::make_optional( - rTransitionFadeColor), + aFadeColor, pSoundPlayer, rViewContainer, rScreenUpdater, |