Post merge fixes to font reference as class

#420
This commit is contained in:
Wojtek Figat
2021-06-09 12:16:50 +02:00
parent 3c2b1a232c
commit f237d5d87d
4 changed files with 33 additions and 23 deletions

View File

@@ -18,6 +18,16 @@ namespace FlaxEngine
[NoSerialize]
private Font _cachedFont;
/// <summary>
/// Initializes a new instance of the <see cref="FontReference"/> struct.
/// </summary>
public FontReference()
{
_font = null;
_size = 30;
_cachedFont = null;
}
/// <summary>
/// Initializes a new instance of the <see cref="FontReference"/> struct.
/// </summary>
@@ -61,9 +71,7 @@ namespace FlaxEngine
if (_font != value)
{
_font = value;
if (_cachedFont)
_cachedFont = null;
_cachedFont = null;
}
}
}
@@ -80,9 +88,7 @@ namespace FlaxEngine
if (_size != value)
{
_size = value;
if (_cachedFont)
_cachedFont = null;
_cachedFont = null;
}
}
}
@@ -104,9 +110,7 @@ namespace FlaxEngine
/// Determines whether the specified <see cref="FontReference" /> is equal to this instance.
/// </summary>
/// <param name="other">The <see cref="FontReference" /> to compare with this instance.</param>
/// <returns>
/// <c>true</c> if the specified <see cref="FontReference" /> is equal to this instance; otherwise, <c>false</c>.
/// </returns>
/// <returns><c>true</c> if the specified <see cref="FontReference" /> is equal to this instance; otherwise, <c>false</c>.</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool Equals(FontReference other)
{