diff --git a/Dalamud/Game/ChatHandlers.cs b/Dalamud/Game/ChatHandlers.cs index e85d80db4..58701a572 100644 --- a/Dalamud/Game/ChatHandlers.cs +++ b/Dalamud/Game/ChatHandlers.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Drawing; using System.Linq; using System.Reflection; using System.Text; @@ -11,7 +10,6 @@ using CheapLoc; using Dalamud.Game.Text; using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling.Payloads; -using Dalamud.Interface.Internal.Windows; using Serilog; namespace Dalamud.Game @@ -121,24 +119,21 @@ namespace Dalamud.Game /// public string LastLink { get; private set; } - // /// - // /// Convert a string to SeString and wrap in italics payloads. - // /// - // /// Text to convert. - // /// SeString payload of italicized text. - // private static SeString MakeItalics(string text) - // { - // // TODO: when the code OnCharMessage is switched to SeString, this can be a straight insertion of the - // // italics payloads only, and be a lot cleaner - // var italicString = new SeString(new List(new Payload[] - // { - // EmphasisItalicPayload.ItalicsOn, - // new TextPayload(text), - // EmphasisItalicPayload.ItalicsOff, - // })); - // - // return italicString; - // } + /// + /// Convert a TextPayload to SeString and wrap in italics payloads. + /// + /// Text to convert. + /// SeString payload of italicized text. + public static SeString MakeItalics(string text) + => MakeItalics(new TextPayload(text)); + + /// + /// Convert a TextPayload to SeString and wrap in italics payloads. + /// + /// Text to convert. + /// SeString payload of italicized text. + public static SeString MakeItalics(TextPayload text) + => new(EmphasisItalicPayload.ItalicsOn, text, EmphasisItalicPayload.ItalicsOff); private void OnCheckMessageHandled(XivChatType type, uint senderid, ref SeString sender, ref SeString message, ref bool isHandled) { diff --git a/Dalamud/Game/Text/SeStringHandling/SeString.cs b/Dalamud/Game/Text/SeStringHandling/SeString.cs index 77ec5fed6..0e8fe1ff3 100644 --- a/Dalamud/Game/Text/SeStringHandling/SeString.cs +++ b/Dalamud/Game/Text/SeStringHandling/SeString.cs @@ -38,7 +38,7 @@ namespace Dalamud.Game.Text.SeStringHandling /// Creates a new SeString from an ordered list of payloads. /// /// The Payload objects to make up this string. - public SeString(Payload[] payloads) + public SeString(params Payload[] payloads) { this.Payloads = new List(payloads); } @@ -70,7 +70,7 @@ namespace Dalamud.Game.Text.SeStringHandling /// /// string to convert. /// Equivalent SeString. - public static implicit operator SeString(string str) => new(new Payload[] { new TextPayload(str) }); + public static implicit operator SeString(string str) => new(new TextPayload(str)); /// /// Creates a SeString from a json. (For testing - not recommended for production use.)