Skip to content

C
core
Kaydet (Commit) e02f6553 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

fix Fade Smoothly transition 

Change-Id: I833bd800491bce81ccaef97d9320a4df10aaff79
üst d6ce23bb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
slideshow/source/engine/transitions/slidetransitionfactory.cxx
Dosyayı görüntüle @ e02f6553
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment