ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #413 from daemitus/italics

Browse source
This commit is contained in:
goaaats 2021-07-16 14:36:45 +02:00 • committed by GitHub
commit 9d9a80e75d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Dalamud/Game/ChatHandlers.cs
View file

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
@ -11,7 +10,6 @@ using CheapLoc;
using Dalamud.Game.Text; using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads; using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface.Internal.Windows;
using Serilog; using Serilog;
namespace Dalamud.Game namespace Dalamud.Game
@ -121,24 +119,21 @@ namespace Dalamud.Game
/// </summary> /// </summary>
public string LastLink { get; private set; } public string LastLink { get; private set; }
// /// <summary> /// <summary>
// /// Convert a string to SeString and wrap in italics payloads. /// Convert a TextPayload to SeString and wrap in italics payloads.
// /// </summary> /// </summary>
// /// <param name="text">Text to convert.</param> /// <param name="text">Text to convert.</param>
// /// <returns>SeString payload of italicized text.</returns> /// <returns>SeString payload of italicized text.</returns>
// private static SeString MakeItalics(string text) public static SeString MakeItalics(string text)
// { => MakeItalics(new TextPayload(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 /// <summary>
// var italicString = new SeString(new List<Payload>(new Payload[] /// Convert a TextPayload to SeString and wrap in italics payloads.
// { /// </summary>
// EmphasisItalicPayload.ItalicsOn, /// <param name="text">Text to convert.</param>
// new TextPayload(text), /// <returns>SeString payload of italicized text.</returns>
// EmphasisItalicPayload.ItalicsOff, public static SeString MakeItalics(TextPayload text)
// })); => new(EmphasisItalicPayload.ItalicsOn, text, EmphasisItalicPayload.ItalicsOff);
//
// return italicString;
// }
private void OnCheckMessageHandled(XivChatType type, uint senderid, ref SeString sender, ref SeString message, ref bool isHandled) private void OnCheckMessageHandled(XivChatType type, uint senderid, ref SeString sender, ref SeString message, ref bool isHandled)
{ {

4
Dalamud/Game/Text/SeStringHandling/SeString.cs
View file

@ -38,7 +38,7 @@ namespace Dalamud.Game.Text.SeStringHandling
/// Creates a new SeString from an ordered list of payloads. /// Creates a new SeString from an ordered list of payloads.
/// </summary> /// </summary>
/// <param name="payloads">The Payload objects to make up this string.</param> /// <param name="payloads">The Payload objects to make up this string.</param>
public SeString(Payload[] payloads) public SeString(params Payload[] payloads)
{ {
this.Payloads = new List<Payload>(payloads); this.Payloads = new List<Payload>(payloads);
} }
@ -70,7 +70,7 @@ namespace Dalamud.Game.Text.SeStringHandling
/// </summary> /// </summary>
/// <param name="str">string to convert.</param> /// <param name="str">string to convert.</param>
/// <returns>Equivalent SeString.</returns> /// <returns>Equivalent SeString.</returns>
public static implicit operator SeString(string str) => new(new Payload[] { new TextPayload(str) }); public static implicit operator SeString(string str) => new(new TextPayload(str));
/// <summary> /// <summary>
/// Creates a SeString from a json. (For testing - not recommended for production use.) /// Creates a SeString from a json. (For testing - not recommended for production use.)