From 4fe7fb71e67264d8635c2fa5383138b2eab7ff12 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Mon, 28 Mar 2022 11:44:32 -0400
Subject: [PATCH] Simplify ColorChangedEventArgs

---
 .../ColorPicker/ColorChangedEventArgs.cs      | 26 +++----------------
 .../ColorSpectrum/ColorSpectrum.cs            |  6 +----
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs b/src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs
index 93ba1a4db1..b1d15d6b17 100644
--- a/src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs
+++ b/src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs
@@ -17,16 +17,6 @@ namespace Avalonia.Controls
     /// </remarks>
     public class ColorChangedEventArgs : EventArgs
     {
-        private Color _OldColor;
-        private Color _NewColor;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ColorChangedEventArgs"/> class.
-        /// </summary>
-        public ColorChangedEventArgs()
-        {
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ColorChangedEventArgs"/> class.
         /// </summary>
@@ -34,26 +24,18 @@ namespace Avalonia.Controls
         /// <param name="newColor">The new/updated color that triggered the change event.</param>
         public ColorChangedEventArgs(Color oldColor, Color newColor)
         {
-            _OldColor = oldColor;
-            _NewColor = newColor;
+            OldColor = oldColor;
+            NewColor = newColor;
         }
 
         /// <summary>
         /// Gets the old/original color from before the change event.
         /// </summary>
-        public Color OldColor
-        {
-            get => _OldColor;
-            internal set => _OldColor = value;
-        }
+        public Color OldColor { get; private set; }
 
         /// <summary>
         /// Gets the new/updated color that triggered the change event.
         /// </summary>
-        public Color NewColor
-        {
-            get => _NewColor;
-            internal set => _NewColor = value;
-        }
+        public Color NewColor { get; private set; }
     }
 }
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs b/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
index 62d3b4ce88..11e1437f81 100644
--- a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
+++ b/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
@@ -499,11 +499,7 @@ namespace Avalonia.Controls.Primitives
 
             if (colorChanged || areBothColorsBlack)
             {
-                var colorChangedEventArgs = new ColorChangedEventArgs();
-
-                colorChangedEventArgs.OldColor = _oldColor;
-                colorChangedEventArgs.NewColor = newColor;
-
+                var colorChangedEventArgs = new ColorChangedEventArgs(_oldColor, newColor);
                 ColorChanged?.Invoke(this, colorChangedEventArgs);
 
                 if (ColorHelpers.ToDisplayNameExists)