Browse Source

Simplify ColorChangedEventArgs

pull/7842/head
robloo 4 years ago
parent
commit
4fe7fb71e6
  1. 26
      src/Avalonia.Controls/ColorPicker/ColorChangedEventArgs.cs
  2. 6
      src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs

26
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; }
}
}

6
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)

Loading…
Cancel
Save