summaryrefslogtreecommitdiff
path: root/slideshow/source/engine
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-10-22 16:00:56 +0300
committerTor Lillqvist <tml@collabora.com>2015-10-22 16:01:25 +0300
commit42e2b437152ad862b887657b330f65e50e8848da (patch)
treec81b6fc0b969f819d5ba78c82caac9631eb6e403 /slideshow/source/engine
parenta83a7a0d5f733992dbcfe2e9e404e54f4c55f150 (diff)
Use same order in this switch, too, as above
Change-Id: Icbe775e59d66efbb994a73c00024f9f7750f9ef0
Diffstat (limited to 'slideshow/source/engine')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index d31199746ec3..28e68d5fae9d 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -1478,33 +1478,18 @@ public:
if( transitionType == animations::TransitionType::MISCSHAPEWIPE ) {
switch( transitionSubType )
{
- case animations::TransitionSubType::ACROSS:
- pTransition = makeNByMTileFlip(8,6);
- break;
- case animations::TransitionSubType::CORNERSOUT:
- pTransition = makeOutsideCubeFaceToLeft();
- break;
- case animations::TransitionSubType::CIRCLE:
- pTransition = makeRevolvingCircles(8,128);
- break;
- case animations::TransitionSubType::FANOUTHORIZONTAL:
- pTransition = makeHelix(20);
- break;
- case animations::TransitionSubType::CORNERSIN:
- pTransition = makeInsideCubeFaceToLeft();
- break;
case animations::TransitionSubType::LEFTTORIGHT:
pTransition = makeFallLeaving();
break;
case animations::TransitionSubType::TOPTOBOTTOM:
pTransition = makeTurnAround();
break;
- case animations::TransitionSubType::TOPRIGHT:
- pTransition = makeTurnDown();
- break;
case animations::TransitionSubType::TOPLEFT:
pTransition = makeIris();
break;
+ case animations::TransitionSubType::TOPRIGHT:
+ pTransition = makeTurnDown();
+ break;
case animations::TransitionSubType::BOTTOMRIGHT:
pTransition = makeRochade();
break;
@@ -1520,6 +1505,21 @@ public:
case animations::TransitionSubType::BOTTOMCENTER:
pTransition = makeDissolve();
break;
+ case animations::TransitionSubType::CORNERSIN:
+ pTransition = makeInsideCubeFaceToLeft();
+ break;
+ case animations::TransitionSubType::CORNERSOUT:
+ pTransition = makeOutsideCubeFaceToLeft();
+ break;
+ case animations::TransitionSubType::CIRCLE:
+ pTransition = makeRevolvingCircles(8,128);
+ break;
+ case animations::TransitionSubType::FANOUTHORIZONTAL:
+ pTransition = makeHelix(20);
+ break;
+ case animations::TransitionSubType::ACROSS:
+ pTransition = makeNByMTileFlip(8,6);
+ break;
}
} else if( transitionType == animations::TransitionType::FADE && transitionSubType == animations::TransitionSubType::CROSSFADE ) {
pTransition = makeFadeSmoothly();