Merge pull request #2209 from github/fixes/pull-request-status-circle

Consolidating PullRequestStatusCircle change handlers

Author: jcansdale

src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs

@@ -23,57 +23,33 @@ public partial class PullRequestStatusCircle : UserControl
     {
         public static readonly DependencyProperty ErrorCountProperty = DependencyProperty.Register(
             "ErrorCount", typeof(int), typeof(PullRequestStatusCircle),
-            new PropertyMetadata(0, OnErrorCountChanged));
-
-        private static void OnErrorCountChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
-        {
-            var pullRequestStatusCircle = ((PullRequestStatusCircle)dependencyObject);
-            pullRequestStatusCircle.ErrorCount = (int)eventArgs.NewValue;
-            pullRequestStatusCircle.GeneratePolygons();
-        }
+            new PropertyMetadata(0, GeneratePolygons));
 
         public static readonly DependencyProperty SuccessCountProperty = DependencyProperty.Register(
             "SuccessCount", typeof(int), typeof(PullRequestStatusCircle),
-            new PropertyMetadata(0, OnSuccessCountChanged));
-
-        private static void OnSuccessCountChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
-        {
-            var pullRequestStatusCircle = ((PullRequestStatusCircle)dependencyObject);
-            pullRequestStatusCircle.SuccessCount = (int)eventArgs.NewValue;
-            pullRequestStatusCircle.GeneratePolygons();
-        }
+            new PropertyMetadata(0, GeneratePolygons));
 
         public static readonly DependencyProperty PendingCountProperty = DependencyProperty.Register(
             "PendingCount", typeof(int), typeof(PullRequestStatusCircle),
-            new PropertyMetadata(0, OnPendingCountChanged));
+            new PropertyMetadata(0, GeneratePolygons));
 
-        private static void OnPendingCountChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+        private static void GeneratePolygons(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
         {
-            var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject);
-            pullRequestStatusCircle.PendingCount = (int) eventArgs.NewValue;
+            var pullRequestStatusCircle = ((PullRequestStatusCircle)dependencyObject);
             pullRequestStatusCircle.GeneratePolygons();
         }
 
         public static readonly DependencyProperty RadiusProperty = DependencyProperty.Register(
             "Radius", typeof(double), typeof(PullRequestStatusCircle),
-            new PropertyMetadata((double)250, OnRadiusChanged));
-
-        private static void OnRadiusChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
-        {
-            var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject);
-            pullRequestStatusCircle.Radius = (double) eventArgs.NewValue;
-            pullRequestStatusCircle.GenerateMask();
-            pullRequestStatusCircle.GeneratePolygons();
-        }
+            new PropertyMetadata((double)250, GenerateMaskAndPolygons));
 
         public static readonly DependencyProperty InnerRadiusProperty = DependencyProperty.Register(
             "InnerRadius", typeof(double), typeof(PullRequestStatusCircle),
-            new PropertyMetadata((double)200, OnInnerRadiusChanged));
+            new PropertyMetadata((double)200, GenerateMaskAndPolygons));
 
-        private static void OnInnerRadiusChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+        private static void GenerateMaskAndPolygons(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
         {
             var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject);
-            pullRequestStatusCircle.InnerRadius = (double) eventArgs.NewValue;
             pullRequestStatusCircle.GenerateMask();
             pullRequestStatusCircle.GeneratePolygons();
         }
@@ -85,9 +61,7 @@ private static void OnInnerRadiusChanged(DependencyObject dependencyObject, Depe
         private static void OnPendingColorChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
         {
             var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject);
-            var brush = (Brush) eventArgs.NewValue;
-            pullRequestStatusCircle.PendingColor = brush;
-            pullRequestStatusCircle.PendingPolygon.Fill = brush;
+            pullRequestStatusCircle.PendingPolygon.Fill = (Brush) eventArgs.NewValue;
         }
 
         public static readonly DependencyProperty ErrorColorProperty = DependencyProperty.Register(
@@ -97,9 +71,7 @@ private static void OnPendingColorChanged(DependencyObject dependencyObject, Dep
         private static void OnErrorColorChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
         {
             var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject);
-            var brush = (Brush) eventArgs.NewValue;
-            pullRequestStatusCircle.ErrorColor = brush;
-            pullRequestStatusCircle.ErrorPolygon.Fill = brush;
+            pullRequestStatusCircle.ErrorPolygon.Fill = (Brush) eventArgs.NewValue;
         }
 
         public static readonly DependencyProperty SuccessColorProperty = DependencyProperty.Register(
@@ -109,9 +81,7 @@ private static void OnErrorColorChanged(DependencyObject dependencyObject, Depen
         private static void OnSuccessColorChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
         {
             var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject);
-            var brush = (Brush) eventArgs.NewValue;
-            pullRequestStatusCircle.SuccessColor = brush;
-            pullRequestStatusCircle.SuccessPolygon.Fill = brush;
+            pullRequestStatusCircle.SuccessPolygon.Fill = (Brush) eventArgs.NewValue;
         }
 
         public IEnumerable<Point> GeneratePoints(float percentage)