tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ActionAlertTooltip.cs to use TryFromMarkup (#29975)

Browse Source
This commit is contained in:
Winkarst
2024-07-13 07:05:51 +03:00
committed by GitHub
parent 3acc100ae5
commit e11f1e6cf6
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Client/Actions/UI/ActionAlertTooltip.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.Stylesheets; using Content.Client.Stylesheets;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Robust.Shared.Utility; using Robust.Shared.Utility;
@@ -77,9 +77,12 @@ namespace Content.Client.Actions.UI
MaxWidth = TooltipTextMaxWidth, MaxWidth = TooltipTextMaxWidth,
StyleClasses = {StyleNano.StyleClassTooltipActionRequirements} StyleClasses = {StyleNano.StyleClassTooltipActionRequirements}
}; };
requiresLabel.SetMessage(FormattedMessage.FromMarkup("[color=#635c5c]" +
requires + if (!FormattedMessage.TryFromMarkup("[color=#635c5c]" + requires + "[/color]", out var markup))
"[/color]")); return;
requiresLabel.SetMessage(markup);
vbox.AddChild(requiresLabel); vbox.AddChild(requiresLabel);
} }
} }
@@ -97,8 +100,11 @@ namespace Content.Client.Actions.UI
if (timeLeft > TimeSpan.Zero) if (timeLeft > TimeSpan.Zero)
{ {
var duration = Cooldown.Value.End - Cooldown.Value.Start; var duration = Cooldown.Value.End - Cooldown.Value.Start;
_cooldownLabel.SetMessage(FormattedMessage.FromMarkup(
$"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]")); if (!FormattedMessage.TryFromMarkup($"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]", out var markup))
return;
_cooldownLabel.SetMessage(markup);
_cooldownLabel.Visible = true; _cooldownLabel.Visible = true;
} }
else else