ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up equality implementation for `Cell`

This commit is contained in:
James Groom 2024-03-20 22:19:57 +00:00 committed by GitHub
parent 01ed94d167
commit 0857dd6771
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/Cell.cs
View File

@ -9,7 +9,7 @@ namespace BizHawk.Client.EmuHawk
/// <summary>
/// Represents a single cell of the <see cref="InputRoll"/>
/// </summary>
public sealed class Cell : IComparable<Cell>
public sealed class Cell : IComparable<Cell>, IEquatable<Cell>
{
public RollColumn Column { get; internal set; }
public int? RowIndex { get; internal set; }
@ -25,15 +25,11 @@ namespace BizHawk.Client.EmuHawk
public int CompareTo(Cell other)
=> SortCell.Compare(this, other);
public override bool Equals(object obj)
{
if (obj is Cell cell)
{
return Column == cell.Column && RowIndex == cell.RowIndex;
}
public bool Equals(Cell other)
=> other is not null && Column?.Name == other.Column?.Name && RowIndex == other.RowIndex;
return false;
}
public override bool Equals(object obj)
=> obj is Cell other && Equals(other);
public override int GetHashCode()
{
@ -44,14 +40,10 @@ namespace BizHawk.Client.EmuHawk
=> $"Cell(r: {RowIndex?.ToString() ?? "null"}, c: \"{Column?.Name ?? "(no column)"}\")";
public static bool operator ==(Cell a, Cell b)
{
return a?.Equals(b) ?? b is null;
}
=> a is null ? b is null : a.Equals(b);
public static bool operator !=(Cell a, Cell b)
{
return !(a == b);
}
=> a is null ? b is not null : !a.Equals(b);
}
internal static class SortCell