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

Merge branch 'DebugOutputImprovements' of https://github.com/davevanegdom/FlaxEngine into davevanegdom-DebugOutputImprovements

Browse Source 
# Conflicts:
#	Source/Editor/Options/InterfaceOptions.cs
#	Source/Editor/Windows/DebugLogWindow.cs
This commit is contained in:
Wojtek Figat
2025-02-23 20:29:10 +01:00
parent bb12562c2f 9fbfc83535
commit 1c3f7fcec0
3 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Editor/Options/InterfaceOptions.cs
View File

@@ -379,6 +379,22 @@ namespace FlaxEditor.Options
}
}
/// <summary>
/// Gets or sets the output log text color for warnings
/// </summary>
[DefaultValue(typeof(Color), "1,1,0,1")]
[EditorDisplay("Output Log", "Warning Color"), EditorOrder(446), Tooltip("The output log text color for warnings.")]
public Color OutputLogWarningTextColor { get; set; } = Color.Yellow;
/// <summary>
/// Gets or sets the output log text color for errors
/// </summary>
[DefaultValue(typeof(Color), "1,0,0,1")]
[EditorDisplay("Output Log", "Error Color"), EditorOrder(445), Tooltip("The output log text color for errors.")]
public Color OutputLogErrorTextColor { get; set; } = Color.Red;
/// <summary>
/// Gets or sets a value indicating whether auto-focus output log window on code compilation error.
/// </summary>

31
Source/Editor/Windows/DebugLogWindow.cs
View File

@@ -131,20 +131,21 @@ namespace FlaxEditor.Windows
else if (index % 2 == 0)
Render2D.FillRectangle(clientRect, style.Background * 0.9f);
var color = Group == LogGroup.Error ? _window.ErrorColor : (Group == LogGroup.Warning ? _window.WarningColor : _window.InfoColor);
// Icon
var iconColor = Group == LogGroup.Error ? Color.Red : (Group == LogGroup.Warning ? Color.Yellow : style.Foreground);
Render2D.DrawSprite(Icon, new Rectangle(5, 0, 32, 32), iconColor);
Render2D.DrawSprite(Icon, new Rectangle(5, 0, 32, 32), color);
// Title
var textRect = new Rectangle(38, 2, clientRect.Width - 40, clientRect.Height - 10);
Render2D.PushClip(ref clientRect);
if (LogCount == 1)
{
Render2D.DrawText(style.FontMedium, Desc.Title, textRect, style.Foreground);
Render2D.DrawText(style.FontMedium, Desc.Title, textRect, color);
}
else if (LogCount > 1)
{
Render2D.DrawText(style.FontMedium, $"{Desc.Title} ({LogCount})", textRect, style.Foreground);
Render2D.DrawText(style.FontMedium, $"{Desc.Title} ({LogCount})", textRect, color);
}
Render2D.PopClip();
}
@@ -306,8 +307,12 @@ namespace FlaxEditor.Windows
private LogType _iconType = LogType.Info;
internal SpriteHandle IconInfo;
internal Color InfoColor;
internal SpriteHandle IconWarning;
internal Color WarningColor;
internal SpriteHandle IconError;
internal Color ErrorColor;
/// <summary>
/// Initializes a new instance of the <see cref="DebugLogWindow"/> class.
@@ -398,14 +403,28 @@ namespace FlaxEditor.Windows
IconWarning = Editor.Icons.Warning64;
IconError = Editor.Icons.Error64;
//Cache entries color
var interfaceOptions = Editor.Options.Options.Interface;
InfoColor = interfaceOptions.OutputLogTextColor;
WarningColor = interfaceOptions.OutputLogWarningTextColor;
ErrorColor = interfaceOptions.OutputLogErrorTextColor;
// Bind events
Editor.Options.OptionsChanged += OnEditorOptionsChanged;
OnEditorOptionsChanged(Editor.Options.Options);
Debug.Logger.LogHandler.SendLog += LogHandlerOnSendLog;
Debug.Logger.LogHandler.SendExceptionLog += LogHandlerOnSendExceptionLog;
}
private void OnEditorOptionsChanged(EditorOptions options)
{
if (_timestampsFormats == options.Interface.DebugLogTimestampsFormat &&
InfoColor == options.Interface.OutputLogTextColor &&
WarningColor == options.Interface.OutputLogWarningTextColor &&
ErrorColor == options.Interface.OutputLogErrorTextColor)
return;
_timestampsFormats = options.Interface.DebugLogTimestampsFormat;
_clearOnPlayButton.Checked = options.Interface.DebugLogClearOnPlay;
_collapseLogsButton.Checked = options.Interface.DebugLogCollapse;
@@ -413,6 +432,10 @@ namespace FlaxEditor.Windows
_groupButtons[0].Checked = options.Interface.DebugLogShowErrorMessages;
_groupButtons[1].Checked = options.Interface.DebugLogShowWarningMessages;
_groupButtons[2].Checked = options.Interface.DebugLogShowInfoMessages;
InfoColor = options.Interface.OutputLogTextColor;
WarningColor = options.Interface.OutputLogWarningTextColor;
ErrorColor = options.Interface.OutputLogErrorTextColor;
}
/// <summary>

9
Source/Editor/Windows/OutputLogWindow.cs
View File

@@ -286,7 +286,9 @@ namespace FlaxEditor.Windows
_output.DefaultStyle.Font == options.Interface.OutputLogTextFont &&
_output.DefaultStyle.Color == options.Interface.OutputLogTextColor &&
_output.DefaultStyle.ShadowColor == options.Interface.OutputLogTextShadowColor &&
_output.DefaultStyle.ShadowOffset == options.Interface.OutputLogTextShadowOffset)
_output.DefaultStyle.ShadowOffset == options.Interface.OutputLogTextShadowOffset &&
_output.WarningStyle.Color == options.Interface.OutputLogWarningTextColor &&
_output.ErrorStyle.Color == options.Interface.OutputLogErrorTextColor)
return;
_output.DefaultStyle = new TextBlockStyle
@@ -297,10 +299,11 @@ namespace FlaxEditor.Windows
ShadowOffset = options.Interface.OutputLogTextShadowOffset,
BackgroundSelectedBrush = new SolidColorBrush(Style.Current.BackgroundSelected),
};
_output.WarningStyle = _output.DefaultStyle;
_output.WarningStyle.Color = Color.Yellow;
_output.WarningStyle.Color = options.Interface.OutputLogWarningTextColor;
_output.ErrorStyle = _output.DefaultStyle;
_output.ErrorStyle.Color = Color.Red;
_output.ErrorStyle.Color = options.Interface.OutputLogErrorTextColor;
_timestampsFormats = options.Interface.OutputLogTimestampsFormat;
_showLogType = options.Interface.OutputLogShowLogType;