GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Post merge fixes to font reference as class

Browse Source 
#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
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Engine/Render2D/FontReference.cs
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)
{

8
Source/Engine/UI/GUI/Common/Label.cs
View File

@@ -185,8 +185,8 @@ namespace FlaxEngine.GUI
AutoFocus = false;
var style = Style.Current;
Font = new FontReference(style.FontMedium);
TextColor = Style.Current.Foreground;
TextColorHighlighted = Style.Current.Foreground;
TextColor = style.Foreground;
TextColorHighlighted = style.Foreground;
}
/// <inheritdoc />
@@ -196,8 +196,8 @@ namespace FlaxEngine.GUI
AutoFocus = false;
var style = Style.Current;
Font = new FontReference(style.FontMedium);
TextColor = Style.Current.Foreground;
TextColorHighlighted = Style.Current.Foreground;
TextColor = style.Foreground;
TextColorHighlighted = style.Foreground;
}
/// <inheritdoc />

18
Source/Engine/UI/GUI/Common/RichTextBox.cs
View File

@@ -9,12 +9,7 @@ namespace FlaxEngine.GUI
/// </summary>
public class RichTextBox : RichTextBoxBase
{
private TextBlockStyle _textStyle = new TextBlockStyle
{
Font = new FontReference(Style.Current.FontMedium),
Color = Style.Current.Foreground,
BackgroundSelectedBrush = new SolidColorBrush(Style.Current.BackgroundSelected),
};
private TextBlockStyle _textStyle;
/// <summary>
/// The text style applied to the whole text.
@@ -30,6 +25,17 @@ namespace FlaxEngine.GUI
}
}
public RichTextBox()
{
var style = Style.Current;
_textStyle = new TextBlockStyle
{
Font = new FontReference(style.FontMedium),
Color = style.Foreground,
BackgroundSelectedBrush = new SolidColorBrush(style.BackgroundSelected),
};
}
/// <inheritdoc />
protected override void OnParseTextBlocks()
{

8
Source/Engine/UI/GUI/Style.cs
View File

@@ -22,7 +22,7 @@ namespace FlaxEngine.GUI
[EditorOrder(10)]
public Font FontTitle
{
get => _fontTitle.GetFont();
get => _fontTitle?.GetFont();
set => _fontTitle = new FontReference(value);
}
@@ -36,7 +36,7 @@ namespace FlaxEngine.GUI
[EditorOrder(20)]
public Font FontLarge
{
get => _fontLarge.GetFont();
get => _fontLarge?.GetFont();
set => _fontLarge = new FontReference(value);
}
@@ -50,7 +50,7 @@ namespace FlaxEngine.GUI
[EditorOrder(30)]
public Font FontMedium
{
get => _fontMedium.GetFont();
get => _fontMedium?.GetFont();
set => _fontMedium = new FontReference(value);
}
@@ -64,7 +64,7 @@ namespace FlaxEngine.GUI
[EditorOrder(40)]
public Font FontSmall
{
get => _fontSmall.GetFont();
get => _fontSmall?.GetFont();
set => _fontSmall = new FontReference(value);
}