Merge pull request #821 from llifon/master

ButchersBoy · web-flow · commit 56fee88c854c · 2017-11-27T09:11:23.000Z
Fixes #820 - Opacity of the old transition slide should now always be set to 0
diff --git a/MaterialDesignThemes.Wpf/Transitions/Transitioner.cs b/MaterialDesignThemes.Wpf/Transitions/Transitioner.cs
@@ -197,17 +197,23 @@ private void ActivateFrame(int selectedIndex, int unselectedIndex)
             }
 
             if (newSlide != null)
-                newSlide.Opacity = 1;                
+            {
+                newSlide.Opacity = 1;
+            }
+                          
             if (oldSlide != null && newSlide != null)
             {
                 var wipe = selectedIndex > unselectedIndex ? oldSlide.ForwardWipe : oldSlide.BackwardWipe;
-                if (wipe != null)                
-                    wipe.Wipe(oldSlide, newSlide, GetTransitionOrigin(newSlide), this);                
+                if (wipe != null)
+                {
+                    wipe.Wipe(oldSlide, newSlide, GetTransitionOrigin(newSlide), this);
+                }
                 else
                 {
                     DoStack(newSlide, oldSlide);
-                    oldSlide.Opacity = 0;
                 }
+
+                oldSlide.Opacity = 0;
             }
             else if (oldSlide != null || newSlide != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -197,17 +197,23 @@ private void ActivateFrame(int selectedIndex, int unselectedIndex)`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`if (newSlide != null)`
`200`		`- newSlide.Opacity = 1;`
	`200`	`+ {`
	`201`	`+ newSlide.Opacity = 1;`
	`202`	`+ }`
	`203`	`+`
`201`	`204`	`if (oldSlide != null && newSlide != null)`
`202`	`205`	`{`
`203`	`206`	`var wipe = selectedIndex > unselectedIndex ? oldSlide.ForwardWipe : oldSlide.BackwardWipe;`
`204`		`- if (wipe != null)`
`205`		`- wipe.Wipe(oldSlide, newSlide, GetTransitionOrigin(newSlide), this);`
	`207`	`+ if (wipe != null)`
	`208`	`+ {`
	`209`	`+ wipe.Wipe(oldSlide, newSlide, GetTransitionOrigin(newSlide), this);`
	`210`	`+ }`
`206`	`211`	`else`
`207`	`212`	`{`
`208`	`213`	`DoStack(newSlide, oldSlide);`
`209`		`- oldSlide.Opacity = 0;`
`210`	`214`	`}`
	`215`	`+`
	`216`	`+ oldSlide.Opacity = 0;`
`211`	`217`	`}`
`212`	`218`	`else if (oldSlide != null \|\| newSlide != null)`
`213`	`219`	`{`