From 7dfa96070540efed41b4d137e4e5a536b4238893 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Fri, 1 Feb 2019 09:46:13 -0500 Subject: [PATCH 1/2] Removing redundant property sets --- .../UI/Controls/PullRequestStatusCircle.xaml.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs b/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs index a46e2f1224..82be0403b1 100644 --- a/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs +++ b/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs @@ -28,7 +28,6 @@ public partial class PullRequestStatusCircle : UserControl private static void OnErrorCountChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs) { var pullRequestStatusCircle = ((PullRequestStatusCircle)dependencyObject); - pullRequestStatusCircle.ErrorCount = (int)eventArgs.NewValue; pullRequestStatusCircle.GeneratePolygons(); } @@ -39,7 +38,6 @@ private static void OnErrorCountChanged(DependencyObject dependencyObject, Depen private static void OnSuccessCountChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs) { var pullRequestStatusCircle = ((PullRequestStatusCircle)dependencyObject); - pullRequestStatusCircle.SuccessCount = (int)eventArgs.NewValue; pullRequestStatusCircle.GeneratePolygons(); } @@ -50,7 +48,6 @@ private static void OnSuccessCountChanged(DependencyObject dependencyObject, Dep private static void OnPendingCountChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs) { var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject); - pullRequestStatusCircle.PendingCount = (int) eventArgs.NewValue; pullRequestStatusCircle.GeneratePolygons(); } @@ -61,7 +58,6 @@ private static void OnPendingCountChanged(DependencyObject dependencyObject, Dep private static void OnRadiusChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs) { var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject); - pullRequestStatusCircle.Radius = (double) eventArgs.NewValue; pullRequestStatusCircle.GenerateMask(); pullRequestStatusCircle.GeneratePolygons(); } @@ -73,7 +69,6 @@ private static void OnRadiusChanged(DependencyObject dependencyObject, Dependenc private static void OnInnerRadiusChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs) { var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject); - pullRequestStatusCircle.InnerRadius = (double) eventArgs.NewValue; pullRequestStatusCircle.GenerateMask(); pullRequestStatusCircle.GeneratePolygons(); } @@ -86,7 +81,6 @@ private static void OnPendingColorChanged(DependencyObject dependencyObject, Dep { var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject); var brush = (Brush) eventArgs.NewValue; - pullRequestStatusCircle.PendingColor = brush; pullRequestStatusCircle.PendingPolygon.Fill = brush; } @@ -98,7 +92,6 @@ private static void OnErrorColorChanged(DependencyObject dependencyObject, Depen { var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject); var brush = (Brush) eventArgs.NewValue; - pullRequestStatusCircle.ErrorColor = brush; pullRequestStatusCircle.ErrorPolygon.Fill = brush; } @@ -110,7 +103,6 @@ private static void OnSuccessColorChanged(DependencyObject dependencyObject, Dep { var pullRequestStatusCircle = ((PullRequestStatusCircle) dependencyObject); var brush = (Brush) eventArgs.NewValue; - pullRequestStatusCircle.SuccessColor = brush; pullRequestStatusCircle.SuccessPolygon.Fill = brush; } From 640279c96e0bba153d85afa465b0d7fca48e38eb Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Fri, 1 Feb 2019 09:50:30 -0500 Subject: [PATCH 2/2] Consolidating change handlers --- .../Controls/PullRequestStatusCircle.xaml.cs | 44 +++++-------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs b/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs index 82be0403b1..da40115f2c 100644 --- a/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs +++ b/src/GitHub.VisualStudio.UI/UI/Controls/PullRequestStatusCircle.xaml.cs @@ -23,50 +23,31 @@ 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.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.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); + 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.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.GenerateMask(); @@ -80,8 +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.PendingPolygon.Fill = brush; + pullRequestStatusCircle.PendingPolygon.Fill = (Brush) eventArgs.NewValue; } public static readonly DependencyProperty ErrorColorProperty = DependencyProperty.Register( @@ -91,8 +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.ErrorPolygon.Fill = brush; + pullRequestStatusCircle.ErrorPolygon.Fill = (Brush) eventArgs.NewValue; } public static readonly DependencyProperty SuccessColorProperty = DependencyProperty.Register( @@ -102,8 +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.SuccessPolygon.Fill = brush; + pullRequestStatusCircle.SuccessPolygon.Fill = (Brush) eventArgs.NewValue; } public IEnumerable GeneratePoints(float percentage)