From 51c2fa08589d9068235b3c21181a6bd33d3f42c2 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Tue, 6 Dec 2022 14:20:37 +0100 Subject: [PATCH] fix: address review --- src/Avalonia.Base/Animation/Cue.cs | 14 -------------- src/Avalonia.Base/Media/BoxShadow.cs | 6 ++++++ src/Avalonia.Base/Media/BoxShadows.cs | 4 +++- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/Avalonia.Base/Animation/Cue.cs b/src/Avalonia.Base/Animation/Cue.cs index 934ae16762..c48f2ab6b0 100644 --- a/src/Avalonia.Base/Animation/Cue.cs +++ b/src/Avalonia.Base/Animation/Cue.cs @@ -49,15 +49,6 @@ namespace Avalonia.Animation } } - /// - /// Checks for equality between two s. - /// - /// The second cue. - public bool Equals(Cue other) - { - return CueValue == other.CueValue; - } - /// /// Checks for equality between a /// and a value. @@ -68,11 +59,6 @@ namespace Avalonia.Animation { return CueValue == other; } - - public override int GetHashCode() - { - return CueValue.GetHashCode(); - } } public class CueTypeConverter : TypeConverter diff --git a/src/Avalonia.Base/Media/BoxShadow.cs b/src/Avalonia.Base/Media/BoxShadow.cs index 2139516be6..fa94dd83eb 100644 --- a/src/Avalonia.Base/Media/BoxShadow.cs +++ b/src/Avalonia.Base/Media/BoxShadow.cs @@ -171,5 +171,11 @@ namespace Avalonia.Media public Rect TransformBounds(in Rect rect) => IsInset ? rect : rect.Translate(new Vector(OffsetX, OffsetY)).Inflate(Spread + Blur); + + public static bool operator ==(BoxShadow left, BoxShadow right) => + left.Equals(right); + + public static bool operator !=(BoxShadow left, BoxShadow right) => + !(left == right); } } diff --git a/src/Avalonia.Base/Media/BoxShadows.cs b/src/Avalonia.Base/Media/BoxShadows.cs index 9c20b9541d..4265e4efbc 100644 --- a/src/Avalonia.Base/Media/BoxShadows.cs +++ b/src/Avalonia.Base/Media/BoxShadows.cs @@ -62,7 +62,9 @@ namespace Avalonia.Media } [EditorBrowsable(EditorBrowsableState.Never)] - public record struct BoxShadowsEnumerator +#pragma warning disable CA1815 // Override equals and operator equals on value types + public struct BoxShadowsEnumerator +#pragma warning restore CA1815 // Override equals and operator equals on value types { private int _index; private BoxShadows _shadows;