Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions src/Graphics/src/Graphics/Color.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ namespace Microsoft.Maui.Graphics
/// </summary>
[DebuggerDisplay("Red={Red}, Green={Green}, Blue={Blue}, Alpha={Alpha}")]
[TypeConverter(typeof(Converters.ColorTypeConverter))]
public class Color
[ImmutableObject(true)]
public record class Color
{
/// <summary>
/// The red component of the color, ranging from 0.0 to 1.0.
Expand Down Expand Up @@ -112,24 +113,20 @@ public override string ToString()
return $"[Color: Red={r}, Green={g}, Blue={b}, Alpha={a}]";
}

public override int GetHashCode()
{
unchecked
{
int hashcode = Red.GetHashCode();
hashcode = (hashcode * 397) ^ Green.GetHashCode();
hashcode = (hashcode * 397) ^ Blue.GetHashCode();
hashcode = (hashcode * 397) ^ Alpha.GetHashCode();
return hashcode;
}
}
public override int GetHashCode() => ToInt();

public override bool Equals(object obj)
/// <summary>
/// Determines whether the specified <see cref="Color"/> is equal to the current color using byte-precision comparison.
/// </summary>
public virtual bool Equals(Color? other)
{
if (obj is Color other)
return ToInt() == other.ToInt();
if (other is null)
return false;

if (EqualityContract != other.EqualityContract)
return false;

return base.Equals(obj);
return ToInt() == other.ToInt();
}

[Obsolete("Use ToArgbHex instead.")]
Expand Down
8 changes: 4 additions & 4 deletions src/Graphics/src/Graphics/Font.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public static class FontWeights
/// <summary>
/// Represents a font with a name, weight, and style.
/// </summary>
public struct Font : IFont, IEquatable<IFont>
public readonly struct Font : IFont, IEquatable<IFont>
{
/// <summary>
/// Gets the default font.
Expand Down Expand Up @@ -131,17 +131,17 @@ public Font(string name, int weight = FontWeights.Normal, FontStyleType styleTyp
/// <summary>
/// Gets the font name or family.
/// </summary>
public string Name { get; private set; }
public string Name { get; }

/// <summary>
/// Gets the font weight.
/// </summary>
public int Weight { get; private set; }
public int Weight { get; }

/// <summary>
/// Gets the font style type.
/// </summary>
public FontStyleType StyleType { get; private set; }
public FontStyleType StyleType { get; }

/// <summary>
/// Determines whether the specified font is equal to the current font.
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
#nullable enable
Microsoft.Maui.Graphics.Color.Color(Microsoft.Maui.Graphics.Color! original) -> void
override Microsoft.Maui.Graphics.Color.Equals(object? obj) -> bool
static Microsoft.Maui.Graphics.Color.operator !=(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
static Microsoft.Maui.Graphics.Color.operator ==(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
virtual Microsoft.Maui.Graphics.Color.<Clone>$() -> Microsoft.Maui.Graphics.Color!
virtual Microsoft.Maui.Graphics.Color.EqualityContract.get -> System.Type!
virtual Microsoft.Maui.Graphics.Color.PrintMembers(System.Text.StringBuilder! builder) -> bool
~virtual Microsoft.Maui.Graphics.Color.Equals(Microsoft.Maui.Graphics.Color? other) -> bool
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
#nullable enable
Microsoft.Maui.Graphics.Color.Color(Microsoft.Maui.Graphics.Color! original) -> void
override Microsoft.Maui.Graphics.Color.Equals(object? obj) -> bool
static Microsoft.Maui.Graphics.Color.operator !=(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
static Microsoft.Maui.Graphics.Color.operator ==(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
virtual Microsoft.Maui.Graphics.Color.<Clone>$() -> Microsoft.Maui.Graphics.Color!
virtual Microsoft.Maui.Graphics.Color.EqualityContract.get -> System.Type!
virtual Microsoft.Maui.Graphics.Color.PrintMembers(System.Text.StringBuilder! builder) -> bool
~virtual Microsoft.Maui.Graphics.Color.Equals(Microsoft.Maui.Graphics.Color? other) -> bool
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
#nullable enable
Microsoft.Maui.Graphics.Color.Color(Microsoft.Maui.Graphics.Color! original) -> void
override Microsoft.Maui.Graphics.Color.Equals(object? obj) -> bool
static Microsoft.Maui.Graphics.Color.operator !=(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
static Microsoft.Maui.Graphics.Color.operator ==(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
virtual Microsoft.Maui.Graphics.Color.<Clone>$() -> Microsoft.Maui.Graphics.Color!
virtual Microsoft.Maui.Graphics.Color.EqualityContract.get -> System.Type!
virtual Microsoft.Maui.Graphics.Color.PrintMembers(System.Text.StringBuilder! builder) -> bool
~virtual Microsoft.Maui.Graphics.Color.Equals(Microsoft.Maui.Graphics.Color? other) -> bool
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
#nullable enable
Microsoft.Maui.Graphics.Color.Color(Microsoft.Maui.Graphics.Color! original) -> void
override Microsoft.Maui.Graphics.Color.Equals(object? obj) -> bool
static Microsoft.Maui.Graphics.Color.operator !=(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
static Microsoft.Maui.Graphics.Color.operator ==(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
virtual Microsoft.Maui.Graphics.Color.<Clone>$() -> Microsoft.Maui.Graphics.Color!
virtual Microsoft.Maui.Graphics.Color.EqualityContract.get -> System.Type!
virtual Microsoft.Maui.Graphics.Color.PrintMembers(System.Text.StringBuilder! builder) -> bool
~virtual Microsoft.Maui.Graphics.Color.Equals(Microsoft.Maui.Graphics.Color? other) -> bool
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
#nullable enable
Microsoft.Maui.Graphics.Color.Color(Microsoft.Maui.Graphics.Color! original) -> void
override Microsoft.Maui.Graphics.Color.Equals(object? obj) -> bool
static Microsoft.Maui.Graphics.Color.operator !=(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
static Microsoft.Maui.Graphics.Color.operator ==(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
virtual Microsoft.Maui.Graphics.Color.<Clone>$() -> Microsoft.Maui.Graphics.Color!
virtual Microsoft.Maui.Graphics.Color.EqualityContract.get -> System.Type!
virtual Microsoft.Maui.Graphics.Color.PrintMembers(System.Text.StringBuilder! builder) -> bool
~virtual Microsoft.Maui.Graphics.Color.Equals(Microsoft.Maui.Graphics.Color? other) -> bool
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
#nullable enable
Microsoft.Maui.Graphics.Color.Color(Microsoft.Maui.Graphics.Color! original) -> void
override Microsoft.Maui.Graphics.Color.Equals(object? obj) -> bool
static Microsoft.Maui.Graphics.Color.operator !=(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
static Microsoft.Maui.Graphics.Color.operator ==(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
virtual Microsoft.Maui.Graphics.Color.<Clone>$() -> Microsoft.Maui.Graphics.Color!
virtual Microsoft.Maui.Graphics.Color.EqualityContract.get -> System.Type!
virtual Microsoft.Maui.Graphics.Color.PrintMembers(System.Text.StringBuilder! builder) -> bool
~virtual Microsoft.Maui.Graphics.Color.Equals(Microsoft.Maui.Graphics.Color? other) -> bool
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
#nullable enable
Microsoft.Maui.Graphics.Color.Color(Microsoft.Maui.Graphics.Color! original) -> void
override Microsoft.Maui.Graphics.Color.Equals(object? obj) -> bool
static Microsoft.Maui.Graphics.Color.operator !=(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
static Microsoft.Maui.Graphics.Color.operator ==(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
virtual Microsoft.Maui.Graphics.Color.<Clone>$() -> Microsoft.Maui.Graphics.Color!
virtual Microsoft.Maui.Graphics.Color.EqualityContract.get -> System.Type!
virtual Microsoft.Maui.Graphics.Color.PrintMembers(System.Text.StringBuilder! builder) -> bool
~virtual Microsoft.Maui.Graphics.Color.Equals(Microsoft.Maui.Graphics.Color? other) -> bool
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
#nullable enable
Microsoft.Maui.Graphics.Color.Color(Microsoft.Maui.Graphics.Color! original) -> void
override Microsoft.Maui.Graphics.Color.Equals(object? obj) -> bool
static Microsoft.Maui.Graphics.Color.operator !=(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
static Microsoft.Maui.Graphics.Color.operator ==(Microsoft.Maui.Graphics.Color? left, Microsoft.Maui.Graphics.Color? right) -> bool
virtual Microsoft.Maui.Graphics.Color.<Clone>$() -> Microsoft.Maui.Graphics.Color!
virtual Microsoft.Maui.Graphics.Color.EqualityContract.get -> System.Type!
virtual Microsoft.Maui.Graphics.Color.PrintMembers(System.Text.StringBuilder! builder) -> bool
~virtual Microsoft.Maui.Graphics.Color.Equals(Microsoft.Maui.Graphics.Color? other) -> bool
Loading