2.0.0 #92

Merged
defnotken merged 171 commits from 2.0.0 into master 2025-12-21 17:19:36 +00:00
2 changed files with 4 additions and 10 deletions
Showing only changes of commit ee175efe41 - Show all commits

View File

@@ -1,21 +1,15 @@
using Dalamud.Bindings.ImGui; using Dalamud.Bindings.ImGui;
using Dalamud.Game.Text.SeStringHandling; using Dalamud.Game.Text.SeStringHandling;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Interface; using Dalamud.Interface;
using Dalamud.Interface.ImGuiSeStringRenderer; using Dalamud.Interface.ImGuiSeStringRenderer;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Textures.TextureWraps;
using Lumina.Text; using Dalamud.Interface.Utility;
using Lumina.Text.Parse; using Lumina.Text.Parse;
using Lumina.Text.ReadOnly; using Lumina.Text.ReadOnly;
using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Numerics; using System.Numerics;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading;
using DalamudSeString = Dalamud.Game.Text.SeStringHandling.SeString; using DalamudSeString = Dalamud.Game.Text.SeStringHandling.SeString;
using DalamudSeStringBuilder = Dalamud.Game.Text.SeStringHandling.SeStringBuilder; using DalamudSeStringBuilder = Dalamud.Game.Text.SeStringHandling.SeStringBuilder;
using LuminaSeStringBuilder = Lumina.Text.SeStringBuilder; using LuminaSeStringBuilder = Lumina.Text.SeStringBuilder;
@@ -58,7 +52,7 @@ public static class SeStringUtils
Color = ImGui.GetColorU32(ImGuiCol.Text), Color = ImGui.GetColorU32(ImGuiCol.Text),
}; };
var renderId = ImGui.GetID($"SeStringMarkup##{normalizedPayload.GetHashCode()}"); var renderId = ImGui.GetID($"SeStringMarkup##{normalizedPayload.GetHashCode(StringComparison.Ordinal)}");
var drawResult = ImGuiHelpers.CompileSeStringWrapped(normalizedPayload, drawParams, renderId); var drawResult = ImGuiHelpers.CompileSeStringWrapped(normalizedPayload, drawParams, renderId);
var height = drawResult.Size.Y; var height = drawResult.Size.Y;
if (height <= 0f) if (height <= 0f)
@@ -382,7 +376,7 @@ public static class SeStringUtils
return false; return false;
return Uri.TryCreate(value, UriKind.Absolute, out var uri) return Uri.TryCreate(value, UriKind.Absolute, out var uri)
&& (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps); && (string.Equals(uri.Scheme, Uri.UriSchemeHttp, StringComparison.Ordinal) || string.Equals(uri.Scheme, Uri.UriSchemeHttps, StringComparison.Ordinal));
} }
public static string StripMarkup(string value) public static string StripMarkup(string value)