Merge pull request #1664 from MahApps/punker76-MetroProgressBar-Anima…

…tionWarning Fix MetroProgressBar System.Windows.Media.Animation Warning 6
MahApps · Nov 22, 2014 · 30a5748 · 30a5748
2 parents 51caf46 + 5295061
commit 30a5748
Show file tree

Hide file tree

Showing 3 changed files with 123 additions and 119 deletions.
diff --git a/MahApps.Metro/Controls/MetroProgressBar.cs b/MahApps.Metro/Controls/MetroProgressBar.cs
@@ -20,7 +20,9 @@ public class MetroProgressBar : ProgressBar
         public static readonly DependencyProperty EllipseOffsetProperty =
             DependencyProperty.Register("EllipseOffset", typeof(double), typeof(MetroProgressBar),
                                         new PropertyMetadata(default(double)));
-
+
+        private Storyboard indeterminateStoryboard;
+
         static MetroProgressBar()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(MetroProgressBar), new FrameworkPropertyMetadata(typeof(MetroProgressBar)));
@@ -51,14 +53,11 @@ private static void OnIsIndeterminateChanged(DependencyObject dependencyObject,
                 var containingObject = bar.GetTemplateChild("ContainingGrid") as FrameworkElement;
                 if (indeterminateState != null && containingObject != null)
                 {
-                    if ((bool)e.NewValue)
-                    {
-                        indeterminateState.Storyboard.Begin(containingObject, true);
-                    }
-                    else
+                    if (indeterminateState.Storyboard != null)
                     {
                         indeterminateState.Storyboard.Stop(containingObject);
                     }
+                    bar.ResetStoryboard(bar.ActualWidth);
                 }
             }
         }
@@ -105,9 +104,9 @@ private void ResetStoryboard(double width)
                 {
                     VisualState indeterminate = GetIndeterminate();
 
-                    if (indeterminate != null)
+                    if (indeterminate != null && this.indeterminateStoryboard != null)
                     {
-                        Storyboard newStoryboard = indeterminate.Storyboard.Clone();
+                        Storyboard newStoryboard = this.indeterminateStoryboard.Clone();
                         Timeline doubleAnim = newStoryboard.Children.First(t => t.Name == "MainDoubleAnim");
                         doubleAnim.SetValue(DoubleAnimation.FromProperty, containerAnimStart);
                         doubleAnim.SetValue(DoubleAnimation.ToProperty, containerAnimEnd);
@@ -141,15 +140,17 @@ private void ResetStoryboard(double width)
                             doubleAnimParent.InvalidateProperty(Storyboard.TargetNameProperty);
                         }
 
-                        indeterminate.Storyboard.Remove();
                         indeterminate.Storyboard = newStoryboard;
 
                         if (!IsIndeterminate)
                         {
                             return;
                         }
 
-                        indeterminate.Storyboard.Begin((FrameworkElement)GetTemplateChild("ContainingGrid"), true);
+                        if (indeterminate.Storyboard != null)
+                        {
+                            indeterminate.Storyboard.Begin((FrameworkElement)GetTemplateChild("ContainingGrid"), true);
+                        }
                     }
                 }
                 catch (Exception)
@@ -242,6 +243,7 @@ private double CalcEllipseAnimEnd(double width)
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
+            indeterminateStoryboard = this.TryFindResource("IndeterminateStoryboard") as Storyboard;
             SizeChangedHandler(null, null);
         }