space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make RichTextLabel.Text allow all tags again

Browse Source 
Fixes #6360

I debated doing this with a special case in Robust.Xaml instead, but decided against it. This is mostly used for static contents anyways.
This commit is contained in:
PJB3005
2025-12-31 23:15:06 +01:00
parent de2dafe507
commit af7f4ec8e7
1 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Robust.Client/UserInterface/Controls/RichTextLabel.cs
View File

@@ -39,6 +39,20 @@ namespace Robust.Client.UserInterface.Controls
}
}
/// <summary>
/// Gets or sets the markup string displayed by this control.
/// </summary>
/// <remarks>
/// <para>
/// This method converts the given string with <see cref="FormattedMessage.FromMarkupPermissive(string)"/>.
/// The original markup string is not kept,
/// so setting and then getting the function may provide a different result.
/// </para>
/// <para>
/// Unlike <see cref="M:SetMessage(FormattedMessage,Color?)"/>,
/// no tag whitelist will be set on the rendered message. Do not pass untrusted user input to this!
/// </para>
/// </remarks>
public string? Text
{
get => _entry?.Message.ToMarkup();
@@ -47,7 +61,7 @@ namespace Robust.Client.UserInterface.Controls
if (value == null)
Clear();
else
SetMessage(FormattedMessage.FromMarkupPermissive(value));
SetMessage(FormattedMessage.FromMarkupPermissive(value), tagsAllowed: null);
}
}
@@ -67,11 +81,32 @@ namespace Robust.Client.UserInterface.Controls
VerticalAlignment = VAlignment.Center;
}
/// <summary>
/// Sets the formatted message displayed by this control.
/// </summary>
/// <param name="message">The message to display.</param>
/// <param name="defaultColor">If provided, the default color to use for this message rendering.</param>
/// <remarks>
/// This method sets the set of allowed tags to only include a small amount of safe formatting tags.
/// Use <see cref="M:SetMessage(FormattedMessage,Type[],Color?)"/> if this is not desired.
/// </remarks>
public void SetMessage(FormattedMessage message, Color? defaultColor = null)
{
SetMessage(message, RichTextEntry.DefaultTags, defaultColor);
}
/// <summary>
/// Sets the formatted message displayed by this control.
/// </summary>
/// <param name="message">The message to display.</param>
/// <param name="tagsAllowed">
/// The set of allowed markup tags that will be displayed.
/// If <c>null</c>, all tags are allowed.</param>
/// <param name="defaultColor">If provided, the default color to use for this message rendering.</param>
/// <remarks>
/// This method sets the set of allowed tags to only include a small amount of safe formatting tags.
/// Use <see cref="M:SetMessage(FormattedMessage,Type[],Color?)"/> if this is not desired.
/// </remarks>
public void SetMessage(FormattedMessage message, Type[]? tagsAllowed, Color? defaultColor = null)
{
_entry?.RemoveControls();