Merge pull request #386 from CarHel/master

Fixed #329

Author: ButchersBoy

MainDemo.Wpf/Buttons.xaml

@@ -84,7 +84,7 @@
                                          Opened="PopupBox_OnOpened"
                                          Closed="PopupBox_OnClosed">
                     <StackPanel>
-                        <Button ToolTip="One">1</Button>
+                        <Button ToolTip="One with custom opacity" Opacity="0.5">1 </Button>
                         <Button ToolTip="Two">2</Button>
                         <Button ToolTip="Three">3</Button>
                     </StackPanel>
@@ -146,7 +146,7 @@
                     </materialDesign:PopupBox.ToggleCheckedContent>
                     <StackPanel>
                         <Button ToolTip="One">1</Button>
-                        <Button ToolTip="Two">2</Button>
+                        <Button ToolTip="Two" IsEnabled="False">2</Button>
                         <Button ToolTip="Three">3</Button>
                     </StackPanel>
                 </materialDesign:PopupBox>

MaterialDesignThemes.Wpf/PopupBox.cs

@@ -579,10 +579,10 @@ private void AnimateChildrenIn(bool reverse)
                 uiElement.SetCurrentValue(RenderTransformOriginProperty, new Point(.5, .5));
                 uiElement.RenderTransform = transformGroup;
 
-                var opacityAnimation = new DoubleAnimationUsingKeyFrames();                
+                var opacityAnimation = new DoubleAnimationUsingKeyFrames();
                 opacityAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(0, absoluteZeroKeyTime, sineEase));
                 opacityAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(0, deferredStartKeyTime, sineEase));
-                opacityAnimation.KeyFrames.Add(new EasingDoubleKeyFrame(1, deferredEndKeyTime, sineEase));                
+                opacityAnimation.KeyFrames.Add(new EasingDoubleKeyFrame((double)uiElement.GetAnimationBaseValue(OpacityProperty), deferredEndKeyTime, sineEase));
                 Storyboard.SetTargetProperty(opacityAnimation, new PropertyPath("Opacity"));
                 Storyboard.SetTarget(opacityAnimation, uiElement);
 
@@ -609,6 +609,7 @@ private void AnimateChildrenIn(bool reverse)
                 Storyboard.SetTarget(translateCoordinateAnimation, uiElement);
 
                 var storyboard = new Storyboard();
+                
                 storyboard.Children.Add(opacityAnimation);
                 storyboard.Children.Add(scaleXAnimation);
                 storyboard.Children.Add(scaleYAnimation);
@@ -620,7 +621,6 @@ private void AnimateChildrenIn(bool reverse)
                     storyboard.Begin();
                     storyboard.Seek(TimeSpan.FromMilliseconds(deferredEnd));
                     storyboard.Resume();
-
                 }
                 else
                     storyboard.Begin();