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

Use ImGui.Text over ImGui.TextUnformatted

Browse source
This commit is contained in:
Haselnussbomber 2025-08-04 21:12:03 +02:00
parent f2aa4bd051
commit a60ee3a2d4
No known key found for this signature in database
GPG key ID: BB905BB49E7295D1
110 changed files with 632 additions and 632 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Interface/Components/ImGuiComponents.HelpMarker.cs
View file

@ -43,7 +43,7 @@ public static partial class ImGuiComponents
{
using (ImRaii.TextWrapPos(ImGui.GetFontSize() * 35.0f))
{
ImGui.TextUnformatted(helpText);
ImGui.Text(helpText);
}
}
}

2
Dalamud/Interface/Components/ImGuiComponents.Test.cs
View file

@ -12,6 +12,6 @@ public static partial class ImGuiComponents
/// </summary>
public static void Test()
{
ImGui.TextUnformatted("You are viewing the test component. The test was a success."u8);
ImGui.Text("You are viewing the test component. The test was a success."u8);
}
}

8
Dalamud/Interface/Components/ImGuiComponents.TextWithLabel.cs
View file

@ -16,20 +16,20 @@ public static partial class ImGuiComponents
/// <param name="hint">The hint to show on hover.</param>
public static void TextWithLabel(string label, string value, string hint = "")
{
ImGui.TextUnformatted(label + ": ");
ImGui.Text(label + ": ");
ImGui.SameLine();
if (string.IsNullOrEmpty(hint))
{
ImGui.TextUnformatted(value);
ImGui.Text(value);
}
else
{
ImGui.TextUnformatted(value + "*");
ImGui.Text(value + "*");
if (ImGui.IsItemHovered())
{
using (ImRaii.Tooltip())
{
ImGui.TextUnformatted(hint);
ImGui.Text(hint);
}
}
}

22
Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs
View file

@ -226,7 +226,7 @@ public partial class FileDialog
if (!this.createDirectoryMode)
{
ImGui.SameLine();
ImGui.TextUnformatted("Search :"u8);
ImGui.Text("Search :"u8);
ImGui.SameLine();
ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);
if (ImGui.InputText("##InputImGuiFileDialogSearchField"u8, ref this.searchBuffer, 255))
@ -257,7 +257,7 @@ public partial class FileDialog
if (this.createDirectoryMode)
{
ImGui.SameLine();
ImGui.TextUnformatted("New Directory Name"u8);
ImGui.Text("New Directory Name"u8);
ImGui.SameLine();
ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X - Scaled(100));
@ -332,7 +332,7 @@ public partial class FileDialog
ImGui.PushFont(InterfaceManager.IconFont);
ImGui.SameLine();
ImGui.SetCursorPosX(0);
ImGui.TextUnformatted(qa.Icon.ToIconString());
ImGui.Text(qa.Icon.ToIconString());
ImGui.PopFont();
ImGui.PopID();
@ -414,18 +414,18 @@ public partial class FileDialog
if (ImGui.TableNextColumn())
{
ImGui.TextUnformatted(file.Ext);
ImGui.Text(file.Ext);
}
if (ImGui.TableNextColumn())
{
if (file.Type == FileStructType.File)
{
ImGui.TextUnformatted(file.FormattedFileSize + " ");
ImGui.Text(file.FormattedFileSize + " ");
}
else
{
ImGui.TextUnformatted(" "u8);
ImGui.Text(" "u8);
}
}
@ -433,7 +433,7 @@ public partial class FileDialog
{
var sz = ImGui.CalcTextSize(file.FileModifiedDate);
ImGui.SetNextItemWidth(sz.X + Scaled(5));
ImGui.TextUnformatted(file.FileModifiedDate + " ");
ImGui.Text(file.FileModifiedDate + " ");
}
ImGui.PopStyleColor();
@ -478,7 +478,7 @@ public partial class FileDialog
ImGui.PushFont(InterfaceManager.IconFont);
ImGui.TextUnformatted(icon.ToIconString());
ImGui.Text(icon.ToIconString());
ImGui.PopFont();
ImGui.SameLine(Scaled(25f));
@ -682,11 +682,11 @@ public partial class FileDialog
if (this.IsDirectoryMode())
{
ImGui.TextUnformatted("Directory Path :"u8);
ImGui.Text("Directory Path :"u8);
}
else
{
ImGui.TextUnformatted("File Name :"u8);
ImGui.Text("File Name :"u8);
}
ImGui.SameLine();
@ -805,7 +805,7 @@ public partial class FileDialog
ImGui.OpenPopup(name);
if (ImGui.BeginPopupModal(name, ref open, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove))
{
ImGui.TextUnformatted("Would you like to Overwrite it ?"u8);
ImGui.Text("Would you like to Overwrite it ?"u8);
if (ImGui.Button("Confirm"u8))
{
this.okResultToConfirm = false;

26
Dalamud/Interface/ImGuiFontChooserDialog/SingleFontChooserDialog.cs
View file

@ -539,19 +539,19 @@ public sealed class SingleFontChooserDialog : IDisposable
if (this.fontHandle is null)
{
ImGui.SetCursorPos(ImGui.GetCursorPos() + ImGui.GetStyle().FramePadding);
ImGui.TextUnformatted("Select a font."u8);
ImGui.Text("Select a font."u8);
}
else if (this.fontHandle.LoadException is { } loadException)
{
ImGui.SetCursorPos(ImGui.GetCursorPos() + ImGui.GetStyle().FramePadding);
ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
ImGui.TextUnformatted(loadException.Message);
ImGui.Text(loadException.Message);
ImGui.PopStyleColor();
}
else if (!this.fontHandle.Available)
{
ImGui.SetCursorPos(ImGui.GetCursorPos() + ImGui.GetStyle().FramePadding);
ImGui.TextUnformatted("Loading font..."u8);
ImGui.Text("Loading font..."u8);
}
else
{
@ -571,14 +571,14 @@ public sealed class SingleFontChooserDialog : IDisposable
if (this.fontFamilies?.IsCompleted is not true)
{
ImGui.SetScrollY(0);
ImGui.TextUnformatted("Loading..."u8);
ImGui.Text("Loading..."u8);
return false;
}
if (!this.fontFamilies.IsCompletedSuccessfully)
{
ImGui.SetScrollY(0);
ImGui.TextUnformatted("Error: " + this.fontFamilies.Exception);
ImGui.Text("Error: " + this.fontFamilies.Exception);
return false;
}
@ -695,7 +695,7 @@ public sealed class SingleFontChooserDialog : IDisposable
{
if (i < 0)
{
ImGui.TextUnformatted(" "u8);
ImGui.Text(" "u8);
continue;
}
@ -735,13 +735,13 @@ public sealed class SingleFontChooserDialog : IDisposable
{
if (this.fontFamilies?.IsCompleted is not true)
{
ImGui.TextUnformatted("Loading..."u8);
ImGui.Text("Loading..."u8);
return changed;
}
if (!this.fontFamilies.IsCompletedSuccessfully)
{
ImGui.TextUnformatted("Error: " + this.fontFamilies.Exception);
ImGui.Text("Error: " + this.fontFamilies.Exception);
return changed;
}
@ -862,7 +862,7 @@ public sealed class SingleFontChooserDialog : IDisposable
{
if (i < 0)
{
ImGui.TextUnformatted(" "u8);
ImGui.Text(" "u8);
continue;
}
@ -966,7 +966,7 @@ public sealed class SingleFontChooserDialog : IDisposable
{
if (i < 0)
{
ImGui.TextUnformatted(" "u8);
ImGui.Text(" "u8);
continue;
}
@ -1039,7 +1039,7 @@ public sealed class SingleFontChooserDialog : IDisposable
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted("Offset:"u8);
ImGui.Text("Offset:"u8);
ImGui.TableNextColumn();
if (FloatInputText(
@ -1070,7 +1070,7 @@ public sealed class SingleFontChooserDialog : IDisposable
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted("Letter Spacing:"u8);
ImGui.Text("Letter Spacing:"u8);
ImGui.TableNextColumn();
if (FloatInputText(
@ -1085,7 +1085,7 @@ public sealed class SingleFontChooserDialog : IDisposable
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted("Line Height:"u8);
ImGui.Text("Line Height:"u8);
ImGui.TableNextColumn();
if (FloatInputText(

12
Dalamud/Interface/ImGuiNotification/Internal/ActiveNotification.ImGui.cs
View file

@ -383,7 +383,7 @@ internal sealed partial class ActiveNotification
ImGui.PushStyleVar(ImGuiStyleVar.Alpha, ImGui.GetStyle().Alpha * relativeOpacity);
ImGui.SetCursorPos(new(NotificationConstants.ScaledWindowPadding));
ImGui.PushStyleColor(ImGuiCol.Text, NotificationConstants.WhenTextColor);
ImGui.TextUnformatted(
ImGui.Text(
ImGui.IsWindowHovered(ImGuiHoveredFlags.AllowWhenBlockedByActiveItem)
? this.CreatedAt.LocAbsolute()
: ReducedMotions
@ -404,7 +404,7 @@ internal sealed partial class ActiveNotification
var agoSize = ImGui.CalcTextSize(agoText);
ImGui.SetCursorPos(new(width - ((height + agoSize.X) / 2f), NotificationConstants.ScaledWindowPadding));
ImGui.PushStyleColor(ImGuiCol.Text, NotificationConstants.WhenTextColor);
ImGui.TextUnformatted(agoText);
ImGui.Text(agoText);
ImGui.PopStyleColor();
this.DrawIcon(
@ -415,7 +415,7 @@ internal sealed partial class ActiveNotification
windowPos + new Vector2(width - height, height),
true);
ImGui.SetCursorPos(new(height, NotificationConstants.ScaledWindowPadding));
ImGui.TextUnformatted(this.EffectiveMinimizedText);
ImGui.Text(this.EffectiveMinimizedText);
ImGui.PopClipRect();
ImGui.PopStyleVar();
@ -502,13 +502,13 @@ internal sealed partial class ActiveNotification
if ((this.Title ?? this.Type.ToTitle()) is { } title)
{
ImGui.PushStyleColor(ImGuiCol.Text, NotificationConstants.TitleTextColor);
ImGui.TextUnformatted(title);
ImGui.Text(title);
ImGui.PopStyleColor();
}
ImGui.PushStyleColor(ImGuiCol.Text, NotificationConstants.BlameTextColor);
ImGui.SetCursorPos(minCoord with { Y = ImGui.GetCursorPosY() });
ImGui.TextUnformatted(this.InitiatorString);
ImGui.Text(this.InitiatorString);
ImGui.PopStyleColor();
ImGui.PopTextWrapPos();
@ -520,7 +520,7 @@ internal sealed partial class ActiveNotification
ImGui.SetCursorPos(minCoord);
ImGui.PushTextWrapPos(minCoord.X + width);
ImGui.PushStyleColor(ImGuiCol.Text, NotificationConstants.BodyTextColor);
ImGui.TextUnformatted(this.Content);
ImGui.Text(this.Content);
ImGui.PopStyleColor();
ImGui.PopTextWrapPos();
}

60
Dalamud/Interface/Internal/UiDebug.cs
View file

@ -88,10 +88,10 @@ internal unsafe class UiDebug
var addonName = atkUnitBase->NameString;
var agent = Service<GameGui>.Get().FindAgentInterface(atkUnitBase);
ImGui.TextUnformatted(addonName);
ImGui.Text(addonName);
ImGui.SameLine();
ImGui.PushStyleColor(ImGuiCol.Text, isVisible ? 0xFF00FF00 : 0xFF0000FF);
ImGui.TextUnformatted(isVisible ? "Visible" : "Not Visible");
ImGui.Text(isVisible ? "Visible" : "Not Visible");
ImGui.PopStyleColor();
ImGui.SameLine(ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - 25);
@ -105,9 +105,9 @@ internal unsafe class UiDebug
ImGuiHelpers.ClickToCopyText($"Agent: {(nint)agent:X}", $"{(nint)agent:X}");
ImGui.Separator();
ImGui.TextUnformatted($"Position: [ {atkUnitBase->X} , {atkUnitBase->Y} ]");
ImGui.TextUnformatted($"Scale: {atkUnitBase->Scale * 100}%%");
ImGui.TextUnformatted($"Widget Count {atkUnitBase->UldManager.ObjectCount}");
ImGui.Text($"Position: [ {atkUnitBase->X} , {atkUnitBase->Y} ]");
ImGui.Text($"Scale: {atkUnitBase->Scale * 100}%%");
ImGui.Text($"Widget Count {atkUnitBase->UldManager.ObjectCount}");
ImGui.Separator();
@ -184,7 +184,7 @@ internal unsafe class UiDebug
popped = true;
}
ImGui.TextUnformatted("Node: "u8);
ImGui.Text("Node: "u8);
ImGui.SameLine();
ImGuiHelpers.ClickToCopyText($"{(ulong)node:X}");
ImGui.SameLine();
@ -208,7 +208,7 @@ internal unsafe class UiDebug
{
case NodeType.Text:
var textNode = (AtkTextNode*)node;
ImGui.TextUnformatted("text: "u8);
ImGui.Text("text: "u8);
ImGui.SameLine();
Service<SeStringRenderer>.Get().Draw(textNode->NodeText);
@ -226,7 +226,7 @@ internal unsafe class UiDebug
if (ImGui.Button($"Decode##{(ulong)textNode:X}"))
textNode->NodeText.SetString(textNode->NodeText.StringPtr.AsReadOnlySeStringSpan().ToString());
ImGui.TextUnformatted($"AlignmentType: {(AlignmentType)textNode->AlignmentFontType} FontSize: {textNode->FontSize}");
ImGui.Text($"AlignmentType: {(AlignmentType)textNode->AlignmentFontType} FontSize: {textNode->FontSize}");
int b = textNode->AlignmentFontType;
if (ImGui.InputInt($"###setAlignment{(ulong)textNode:X}", ref b, 1))
{
@ -236,20 +236,20 @@ internal unsafe class UiDebug
textNode->AtkResNode.DrawFlags |= 0x1;
}
ImGui.TextUnformatted($"Color: #{textNode->TextColor.R:X2}{textNode->TextColor.G:X2}{textNode->TextColor.B:X2}{textNode->TextColor.A:X2}");
ImGui.Text($"Color: #{textNode->TextColor.R:X2}{textNode->TextColor.G:X2}{textNode->TextColor.B:X2}{textNode->TextColor.A:X2}");
ImGui.SameLine();
ImGui.TextUnformatted($"EdgeColor: #{textNode->EdgeColor.R:X2}{textNode->EdgeColor.G:X2}{textNode->EdgeColor.B:X2}{textNode->EdgeColor.A:X2}");
ImGui.Text($"EdgeColor: #{textNode->EdgeColor.R:X2}{textNode->EdgeColor.G:X2}{textNode->EdgeColor.B:X2}{textNode->EdgeColor.A:X2}");
ImGui.SameLine();
ImGui.TextUnformatted($"BGColor: #{textNode->BackgroundColor.R:X2}{textNode->BackgroundColor.G:X2}{textNode->BackgroundColor.B:X2}{textNode->BackgroundColor.A:X2}");
ImGui.Text($"BGColor: #{textNode->BackgroundColor.R:X2}{textNode->BackgroundColor.G:X2}{textNode->BackgroundColor.B:X2}{textNode->BackgroundColor.A:X2}");
ImGui.TextUnformatted($"TextFlags: {textNode->TextFlags}");
ImGui.Text($"TextFlags: {textNode->TextFlags}");
ImGui.SameLine();
ImGui.TextUnformatted($"TextFlags2: {textNode->TextFlags2}");
ImGui.Text($"TextFlags2: {textNode->TextFlags2}");
break;
case NodeType.Counter:
var counterNode = (AtkCounterNode*)node;
ImGui.TextUnformatted("text: "u8);
ImGui.Text("text: "u8);
ImGui.SameLine();
Service<SeStringRenderer>.Get().Draw(counterNode->NodeText);
break;
@ -283,17 +283,17 @@ internal unsafe class UiDebug
{
if (partId > partsList->PartCount)
{
ImGui.TextUnformatted("part id > part count?"u8);
ImGui.Text("part id > part count?"u8);
}
else
{
var textureInfo = partsList->Parts[partId].UldAsset;
var texType = textureInfo->AtkTexture.TextureType;
ImGui.TextUnformatted(
ImGui.Text(
$"texture type: {texType} part_id={partId} part_id_count={partsList->PartCount}");
if (texType == TextureType.Resource)
{
ImGui.TextUnformatted(
ImGui.Text(
$"texture path: {textureInfo->AtkTexture.Resource->TexFileResourceHandle->ResourceHandle.FileName}");
var kernelTexture = textureInfo->AtkTexture.Resource->KernelTextureObject;
@ -348,7 +348,7 @@ internal unsafe class UiDebug
}
else
{
ImGui.TextUnformatted("no texture loaded"u8);
ImGui.Text("no texture loaded"u8);
}
}
}
@ -384,12 +384,12 @@ internal unsafe class UiDebug
popped = true;
}
ImGui.TextUnformatted("Node: "u8);
ImGui.Text("Node: "u8);
ImGui.SameLine();
ImGuiHelpers.ClickToCopyText($"{(ulong)node:X}");
ImGui.SameLine();
Util.ShowStruct(*compNode, (ulong)compNode);
ImGui.TextUnformatted("Component: "u8);
ImGui.Text("Component: "u8);
ImGui.SameLine();
ImGuiHelpers.ClickToCopyText($"{(ulong)compNode->Component:X}");
ImGui.SameLine();
@ -414,31 +414,31 @@ internal unsafe class UiDebug
{
case ComponentType.TextInput:
var textInputComponent = (AtkComponentTextInput*)compNode->Component;
ImGui.TextUnformatted("InputBase Text1: "u8);
ImGui.Text("InputBase Text1: "u8);
ImGui.SameLine();
Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.UnkText1);
ImGui.TextUnformatted("InputBase Text2: "u8);
ImGui.Text("InputBase Text2: "u8);
ImGui.SameLine();
Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.UnkText2);
ImGui.TextUnformatted("Text1: "u8);
ImGui.Text("Text1: "u8);
ImGui.SameLine();
Service<SeStringRenderer>.Get().Draw(textInputComponent->UnkText01);
ImGui.TextUnformatted("Text2: "u8);
ImGui.Text("Text2: "u8);
ImGui.SameLine();
Service<SeStringRenderer>.Get().Draw(textInputComponent->UnkText02);
ImGui.TextUnformatted("AvailableLines: "u8);
ImGui.Text("AvailableLines: "u8);
ImGui.SameLine();
Service<SeStringRenderer>.Get().Draw(textInputComponent->AvailableLines);
ImGui.TextUnformatted("HighlightedAutoTranslateOptionColorPrefix: "u8);
ImGui.Text("HighlightedAutoTranslateOptionColorPrefix: "u8);
ImGui.SameLine();
Service<SeStringRenderer>.Get().Draw(textInputComponent->HighlightedAutoTranslateOptionColorPrefix);
ImGui.TextUnformatted("HighlightedAutoTranslateOptionColorSuffix: "u8);
ImGui.Text("HighlightedAutoTranslateOptionColorSuffix: "u8);
ImGui.SameLine();
Service<SeStringRenderer>.Get().Draw(textInputComponent->HighlightedAutoTranslateOptionColorSuffix);
break;
@ -474,7 +474,7 @@ internal unsafe class UiDebug
private void PrintResNode(AtkResNode* node)
{
ImGui.TextUnformatted($"NodeID: {node->NodeId}");
ImGui.Text($"NodeID: {node->NodeId}");
ImGui.SameLine();
if (ImGui.SmallButton($"T:Visible##{(ulong)node:X}"))
{
@ -487,13 +487,13 @@ internal unsafe class UiDebug
ImGui.SetClipboardText($"{(ulong)node:X}");
}
ImGui.TextUnformatted(
ImGui.Text(
$"X: {node->X} Y: {node->Y} " +
$"ScaleX: {node->ScaleX} ScaleY: {node->ScaleY} " +
$"Rotation: {node->Rotation} " +
$"Width: {node->Width} Height: {node->Height} " +
$"OriginX: {node->OriginX} OriginY: {node->OriginY}");
ImGui.TextUnformatted(
ImGui.Text(
$"RGBA: 0x{node->Color.R:X2}{node->Color.G:X2}{node->Color.B:X2}{node->Color.A:X2} " +
$"AddRGB: {node->AddRed} {node->AddGreen} {node->AddBlue} " +
$"MultiplyRGB: {node->MultiplyRed} {node->MultiplyGreen} {node->MultiplyBlue}");

10
Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.AtkValues.cs
View file

@ -47,7 +47,7 @@ public unsafe partial class AddonTree
}
else
{
ImGui.TextUnformatted($"#{i}");
ImGui.Text($"#{i}");
}
ImGui.TableNextColumn();
@ -57,7 +57,7 @@ public unsafe partial class AddonTree
}
else
{
ImGui.TextUnformatted($"{atkValue->Type}");
ImGui.Text($"{atkValue->Type}");
}
ImGui.TableNextColumn();
@ -69,7 +69,7 @@ public unsafe partial class AddonTree
case ValueType.Int:
case ValueType.UInt:
{
ImGui.TextUnformatted($"{atkValue->Int}");
ImGui.Text($"{atkValue->Int}");
break;
}
@ -91,12 +91,12 @@ public unsafe partial class AddonTree
case ValueType.Bool:
{
ImGui.TextUnformatted($"{atkValue->Byte != 0}");
ImGui.Text($"{atkValue->Byte != 0}");
break;
}
case ValueType.Pointer:
ImGui.TextUnformatted($"{(nint)atkValue->Pointer}");
ImGui.Text($"{(nint)atkValue->Pointer}");
break;
default:

2
Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.cs
View file

@ -119,7 +119,7 @@ public unsafe partial class AddonTree : IDisposable
var isVisible = addon->IsVisible;
ImGui.TextUnformatted($"{this.AddonName}");
ImGui.Text($"{this.AddonName}");
ImGui.SameLine();
ImGui.SameLine();

10
Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs
View file

@ -49,15 +49,15 @@ public static class Events
while (evt != null)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{i++}");
ImGui.Text($"{i++}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{evt->State.EventType}");
ImGui.Text($"{evt->State.EventType}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{evt->Param}");
ImGui.Text($"{evt->Param}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{evt->State.StateFlags}");
ImGui.Text($"{evt->State.StateFlags}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{evt->State.ReturnFlags}");
ImGui.Text($"{evt->State.ReturnFlags}");
ImGui.TableNextColumn();
ImGuiHelpers.ClickToCopyText($"{(nint)evt->Target:X}", default, new Vector4(0.6f, 0.6f, 0.6f, 1));
ImGui.TableNextColumn();

14
Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs
View file

@ -89,19 +89,19 @@ internal unsafe class ComponentNodeTree : ResNodeTree
{
case TextInput:
var textInputComponent = (AtkComponentTextInput*)this.Component;
ImGui.TextUnformatted(
ImGui.Text(
$"InputBase Text1: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.UnkText1.StringPtr))}");
ImGui.TextUnformatted(
ImGui.Text(
$"InputBase Text2: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.UnkText2.StringPtr))}");
ImGui.TextUnformatted(
ImGui.Text(
$"Text1: {Marshal.PtrToStringAnsi(new(textInputComponent->UnkText01.StringPtr))}");
ImGui.TextUnformatted(
ImGui.Text(
$"Text2: {Marshal.PtrToStringAnsi(new(textInputComponent->UnkText02.StringPtr))}");
ImGui.TextUnformatted(
ImGui.Text(
$"AvailableLines: {Marshal.PtrToStringAnsi(new(textInputComponent->AvailableLines.StringPtr))}");
ImGui.TextUnformatted(
ImGui.Text(
$"HighlightedAutoTranslateOptionColorPrefix: {Marshal.PtrToStringAnsi(new(textInputComponent->HighlightedAutoTranslateOptionColorPrefix.StringPtr))}");
ImGui.TextUnformatted(
ImGui.Text(
$"HighlightedAutoTranslateOptionColorSuffix: {Marshal.PtrToStringAnsi(new(textInputComponent->HighlightedAutoTranslateOptionColorSuffix.StringPtr))}");
break;
case List:

34
Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Editor.cs
View file

@ -55,7 +55,7 @@ internal unsafe partial class ResNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Position:"u8);
ImGui.Text("Position:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
@ -70,7 +70,7 @@ internal unsafe partial class ResNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Size:"u8);
ImGui.Text("Size:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.DragFloat2($"##{(nint)this.Node:X}size", ref size, 1, 0, default, "%.0f"))
@ -84,7 +84,7 @@ internal unsafe partial class ResNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Scale:"u8);
ImGui.Text("Scale:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.DragFloat2($"##{(nint)this.Node:X}scale", ref scale, 0.05f))
@ -98,7 +98,7 @@ internal unsafe partial class ResNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Origin:"u8);
ImGui.Text("Origin:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.DragFloat2($"##{(nint)this.Node:X}origin", ref origin, 1, default, default, "%.0f"))
@ -112,7 +112,7 @@ internal unsafe partial class ResNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Rotation:"u8);
ImGui.Text("Rotation:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
while (angle > 180)
@ -143,7 +143,7 @@ internal unsafe partial class ResNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("RGBA:"u8);
ImGui.Text("RGBA:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.ColorEdit4($"##{(nint)this.Node:X}RGBA", ref rgba, DisplayHex))
@ -153,7 +153,7 @@ internal unsafe partial class ResNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Multiply:"u8);
ImGui.Text("Multiply:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.ColorEdit3($"##{(nint)this.Node:X}multiplyRGB", ref mult, DisplayHex))
@ -165,7 +165,7 @@ internal unsafe partial class ResNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Add:"u8);
ImGui.Text("Add:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(124);
@ -203,7 +203,7 @@ internal unsafe partial class CounterNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Counter:"u8);
ImGui.Text("Counter:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
@ -229,7 +229,7 @@ internal unsafe partial class ImageNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Part Id:"u8);
ImGui.Text("Part Id:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.InputInt($"##partId{(nint)this.Node:X}", ref partId, 1, 1))
@ -262,7 +262,7 @@ internal unsafe partial class NineGridNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Ninegrid Offsets:"u8);
ImGui.Text("Ninegrid Offsets:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.DragFloat2($"##{(nint)this.Node:X}ngOffsetLR", ref lr, 1f, 0f))
@ -308,7 +308,7 @@ internal unsafe partial class TextNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Text:"u8);
ImGui.Text("Text:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(Math.Max(ImGui.GetWindowContentRegionMax().X - ImGui.GetCursorPosX() - 50f, 150));
if (ImGui.InputText($"##{(nint)this.Node:X}textEdit", ref text, 512, EnterReturnsTrue))
@ -318,7 +318,7 @@ internal unsafe partial class TextNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Font:"u8);
ImGui.Text("Font:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.Combo($"##{(nint)this.Node:X}fontType", ref fontIndex, FontNames))
@ -328,7 +328,7 @@ internal unsafe partial class TextNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Font Size:"u8);
ImGui.Text("Font Size:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.InputInt($"##{(nint)this.Node:X}fontSize", ref fontSize, 1, 10))
@ -338,7 +338,7 @@ internal unsafe partial class TextNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Alignment:"u8);
ImGui.Text("Alignment:"u8);
ImGui.TableNextColumn();
if (InputAlignment($"##{(nint)this.Node:X}alignment", ref alignment))
{
@ -347,7 +347,7 @@ internal unsafe partial class TextNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Text Color:"u8);
ImGui.Text("Text Color:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.ColorEdit4($"##{(nint)this.Node:X}TextRGB", ref textColor, DisplayHex))
@ -357,7 +357,7 @@ internal unsafe partial class TextNodeTree
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Edge Color:"u8);
ImGui.Text("Edge Color:"u8);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(150);
if (ImGui.ColorEdit4($"##{(nint)this.Node:X}EdgeRGB", ref edgeColor, DisplayHex))

2
Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Image.cs
View file

@ -239,7 +239,7 @@ internal unsafe partial class ImageNodeTree : ResNodeTree
PrintPartCoords(u, v, width, height);
ImGui.TextUnformatted("UV:\t"u8);
ImGui.Text("UV:\t"u8);
ImGui.SameLine();
ImGui.SetCursorPosX(cursX);

2
Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.NineGrid.cs
View file

@ -81,7 +81,7 @@ internal unsafe partial class NineGridNodeTree : ImageNodeTree
{
if (!isEditorOpen)
{
ImGui.TextUnformatted("NineGrid Offsets:\t"u8);
ImGui.Text("NineGrid Offsets:\t"u8);
ImGui.SameLine();
this.Offsets.Print();
}

2
Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Res.cs
View file

@ -168,7 +168,7 @@ internal unsafe partial class ResNodeTree : IDisposable
/// </summary>
internal void WriteTreeHeading()
{
ImGui.TextUnformatted(this.GetHeaderText());
ImGui.Text(this.GetHeaderText());
this.PrintFieldLabels();
}

6
Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Text.cs
View file

@ -64,7 +64,7 @@ internal unsafe partial class TextNodeTree : ResNodeTree
}
catch
{
ImGui.TextUnformatted(Marshal.PtrToStringAnsi(new(this.NodeText.StringPtr)) ?? string.Empty);
ImGui.Text(Marshal.PtrToStringAnsi(new(this.NodeText.StringPtr)) ?? string.Empty);
}
PrintFieldValuePairs(
@ -96,7 +96,7 @@ internal unsafe partial class TextNodeTree : ResNodeTree
for (var i = 0; i < seString.Payloads.Count; i++)
{
var payload = seString.Payloads[i];
ImGui.TextUnformatted($"[{i}]");
ImGui.Text($"[{i}]");
ImGui.SameLine();
switch (payload.Type)
{
@ -108,7 +108,7 @@ internal unsafe partial class TextNodeTree : ResNodeTree
default:
{
ImGui.TextUnformatted(payload.ToString());
ImGui.Text(payload.ToString());
break;
}
}

2
Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.KeyGroupColumn.cs
View file

@ -66,7 +66,7 @@ public readonly partial struct TimelineTree
/// The default print function, if none is specified.
/// </summary>
/// <param name="value">The value to print.</param>
public static void PlainTextCell(T value) => ImGui.TextUnformatted($"{value}");
public static void PlainTextCell(T value) => ImGui.Text($"{value}");
/// <summary>
/// Adds a value to this column.

16
Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs
View file

@ -151,7 +151,7 @@ public readonly unsafe partial struct TimelineTree
return;
}
var rotColumn = new KeyGroupColumn<float>("Rotation", static r => ImGui.TextUnformatted($"{r * (180d / Math.PI):F1}°"));
var rotColumn = new KeyGroupColumn<float>("Rotation", static r => ImGui.Text($"{r * (180d / Math.PI):F1}°"));
for (var f = 0; f < keyGroup.KeyFrameCount; f++)
{
@ -430,25 +430,25 @@ public readonly unsafe partial struct TimelineTree
var keyFrame = keyFrameGroup.KeyFrames[l];
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{keyFrame.FrameIdx}");
ImGui.Text($"{keyFrame.FrameIdx}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{keyFrame.SpeedCoefficient1:F2}");
ImGui.Text($"{keyFrame.SpeedCoefficient1:F2}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{keyFrame.SpeedCoefficient2:F2}");
ImGui.Text($"{keyFrame.SpeedCoefficient2:F2}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{keyFrame.Interpolation}");
ImGui.Text($"{keyFrame.Interpolation}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{keyFrame.Value.Label.LabelId}");
ImGui.Text($"{keyFrame.Value.Label.LabelId}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{keyFrame.Value.Label.JumpBehavior}");
ImGui.Text($"{keyFrame.Value.Label.JumpBehavior}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{keyFrame.Value.Label.JumpLabelId}");
ImGui.Text($"{keyFrame.Value.Label.JumpLabelId}");
}
}
}

6
Dalamud/Interface/Internal/UiDebug2/ElementSelector.cs
View file

@ -144,7 +144,7 @@ internal unsafe class ElementSelector : IDisposable
return;
}
ImGui.TextUnformatted("ELEMENT SELECTOR"u8);
ImGui.Text("ELEMENT SELECTOR"u8);
ImGui.TextDisabled("Use the mouse to hover and identify UI elements, then click to jump to them in the inspector"u8);
ImGui.TextDisabled("Use the scrollwheel to choose between overlapping elements"u8);
ImGui.TextDisabled("Press ESCAPE to cancel"u8);
@ -163,13 +163,13 @@ internal unsafe class ElementSelector : IDisposable
{
Gui.PrintFieldValuePair("Mouse Position", $"{mousePos.X}, {mousePos.Y}");
ImGui.Spacing();
ImGui.TextUnformatted("RESULTS:\n"u8);
ImGui.Text("RESULTS:\n"u8);
var i = 0;
foreach (var a in addonResults)
{
var name = a.Addon->NameString;
ImGui.TextUnformatted($"[Addon] {name}");
ImGui.Text($"[Addon] {name}");
ImGui.Indent(15);
foreach (var n in a.Nodes)
{

4
Dalamud/Interface/Internal/UiDebug2/Utility/Gui.cs
View file

@ -23,7 +23,7 @@ internal static class Gui
/// <param name="copy">Whether to enable click-to-copy.</param>
internal static void PrintFieldValuePair(string fieldName, string value, bool copy = true)
{
ImGui.TextUnformatted($"{fieldName}:");
ImGui.Text($"{fieldName}:");
ImGui.SameLine();
var grey60 = new Vector4(0.6f, 0.6f, 0.6f, 1);
if (copy)
@ -108,7 +108,7 @@ internal static class Gui
if (tt.Success)
{
ImGui.TextUnformatted(tooltips[index]);
ImGui.Text(tooltips[index]);
}
return true;

4
Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs
View file

@ -78,8 +78,8 @@ public class BranchSwitcherWindow : Window
}
else
{
ImGui.TextUnformatted($"Version: {pickedBranch.Value.AssemblyVersion} ({pickedBranch.Value.GitSha ?? "unk"})");
ImGui.TextUnformatted($"Runtime: {pickedBranch.Value.RuntimeVersion}");
ImGui.Text($"Version: {pickedBranch.Value.AssemblyVersion} ({pickedBranch.Value.GitSha ?? "unk"})");
ImGui.Text($"Runtime: {pickedBranch.Value.RuntimeVersion}");
ImGuiHelpers.ScaledDummy(5);

2
Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs
View file

@ -53,7 +53,7 @@ internal sealed class ColorDemoWindow : Window
/// <inheritdoc/>
public override void Draw()
{
ImGui.TextUnformatted("This is a collection of UI colors you can use in your plugin."u8);
ImGui.Text("This is a collection of UI colors you can use in your plugin."u8);
ImGui.Separator();

12
Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs
View file

@ -73,7 +73,7 @@ internal sealed class ComponentDemoWindow : Window
/// <inheritdoc/>
public override void Draw()
{
ImGui.TextUnformatted("This is a collection of UI components you can use in your plugin."u8);
ImGui.Text("This is a collection of UI components you can use in your plugin."u8);
for (var i = 0; i < this.componentDemos.Count; i++)
{
@ -93,13 +93,13 @@ internal sealed class ComponentDemoWindow : Window
private static void HelpMarkerDemo()
{
ImGui.TextUnformatted("Hover over the icon to learn more."u8);
ImGui.Text("Hover over the icon to learn more."u8);
ImGuiComponents.HelpMarker("help me!");
}
private static void IconButtonDemo()
{
ImGui.TextUnformatted("Click on the icon to use as a button."u8);
ImGui.Text("Click on the icon to use as a button."u8);
ImGui.SameLine();
if (ImGuiComponents.IconButton(1, FontAwesomeIcon.Carrot))
{
@ -108,7 +108,7 @@ internal sealed class ComponentDemoWindow : Window
if (ImGui.BeginPopup("IconButtonDemoPopup"u8))
{
ImGui.TextUnformatted("You clicked!"u8);
ImGui.Text("You clicked!"u8);
ImGui.EndPopup();
}
}
@ -147,14 +147,14 @@ internal sealed class ComponentDemoWindow : Window
ImGui.Bullet();
ImGui.SetCursorPos(cursor + new Vector2(0, 10));
ImGui.TextUnformatted($"{easing.GetType().Name} ({easing.ValueClamped})");
ImGui.Text($"{easing.GetType().Name} ({easing.ValueClamped})");
ImGuiHelpers.ScaledDummy(5);
}
}
private void ColorPickerWithPaletteDemo()
{
ImGui.TextUnformatted("Click on the color button to use the picker."u8);
ImGui.Text("Click on the color button to use the picker."u8);
ImGui.SameLine();
this.defaultColor = ImGuiComponents.ColorPickerWithPalette(1, "ColorPickerWithPalette Demo", this.defaultColor);
}

14
Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
View file

@ -161,7 +161,7 @@ internal class ConsoleWindow : Window, IDisposable
ImGuiHelpers.SafeTextColored(
ImGuiColors.DalamudRed,
$"Regex Filter Error: {this.exceptionLogFilter.GetType().Name}");
ImGui.TextUnformatted(this.exceptionLogFilter.Message);
ImGui.Text(this.exceptionLogFilter.Message);
}
if (this.exceptionLogHighlight is not null)
@ -169,7 +169,7 @@ internal class ConsoleWindow : Window, IDisposable
ImGuiHelpers.SafeTextColored(
ImGuiColors.DalamudRed,
$"Regex Highlight Error: {this.exceptionLogHighlight.GetType().Name}");
ImGui.TextUnformatted(this.exceptionLogHighlight.Message);
ImGui.Text(this.exceptionLogHighlight.Message);
}
var sendButtonSize = ImGui.CalcTextSize("Send"u8) +
@ -238,11 +238,11 @@ internal class ConsoleWindow : Window, IDisposable
if (!line.IsMultiline)
{
ImGui.TextUnformatted(line.TimestampString);
ImGui.Text(line.TimestampString);
ImGui.SameLine();
ImGui.SetCursorPosX(cursorLogLevel);
ImGui.TextUnformatted(GetTextForLogEventLevel(line.Level));
ImGui.Text(GetTextForLogEventLevel(line.Level));
ImGui.SameLine();
}
@ -258,7 +258,7 @@ internal class ConsoleWindow : Window, IDisposable
}
else
{
ImGui.TextUnformatted(line.Line);
ImGui.Text(line.Line);
}
var currentLinePosY = ImGui.GetCursorPosY();
@ -667,7 +667,7 @@ internal class ConsoleWindow : Window, IDisposable
this.configuration.QueueSave();
}
ImGui.TextUnformatted("Logs buffer"u8);
ImGui.Text("Logs buffer"u8);
ImGui.SliderInt("lines"u8, ref this.logLinesLimit, LogLinesMinimum, LogLinesMaximum);
if (ImGui.Button("Apply"u8))
{
@ -762,7 +762,7 @@ internal class ConsoleWindow : Window, IDisposable
}
ImGui.TableNextColumn();
ImGui.TextUnformatted(entry.Source);
ImGui.Text(entry.Source);
ImGui.TableNextColumn();
ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);

4
Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
View file

@ -212,7 +212,7 @@ internal class DataWindow : Window, IDisposable
}
else
{
ImGui.TextUnformatted("Data not ready."u8);
ImGui.Text("Data not ready."u8);
}
this.isExcept = false;
@ -226,7 +226,7 @@ internal class DataWindow : Window, IDisposable
this.isExcept = true;
ImGui.TextUnformatted(ex.ToString());
ImGui.Text(ex.ToString());
}
}

4
Dalamud/Interface/Internal/Windows/Data/DataWindowWidgetExtensions.cs
View file

@ -26,11 +26,11 @@ internal static class DataWindowWidgetExtensions
var xoff = ImGui.GetColumnWidth() - width;
offset.X += xoff;
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + xoff);
ImGui.TextUnformatted(s);
ImGui.Text(s);
}
else
{
ImGui.TextUnformatted(s);
ImGui.Text(s);
}
if (ImGui.IsItemHovered())

6
Dalamud/Interface/Internal/Windows/Data/GameInventoryTestWidget.cs
View file

@ -50,7 +50,7 @@ internal class GameInventoryTestWidget : IDataWindowWidget
return;
ImGui.TableNextColumn();
ImGui.TextUnformatted("Standard Logging"u8);
ImGui.Text("Standard Logging"u8);
ImGui.TableNextColumn();
using (ImRaii.Disabled(this.standardEnabled))
@ -81,7 +81,7 @@ internal class GameInventoryTestWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Raw Logging"u8);
ImGui.Text("Raw Logging"u8);
ImGui.TableNextColumn();
using (ImRaii.Disabled(this.rawEnabled))
@ -112,7 +112,7 @@ internal class GameInventoryTestWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("All"u8);
ImGui.Text("All"u8);
ImGui.TableNextColumn();
using (ImRaii.Disabled(this.standardEnabled && this.rawEnabled))

2
Dalamud/Interface/Internal/Windows/Data/WidgetUtil.cs
View file

@ -21,7 +21,7 @@ internal class WidgetUtil
{
ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
ImGui.BeginTooltip();
ImGui.TextUnformatted(tooltipText);
ImGui.Text(tooltipText);
ImGui.EndTooltip();
}

18
Dalamud/Interface/Internal/Windows/Data/Widgets/AddonLifecycleWidget.cs
View file

@ -43,7 +43,7 @@ public class AddonLifecycleWidget : IDataWindowWidget
{
if (!this.Ready)
{
ImGui.TextUnformatted("AddonLifecycle Reference is null, reload module."u8);
ImGui.Text("AddonLifecycle Reference is null, reload module."u8);
return;
}
@ -75,7 +75,7 @@ public class AddonLifecycleWidget : IDataWindowWidget
if (listeners.Count == 0)
{
ImGui.TextUnformatted("No Listeners Registered for Event"u8);
ImGui.Text("No Listeners Registered for Event"u8);
}
if (ImGui.BeginTable("AddonLifecycleListenersTable"u8, 2))
@ -86,10 +86,10 @@ public class AddonLifecycleWidget : IDataWindowWidget
foreach (var listener in listeners)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(listener.AddonName is "" ? "GLOBAL" : listener.AddonName);
ImGui.Text(listener.AddonName is "" ? "GLOBAL" : listener.AddonName);
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{listener.FunctionDelegate.Method.DeclaringType?.FullName ?? "Unknown Declaring Type"}::{listener.FunctionDelegate.Method.Name}");
ImGui.Text($"{listener.FunctionDelegate.Method.DeclaringType?.FullName ?? "Unknown Declaring Type"}::{listener.FunctionDelegate.Method.Name}");
}
ImGui.EndTable();
@ -108,7 +108,7 @@ public class AddonLifecycleWidget : IDataWindowWidget
if (listeners.Count == 0)
{
ImGui.TextUnformatted("No ReceiveEvent Hooks are Registered"u8);
ImGui.Text("No ReceiveEvent Hooks are Registered"u8);
}
foreach (var receiveEventListener in this.AddonLifecycle.ReceiveEventListeners)
@ -117,16 +117,16 @@ public class AddonLifecycleWidget : IDataWindowWidget
{
ImGui.Columns(2);
ImGui.TextUnformatted("Hook Address"u8);
ImGui.Text("Hook Address"u8);
ImGui.NextColumn();
ImGui.TextUnformatted(receiveEventListener.FunctionAddress.ToString("X"));
ImGui.Text(receiveEventListener.FunctionAddress.ToString("X"));
ImGui.NextColumn();
ImGui.TextUnformatted("Hook Status"u8);
ImGui.Text("Hook Status"u8);
ImGui.NextColumn();
if (receiveEventListener.Hook is null)
{
ImGui.TextUnformatted("Hook is null"u8);
ImGui.Text("Hook is null"u8);
}
else
{

6
Dalamud/Interface/Internal/Windows/Data/Widgets/AddonWidget.cs
View file

@ -43,11 +43,11 @@ internal unsafe class AddonWidget : IDataWindowWidget
var addon = gameGui.GetAddonByName(this.inputAddonName, this.inputAddonIndex);
if (addon.IsNull)
{
ImGui.TextUnformatted("Null"u8);
ImGui.Text("Null"u8);
return;
}
ImGui.TextUnformatted($"{addon.Name} - {Util.DescribeAddress(addon)}\n v:{addon.IsVisible} x:{addon.X} y:{addon.Y} s:{addon.Scale}, w:{addon.Width}, h:{addon.Height}");
ImGui.Text($"{addon.Name} - {Util.DescribeAddress(addon)}\n v:{addon.IsVisible} x:{addon.X} y:{addon.Y} s:{addon.Scale}, w:{addon.Width}, h:{addon.Height}");
if (ImGui.Button("Find Agent"u8))
{
@ -56,7 +56,7 @@ internal unsafe class AddonWidget : IDataWindowWidget
if (!this.agentInterfacePtr.IsNull)
{
ImGui.TextUnformatted($"Agent: {Util.DescribeAddress(this.agentInterfacePtr)}");
ImGui.Text($"Agent: {Util.DescribeAddress(this.agentInterfacePtr)}");
ImGui.SameLine();
if (ImGui.Button("C"u8))

6
Dalamud/Interface/Internal/Windows/Data/Widgets/AddressesWidget.cs
View file

@ -46,17 +46,17 @@ internal class AddressesWidget : IDataWindowWidget
}
}
ImGui.TextUnformatted($"Result: {this.sigResult.ToInt64():X}");
ImGui.Text($"Result: {this.sigResult.ToInt64():X}");
ImGui.SameLine();
if (ImGui.Button($"C##{this.sigResult.ToInt64():X}"))
ImGui.SetClipboardText(this.sigResult.ToInt64().ToString("X"));
foreach (var debugScannedValue in BaseAddressResolver.DebugScannedValues)
{
ImGui.TextUnformatted($"{debugScannedValue.Key}");
ImGui.Text($"{debugScannedValue.Key}");
foreach (var valueTuple in debugScannedValue.Value)
{
ImGui.TextUnformatted(
ImGui.Text(
$" {valueTuple.ClassName} - {Util.DescribeAddress(valueTuple.Address)}");
ImGui.SameLine();

22
Dalamud/Interface/Internal/Windows/Data/Widgets/AetherytesWidget.cs
View file

@ -52,37 +52,37 @@ internal class AetherytesWidget : IDataWindowWidget
continue;
ImGui.TableNextColumn(); // Idx
ImGui.TextUnformatted($"{i}");
ImGui.Text($"{i}");
ImGui.TableNextColumn(); // Name
ImGui.TextUnformatted($"{info.AetheryteData.ValueNullable?.PlaceName.ValueNullable?.Name}");
ImGui.Text($"{info.AetheryteData.ValueNullable?.PlaceName.ValueNullable?.Name}");
ImGui.TableNextColumn(); // ID
ImGui.TextUnformatted($"{info.AetheryteId}");
ImGui.Text($"{info.AetheryteId}");
ImGui.TableNextColumn(); // Zone
ImGui.TextUnformatted($"{info.TerritoryId}");
ImGui.Text($"{info.TerritoryId}");
ImGui.TableNextColumn(); // Ward
ImGui.TextUnformatted($"{info.Ward}");
ImGui.Text($"{info.Ward}");
ImGui.TableNextColumn(); // Plot
ImGui.TextUnformatted($"{info.Plot}");
ImGui.Text($"{info.Plot}");
ImGui.TableNextColumn(); // Sub
ImGui.TextUnformatted($"{info.SubIndex}");
ImGui.Text($"{info.SubIndex}");
ImGui.TableNextColumn(); // Gil
ImGui.TextUnformatted($"{info.GilCost}");
ImGui.Text($"{info.GilCost}");
ImGui.TableNextColumn(); // Favourite
ImGui.TextUnformatted($"{info.IsFavourite}");
ImGui.Text($"{info.IsFavourite}");
ImGui.TableNextColumn(); // Shared
ImGui.TextUnformatted($"{info.IsSharedHouse}");
ImGui.Text($"{info.IsSharedHouse}");
ImGui.TableNextColumn(); // Apartment
ImGui.TextUnformatted($"{info.IsApartment}");
ImGui.Text($"{info.IsApartment}");
}
ImGui.EndTable();

28
Dalamud/Interface/Internal/Windows/Data/Widgets/AtkArrayDataBrowserWidget.cs
View file

@ -103,7 +103,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
ImGui.TableNextColumn(); // Type
if (arrayType != null && Enum.IsDefined(arrayType, arrayIndex))
{
ImGui.TextUnformatted(Enum.GetName(arrayType, arrayIndex));
ImGui.Text(Enum.GetName(arrayType, arrayIndex));
}
else if (inUse && arrays[arrayIndex]->SubscribedAddonsCount > 0)
{
@ -115,41 +115,41 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
continue;
using (ImRaii.PushColor(ImGuiCol.Text, 0xFF00FFFF))
ImGui.TextUnformatted(raptureAtkUnitManager->GetAddonById(arrays[arrayIndex]->SubscribedAddons[j])->NameString);
ImGui.Text(raptureAtkUnitManager->GetAddonById(arrays[arrayIndex]->SubscribedAddons[j])->NameString);
break;
}
}
ImGui.TableNextColumn(); // Size
if (inUse)
ImGui.TextUnformatted((rowsFound > 0 ? rowsFound : arrays[arrayIndex]->Size).ToString());
ImGui.Text((rowsFound > 0 ? rowsFound : arrays[arrayIndex]->Size).ToString());
}
}
private void DrawArrayHeader(Type? arrayType, string type, int index, AtkArrayData* array)
{
ImGui.TextUnformatted($"{type} Array #{index}");
ImGui.Text($"{type} Array #{index}");
if (arrayType != null && Enum.IsDefined(arrayType, index))
{
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" ({Enum.GetName(arrayType, index)})");
ImGui.Text($" ({Enum.GetName(arrayType, index)})");
}
ImGui.SameLine();
ImGui.TextUnformatted("–"u8);
ImGui.Text("–"u8);
ImGui.SameLine();
ImGui.TextUnformatted("Address: "u8);
ImGui.Text("Address: "u8);
ImGui.SameLine(0, 0);
WidgetUtil.DrawCopyableText($"0x{(nint)array:X}", "Copy address");
if (array->SubscribedAddonsCount > 0)
{
ImGui.SameLine();
ImGui.TextUnformatted("–"u8);
ImGui.Text("–"u8);
ImGui.SameLine();
using (ImRaii.PushColor(ImGuiCol.Text, 0xFF00FFFF))
ImGui.TextUnformatted($"{array->SubscribedAddonsCount} Subscribed Addon" + (array->SubscribedAddonsCount > 1 ? 's' : string.Empty));
ImGui.Text($"{array->SubscribedAddonsCount} Subscribed Addon" + (array->SubscribedAddonsCount > 1 ? 's' : string.Empty));
if (ImGui.IsItemHovered())
{
@ -163,7 +163,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
if (array->SubscribedAddons[j] == 0)
continue;
ImGui.TextUnformatted(raptureAtkUnitManager->GetAddonById(array->SubscribedAddons[j])->NameString);
ImGui.Text(raptureAtkUnitManager->GetAddonById(array->SubscribedAddons[j])->NameString);
}
}
}
@ -212,7 +212,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
{
ImGui.TableNextRow();
ImGui.TableNextColumn(); // Index
ImGui.TextUnformatted($"#{i}");
ImGui.Text($"#{i}");
var ptr = &array->IntArray[i];
@ -306,7 +306,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableNextColumn(); // Index
ImGui.TextUnformatted($"#{i}");
ImGui.Text($"#{i}");
ImGui.TableNextColumn(); // Address
if (this.showTextAddress)
@ -322,7 +322,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
ImGui.TableNextColumn(); // Managed
if (!isNull)
{
ImGui.TextUnformatted(((nint)array->StringArray[i] != 0 && array->ManagedStringArray[i] == array->StringArray[i]).ToString());
ImGui.Text(((nint)array->StringArray[i] != 0 && array->ManagedStringArray[i] == array->StringArray[i]).ToString());
}
ImGui.TableNextColumn(); // Text
@ -384,7 +384,7 @@ internal unsafe class AtkArrayDataBrowserWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableNextColumn(); // Index
ImGui.TextUnformatted($"#{i}");
ImGui.Text($"#{i}");
ImGui.TableNextColumn(); // Address
WidgetUtil.DrawCopyableText($"0x{(nint)(&array->DataArray[i]):X}", "Copy entry address");

18
Dalamud/Interface/Internal/Windows/Data/Widgets/BuddyListWidget.cs
View file

@ -36,17 +36,17 @@ internal class BuddyListWidget : IDataWindowWidget
var member = buddyList.CompanionBuddy;
if (member == null)
{
ImGui.TextUnformatted("[Companion] null"u8);
ImGui.Text("[Companion] null"u8);
}
else
{
ImGui.TextUnformatted($"[Companion] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
ImGui.Text($"[Companion] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
if (this.resolveGameData)
{
var gameObject = member.GameObject;
if (gameObject == null)
{
ImGui.TextUnformatted("GameObject was null"u8);
ImGui.Text("GameObject was null"u8);
}
else
{
@ -60,17 +60,17 @@ internal class BuddyListWidget : IDataWindowWidget
var member = buddyList.PetBuddy;
if (member == null)
{
ImGui.TextUnformatted("[Pet] null"u8);
ImGui.Text("[Pet] null"u8);
}
else
{
ImGui.TextUnformatted($"[Pet] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
ImGui.Text($"[Pet] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
if (this.resolveGameData)
{
var gameObject = member.GameObject;
if (gameObject == null)
{
ImGui.TextUnformatted("GameObject was null"u8);
ImGui.Text("GameObject was null"u8);
}
else
{
@ -84,20 +84,20 @@ internal class BuddyListWidget : IDataWindowWidget
var count = buddyList.Length;
if (count == 0)
{
ImGui.TextUnformatted("[BattleBuddy] None present"u8);
ImGui.Text("[BattleBuddy] None present"u8);
}
else
{
for (var i = 0; i < count; i++)
{
var member = buddyList[i];
ImGui.TextUnformatted($"[BattleBuddy] [{i}] {member?.Address.ToInt64():X} - {member?.ObjectId} - {member?.DataID}");
ImGui.Text($"[BattleBuddy] [{i}] {member?.Address.ToInt64():X} - {member?.ObjectId} - {member?.DataID}");
if (this.resolveGameData)
{
var gameObject = member?.GameObject;
if (gameObject == null)
{
ImGui.TextUnformatted("GameObject was null"u8);
ImGui.Text("GameObject was null"u8);
}
else
{

6
Dalamud/Interface/Internal/Windows/Data/Widgets/CommandWidget.cs
View file

@ -67,16 +67,16 @@ internal class CommandWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableSetColumnIndex(0);
ImGui.TextUnformatted(command.Key);
ImGui.Text(command.Key);
ImGui.TableNextColumn();
ImGui.TextUnformatted(commandManager.GetHandlerAssemblyName(command.Key, command.Value));
ImGui.Text(commandManager.GetHandlerAssemblyName(command.Key, command.Value));
ImGui.TableNextColumn();
ImGuiHelpers.SafeTextWrapped(command.Value.HelpMessage);
ImGui.TableNextColumn();
ImGui.TextUnformatted(command.Value.ShowInHelp ? "Yes" : "No");
ImGui.Text(command.Value.ShowInHelp ? "Yes" : "No");
}
}
}

8
Dalamud/Interface/Internal/Windows/Data/Widgets/ConditionWidget.cs
View file

@ -30,10 +30,10 @@ internal class ConditionWidget : IDataWindowWidget
var condition = Service<Condition>.Get();
#if DEBUG
ImGui.TextUnformatted($"ptr: {Util.DescribeAddress(condition.Address)}");
ImGui.Text($"ptr: {Util.DescribeAddress(condition.Address)}");
#endif
ImGui.TextUnformatted("Current Conditions:"u8);
ImGui.Text("Current Conditions:"u8);
ImGui.Separator();
var didAny = false;
@ -47,10 +47,10 @@ internal class ConditionWidget : IDataWindowWidget
didAny = true;
ImGui.TextUnformatted($"ID: {i} Enum: {typedCondition}");
ImGui.Text($"ID: {i} Enum: {typedCondition}");
}
if (!didAny)
ImGui.TextUnformatted("None. Talk to a shop NPC or visit a market board to find out more!"u8);
ImGui.Text("None. Talk to a shop NPC or visit a market board to find out more!"u8);
}
}

2
Dalamud/Interface/Internal/Windows/Data/Widgets/DataShareWidget.cs
View file

@ -214,7 +214,7 @@ internal class DataShareWidget : IDataWindowWidget
var offset = ImGui.GetCursorScreenPos() + new Vector2(0, framepad ? ImGui.GetStyle().FramePadding.Y : 0);
if (framepad)
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted(s);
ImGui.Text(s);
if (ImGui.IsItemHovered())
{
ImGui.SetNextWindowPos(offset - ImGui.GetStyle().WindowPadding);

10
Dalamud/Interface/Internal/Windows/Data/Widgets/DtrBarWidget.cs
View file

@ -149,17 +149,17 @@ internal class DtrBarWidget : IDataWindowWidget, IDisposable
this.DrawDtrTestEntry(ref this.dtrTest3, "DTR Test #3");
ImGui.Separator();
ImGui.TextUnformatted("IDtrBar.Entries:"u8);
ImGui.Text("IDtrBar.Entries:"u8);
foreach (var e in Service<DtrBar>.Get().Entries)
ImGui.TextUnformatted(e.Title);
ImGui.Text(e.Title);
var configuration = Service<DalamudConfiguration>.Get();
if (configuration.DtrOrder != null)
{
ImGui.Separator();
ImGui.TextUnformatted("DtrOrder:"u8);
ImGui.Text("DtrOrder:"u8);
foreach (var order in configuration.DtrOrder)
ImGui.TextUnformatted(order);
ImGui.Text(order);
}
}
@ -177,7 +177,7 @@ internal class DtrBarWidget : IDataWindowWidget, IDisposable
if (entry != null)
{
ImGui.TextUnformatted(title);
ImGui.Text(title);
var text = entry.Text?.TextValue ?? string.Empty;
if (ImGui.InputText($"Text###{entry.Title}t", ref text, 255))

24
Dalamud/Interface/Internal/Windows/Data/Widgets/FateTableWidget.cs
View file

@ -34,7 +34,7 @@ internal class FateTableWidget : IDataWindowWidget
if (fateTable.Length == 0)
{
ImGui.TextUnformatted("No fates or data not ready."u8);
ImGui.Text("No fates or data not ready."u8);
return;
}
@ -65,7 +65,7 @@ internal class FateTableWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableNextColumn(); // Index
ImGui.TextUnformatted($"#{i}");
ImGui.Text($"#{i}");
ImGui.TableNextColumn(); // Address
WidgetUtil.DrawCopyableText($"0x{fate.Address:X}", "Click to copy Address");
@ -74,17 +74,17 @@ internal class FateTableWidget : IDataWindowWidget
WidgetUtil.DrawCopyableText(fate.FateId.ToString(), "Click to copy FateId (RowId of Fate sheet)");
ImGui.TableNextColumn(); // State
ImGui.TextUnformatted(fate.State.ToString());
ImGui.Text(fate.State.ToString());
ImGui.TableNextColumn(); // Level
if (fate.Level == fate.MaxLevel)
{
ImGui.TextUnformatted($"{fate.Level}");
ImGui.Text($"{fate.Level}");
}
else
{
ImGui.TextUnformatted($"{fate.Level}-{fate.MaxLevel}");
ImGui.Text($"{fate.Level}-{fate.MaxLevel}");
}
ImGui.TableNextColumn(); // Icon
@ -99,8 +99,8 @@ internal class FateTableWidget : IDataWindowWidget
{
ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
ImGui.BeginTooltip();
ImGui.TextUnformatted("Click to copy IconId"u8);
ImGui.TextUnformatted($"ID: {fate.IconId} – Size: {texture.Width}x{texture.Height}");
ImGui.Text("Click to copy IconId"u8);
ImGui.Text($"ID: {fate.IconId} – Size: {texture.Width}x{texture.Height}");
ImGui.Image(texture.Handle, new(texture.Width, texture.Height));
ImGui.EndTooltip();
}
@ -124,8 +124,8 @@ internal class FateTableWidget : IDataWindowWidget
{
ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
ImGui.BeginTooltip();
ImGui.TextUnformatted("Click to copy MapIconId"u8);
ImGui.TextUnformatted($"ID: {fate.MapIconId} – Size: {texture.Width}x{texture.Height}");
ImGui.Text("Click to copy MapIconId"u8);
ImGui.Text($"ID: {fate.MapIconId} – Size: {texture.Width}x{texture.Height}");
ImGui.Image(texture.Handle, new(texture.Width, texture.Height));
ImGui.EndTooltip();
}
@ -142,17 +142,17 @@ internal class FateTableWidget : IDataWindowWidget
WidgetUtil.DrawCopyableText(fate.Name.ToString(), "Click to copy Name");
ImGui.TableNextColumn(); // Progress
ImGui.TextUnformatted($"{fate.Progress}%");
ImGui.Text($"{fate.Progress}%");
ImGui.TableNextColumn(); // TimeRemaining
if (fate.State == FateState.Running)
{
ImGui.TextUnformatted($"{TimeSpan.FromSeconds(fate.TimeRemaining):mm\\:ss} / {TimeSpan.FromSeconds(fate.Duration):mm\\:ss}");
ImGui.Text($"{TimeSpan.FromSeconds(fate.TimeRemaining):mm\\:ss} / {TimeSpan.FromSeconds(fate.Duration):mm\\:ss}");
}
ImGui.TableNextColumn(); // HasExpBonus
ImGui.TextUnformatted(fate.HasBonus.ToString());
ImGui.Text(fate.HasBonus.ToString());
ImGui.TableNextColumn(); // Position
WidgetUtil.DrawCopyableText(fate.Position.ToString(), "Click to copy Position");

6
Dalamud/Interface/Internal/Windows/Data/Widgets/FontAwesomeTestWidget.cs
View file

@ -87,12 +87,12 @@ internal class FontAwesomeTestWidget : IDataWindowWidget
ImGuiHelpers.ScaledDummy(10f);
for (var i = 0; i < this.icons?.Count; i++)
{
ImGui.TextUnformatted($"0x{(int)this.icons[i].ToIconChar():X}");
ImGui.Text($"0x{(int)this.icons[i].ToIconChar():X}");
ImGuiHelpers.ScaledRelativeSameLine(50f);
ImGui.TextUnformatted($"{this.iconNames?[i]}");
ImGui.Text($"{this.iconNames?[i]}");
ImGuiHelpers.ScaledRelativeSameLine(280f);
ImGui.PushFont(this.useFixedWidth ? InterfaceManager.IconFontFixedWidth : InterfaceManager.IconFont);
ImGui.TextUnformatted(this.icons[i].ToIconString());
ImGui.Text(this.icons[i].ToIconString());
ImGui.PopFont();
ImGuiHelpers.ScaledDummy(2f);
}

12
Dalamud/Interface/Internal/Windows/Data/Widgets/GamePrebakedFontsTestWidget.cs
View file

@ -150,7 +150,7 @@ internal class GamePrebakedFontsTestWidget : IDataWindowWidget, IDisposable
if (this.chooserDialog is not null)
{
ImGui.SameLine();
ImGui.TextUnformatted($"{this.chooserDialog.PopupPosition}, {this.chooserDialog.PopupSize}");
ImGui.Text($"{this.chooserDialog.PopupPosition}, {this.chooserDialog.PopupSize}");
ImGui.SameLine();
if (ImGui.Button("Random Location"u8))
@ -246,18 +246,18 @@ internal class GamePrebakedFontsTestWidget : IDataWindowWidget, IDisposable
foreach (var (gfs, handle) in items)
{
ImGui.TextUnformatted($"{gfs.SizePt}pt");
ImGui.Text($"{gfs.SizePt}pt");
ImGui.SameLine(offsetX);
ImGui.PushTextWrapPos(this.useWordWrap ? 0f : -1f);
try
{
if (handle.Value.LoadException is { } exc)
{
ImGui.TextUnformatted(exc.ToString());
ImGui.Text(exc.ToString());
}
else if (!handle.Value.Available)
{
ImGui.TextUnformatted("Loading..."u8[..(8 + ((Environment.TickCount / 200) % 3))]);
ImGui.Text("Loading..."u8[..(8 + ((Environment.TickCount / 200) % 3))]);
}
else
{
@ -266,12 +266,12 @@ internal class GamePrebakedFontsTestWidget : IDataWindowWidget, IDisposable
if (counter++ % 2 == 0)
{
using var pushPop = handle.Value.Push();
ImGui.TextUnformatted(this.testStringBuffer.DataSpan);
ImGui.Text(this.testStringBuffer.DataSpan);
}
else
{
handle.Value.Push();
ImGui.TextUnformatted(this.testStringBuffer.DataSpan);
ImGui.Text(this.testStringBuffer.DataSpan);
handle.Value.Pop();
}
}

16
Dalamud/Interface/Internal/Windows/Data/Widgets/GamepadWidget.cs
View file

@ -29,7 +29,7 @@ internal class GamepadWidget : IDataWindowWidget
{
var gamepadState = Service<GamepadState>.Get();
ImGui.TextUnformatted($"GamepadInput {Util.DescribeAddress(gamepadState.GamepadInputAddress)}");
ImGui.Text($"GamepadInput {Util.DescribeAddress(gamepadState.GamepadInputAddress)}");
#if DEBUG
if (ImGui.IsItemHovered())
@ -55,26 +55,26 @@ internal class GamepadWidget : IDataWindowWidget
"Buttons Released",
(uint)gamepadState.ButtonsReleased,
gamepadState.Released);
ImGui.TextUnformatted($"LeftStick {gamepadState.LeftStick}");
ImGui.TextUnformatted($"RightStick {gamepadState.RightStick}");
ImGui.Text($"LeftStick {gamepadState.LeftStick}");
ImGui.Text($"RightStick {gamepadState.RightStick}");
}
private void DrawHelper(string text, uint mask, Func<GamepadButtons, float> resolve)
{
ImGui.TextUnformatted($"{text} {mask:X4}");
ImGui.TextUnformatted($"DPadLeft {resolve(GamepadButtons.DpadLeft)} " +
ImGui.Text($"{text} {mask:X4}");
ImGui.Text($"DPadLeft {resolve(GamepadButtons.DpadLeft)} " +
$"DPadUp {resolve(GamepadButtons.DpadUp)} " +
$"DPadRight {resolve(GamepadButtons.DpadRight)} " +
$"DPadDown {resolve(GamepadButtons.DpadDown)} ");
ImGui.TextUnformatted($"West {resolve(GamepadButtons.West)} " +
ImGui.Text($"West {resolve(GamepadButtons.West)} " +
$"North {resolve(GamepadButtons.North)} " +
$"East {resolve(GamepadButtons.East)} " +
$"South {resolve(GamepadButtons.South)} ");
ImGui.TextUnformatted($"L1 {resolve(GamepadButtons.L1)} " +
ImGui.Text($"L1 {resolve(GamepadButtons.L1)} " +
$"L2 {resolve(GamepadButtons.L2)} " +
$"R1 {resolve(GamepadButtons.R1)} " +
$"R2 {resolve(GamepadButtons.R2)} ");
ImGui.TextUnformatted($"Select {resolve(GamepadButtons.Select)} " +
ImGui.Text($"Select {resolve(GamepadButtons.Select)} " +
$"Start {resolve(GamepadButtons.Start)} " +
$"L3 {resolve(GamepadButtons.L3)} " +
$"R3 {resolve(GamepadButtons.R3)} ");

4
Dalamud/Interface/Internal/Windows/Data/Widgets/GaugeWidget.cs
View file

@ -35,7 +35,7 @@ internal class GaugeWidget : IDataWindowWidget
var player = clientState.LocalPlayer;
if (player == null)
{
ImGui.TextUnformatted("Player is not present"u8);
ImGui.Text("Player is not present"u8);
return;
}
@ -68,7 +68,7 @@ internal class GaugeWidget : IDataWindowWidget
if (gauge == null)
{
ImGui.TextUnformatted("No supported gauge exists for this job."u8);
ImGui.Text("No supported gauge exists for this job."u8);
return;
}

6
Dalamud/Interface/Internal/Windows/Data/Widgets/HookWidget.cs
View file

@ -100,12 +100,12 @@ internal unsafe class HookWidget : IDataWindowWidget
_ = global::Windows.Win32.PInvoke.MessageBox(HWND.Null, "Hi", "Hello", MESSAGEBOX_STYLE.MB_OK);
if (this.messageBoxMinHook != null)
ImGui.TextUnformatted("Enabled: " + this.messageBoxMinHook?.IsEnabled);
ImGui.Text("Enabled: " + this.messageBoxMinHook?.IsEnabled);
ImGui.Separator();
ImGui.BeginDisabled(this.hookStressTestRunning);
ImGui.TextUnformatted("Stress Test"u8);
ImGui.Text("Stress Test"u8);
if (ImGui.InputInt("Max"u8, ref this.hookStressTestMax))
this.hookStressTestCount = 0;
@ -165,7 +165,7 @@ internal unsafe class HookWidget : IDataWindowWidget
ImGui.EndDisabled();
ImGui.TextUnformatted("Status: " + (this.hookStressTestRunning ? "Running" : "Idle"));
ImGui.Text("Status: " + (this.hookStressTestRunning ? "Running" : "Idle"));
ImGui.ProgressBar(this.hookStressTestCount / (float)this.hookStressTestMax, new System.Numerics.Vector2(0, 0), $"{this.hookStressTestCount}/{this.hookStressTestMax}");
}
catch (Exception ex)

6
Dalamud/Interface/Internal/Windows/Data/Widgets/IconBrowserWidget.cs
View file

@ -72,11 +72,11 @@ public class IconBrowserWidget : IDataWindowWidget
if (!this.iconIdsTask.IsCompleted)
{
ImGui.TextUnformatted("Loading..."u8);
ImGui.Text("Loading..."u8);
}
else if (!this.iconIdsTask.IsCompletedSuccessfully)
{
ImGui.TextUnformatted(this.iconIdsTask.Exception?.ToString() ?? "Unknown error");
ImGui.Text(this.iconIdsTask.Exception?.ToString() ?? "Unknown error");
}
else
{
@ -165,7 +165,7 @@ public class IconBrowserWidget : IDataWindowWidget
var textSize = ImGui.CalcTextSize(iconId.ToString());
ImGui.SetCursorPosX(
texture.Size.X * scale / 2.0f - textSize.X / 2.0f + ImGui.GetStyle().FramePadding.X * 2.0f);
ImGui.TextUnformatted(iconId.ToString());
ImGui.Text(iconId.ToString());
ImGui.Image(texture.Handle, texture.Size * scale);
ImGui.EndTooltip();

8
Dalamud/Interface/Internal/Windows/Data/Widgets/ImGuiWidget.cs
View file

@ -46,15 +46,15 @@ internal class ImGuiWidget : IDataWindowWidget
var interfaceManager = Service<InterfaceManager>.Get();
var nm = Service<NotificationManager>.Get();
ImGui.TextUnformatted("Monitor count: " + ImGui.GetPlatformIO().Monitors.Size);
ImGui.TextUnformatted("OverrideGameCursor: " + interfaceManager.OverrideGameCursor);
ImGui.Text("Monitor count: " + ImGui.GetPlatformIO().Monitors.Size);
ImGui.Text("OverrideGameCursor: " + interfaceManager.OverrideGameCursor);
ImGui.Button("THIS IS A BUTTON###hoverTestButton"u8);
interfaceManager.OverrideGameCursor = !ImGui.IsItemHovered();
ImGui.Separator();
ImGui.TextUnformatted(
ImGui.Text(
$"WindowSystem.TimeSinceLastAnyFocus: {WindowSystem.TimeSinceLastAnyFocus.TotalMilliseconds:0}ms");
ImGui.Separator();
@ -266,7 +266,7 @@ internal class ImGuiWidget : IDataWindowWidget
n.DrawActions += an =>
{
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted($"{nclick}");
ImGui.Text($"{nclick}");
ImGui.SameLine();
if (ImGui.Button("Update"u8))

16
Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs
View file

@ -101,7 +101,7 @@ internal class InventoryWidget : IDataWindowWidget
}
ImGui.TableNextColumn(); // Size
ImGui.TextUnformatted(items.Length.ToString());
ImGui.Text(items.Length.ToString());
}
}
@ -110,7 +110,7 @@ internal class InventoryWidget : IDataWindowWidget
var items = GameInventoryItem.GetReadOnlySpanOfInventory(inventoryType);
if (items.IsEmpty)
{
ImGui.TextUnformatted($"{inventoryType} is empty.");
ImGui.Text($"{inventoryType} is empty.");
return;
}
@ -131,7 +131,7 @@ internal class InventoryWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableNextColumn(); // Slot
ImGui.TextUnformatted(slotIndex.ToString());
ImGui.Text(slotIndex.ToString());
ImGui.TableNextColumn(); // ItemId
ImGuiHelpers.ClickToCopyText(item.ItemId.ToString());
@ -153,8 +153,8 @@ internal class InventoryWidget : IDataWindowWidget
{
ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
ImGui.BeginTooltip();
ImGui.TextUnformatted("Click to copy IconId"u8);
ImGui.TextUnformatted($"ID: {iconId} – Size: {texture.Width}x{texture.Height}");
ImGui.Text("Click to copy IconId"u8);
ImGui.Text($"ID: {iconId} – Size: {texture.Width}x{texture.Height}");
ImGui.Image(texture.Handle, new(texture.Width, texture.Height));
ImGui.EndTooltip();
}
@ -193,7 +193,7 @@ internal class InventoryWidget : IDataWindowWidget
{
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted(fieldName);
ImGui.Text(fieldName);
ImGui.TableNextColumn();
ImGuiHelpers.ClickToCopyText(value);
}
@ -261,7 +261,7 @@ internal class InventoryWidget : IDataWindowWidget
{
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Stains"u8);
ImGui.Text("Stains"u8);
ImGui.TableNextColumn();
using var stainTable = ImRaii.Table($"{inventoryType}_{slotIndex}_StainTable", 2, ImGuiTableFlags.BordersInner | ImGuiTableFlags.NoSavedSettings);
@ -282,7 +282,7 @@ internal class InventoryWidget : IDataWindowWidget
{
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted("Materia"u8);
ImGui.Text("Materia"u8);
ImGui.TableNextColumn();
using var materiaTable = ImRaii.Table($"{inventoryType}_{slotIndex}_MateriaTable", 2, ImGuiTableFlags.BordersInner | ImGuiTableFlags.NoSavedSettings);

2
Dalamud/Interface/Internal/Windows/Data/Widgets/KeyStateWidget.cs
View file

@ -39,7 +39,7 @@ internal class KeyStateWidget : IDataWindowWidget
ImGui.PushStyleColor(ImGuiCol.Text, value ? ImGuiColors.HealerGreen : ImGuiColors.DPSRed);
ImGui.TextUnformatted($"{vkCode} ({code})");
ImGui.Text($"{vkCode} ({code})");
ImGui.PopStyleColor();

60
Dalamud/Interface/Internal/Windows/Data/Widgets/MarketBoardWidget.cs
View file

@ -206,105 +206,105 @@ internal class MarketBoardWidget : IDataWindowWidget
private void DrawMarketBoardHistory((IMarketBoardHistory History, IMarketBoardHistoryListing Listing) data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.History.ItemId.ToString());
ImGui.Text(data.History.ItemId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.Quantity.ToString());
ImGui.Text(data.Listing.Quantity.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.IsHq.ToString());
ImGui.Text(data.Listing.IsHq.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.SalePrice.ToString());
ImGui.Text(data.Listing.SalePrice.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.BuyerName);
ImGui.Text(data.Listing.BuyerName);
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.PurchaseTime.ToString(CultureInfo.InvariantCulture));
ImGui.Text(data.Listing.PurchaseTime.ToString(CultureInfo.InvariantCulture));
}
private void DrawMarketBoardCurrentOfferings((IMarketBoardCurrentOfferings MarketBoardCurrentOfferings, IMarketBoardItemListing Listing) data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.ItemId.ToString());
ImGui.Text(data.Listing.ItemId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.ItemQuantity.ToString());
ImGui.Text(data.Listing.ItemQuantity.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.IsHq.ToString());
ImGui.Text(data.Listing.IsHq.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.PricePerUnit.ToString());
ImGui.Text(data.Listing.PricePerUnit.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Listing.RetainerName);
ImGui.Text(data.Listing.RetainerName);
}
private void DrawMarketBoardPurchases(IMarketBoardPurchase data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.CatalogId.ToString());
ImGui.Text(data.CatalogId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.ItemQuantity.ToString());
ImGui.Text(data.ItemQuantity.ToString());
}
private void DrawMarketBoardPurchaseRequests(IMarketBoardPurchaseHandler data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.CatalogId.ToString());
ImGui.Text(data.CatalogId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.IsHq.ToString());
ImGui.Text(data.IsHq.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.ItemQuantity.ToString());
ImGui.Text(data.ItemQuantity.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.PricePerUnit.ToString());
ImGui.Text(data.PricePerUnit.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.TotalTax.ToString());
ImGui.Text(data.TotalTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.RetainerCityId.ToString());
ImGui.Text(data.RetainerCityId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.ListingId.ToString());
ImGui.Text(data.ListingId.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.RetainerId.ToString());
ImGui.Text(data.RetainerId.ToString());
}
private void DrawMarketTaxRates(IMarketTaxRates data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.UldahTax.ToString());
ImGui.Text(data.UldahTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.LimsaLominsaTax.ToString());
ImGui.Text(data.LimsaLominsaTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.GridaniaTax.ToString());
ImGui.Text(data.GridaniaTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.IshgardTax.ToString());
ImGui.Text(data.IshgardTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.KuganeTax.ToString());
ImGui.Text(data.KuganeTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.CrystariumTax.ToString());
ImGui.Text(data.CrystariumTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.SharlayanTax.ToString());
ImGui.Text(data.SharlayanTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.TuliyollalTax.ToString());
ImGui.Text(data.TuliyollalTax.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.ValidUntil.ToString(CultureInfo.InvariantCulture));
ImGui.Text(data.ValidUntil.ToString(CultureInfo.InvariantCulture));
}
}

12
Dalamud/Interface/Internal/Windows/Data/Widgets/NetworkMonitorWidget.cs
View file

@ -97,24 +97,24 @@ internal class NetworkMonitorWidget : IDataWindowWidget
private void DrawNetworkPacket(NetworkPacketData data)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.Direction.ToString());
ImGui.Text(data.Direction.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.OpCode.ToString());
ImGui.Text(data.OpCode.ToString());
ImGui.TableNextColumn();
ImGui.TextUnformatted($"0x{data.OpCode:X4}");
ImGui.Text($"0x{data.OpCode:X4}");
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.TargetActorId > 0 ? $"0x{data.TargetActorId:X}" : string.Empty);
ImGui.Text(data.TargetActorId > 0 ? $"0x{data.TargetActorId:X}" : string.Empty);
ImGui.TableNextColumn();
ImGui.TextUnformatted(data.SourceActorId > 0 ? $"0x{data.SourceActorId:X}" : string.Empty);
ImGui.Text(data.SourceActorId > 0 ? $"0x{data.SourceActorId:X}" : string.Empty);
ImGui.TableNextColumn();
if (data.Data.Count > 0)
{
ImGui.TextUnformatted(string.Join(" ", data.Data.Select(b => b.ToString("X2"))));
ImGui.Text(string.Join(" ", data.Data.Select(b => b.ToString("X2"))));
}
else
{

6
Dalamud/Interface/Internal/Windows/Data/Widgets/NounProcessorWidget.cs
View file

@ -117,7 +117,7 @@ internal class NounProcessorWidget : IDataWindowWidget
}
ImGui.SameLine();
ImGui.TextUnformatted($"(Range: {minRowId} - {maxRowId})");
ImGui.Text($"(Range: {minRowId} - {maxRowId})");
ImGui.SetNextItemWidth(120);
if (ImGui.InputInt("Amount###Amount", ref this.amount, 1, 10, flags: ImGuiInputTextFlags.AutoSelectAll))
@ -194,11 +194,11 @@ internal class NounProcessorWidget : IDataWindowWidget
ArticleType = (int)articleType,
GrammaticalCase = currentCase,
};
ImGui.TextUnformatted(nounProcessor.ProcessNoun(nounParams).ExtractText());
ImGui.Text(nounProcessor.ProcessNoun(nounParams).ExtractText());
}
catch (Exception ex)
{
ImGui.TextUnformatted(ex.ToString());
ImGui.Text(ex.ToString());
}
}
}

8
Dalamud/Interface/Internal/Windows/Data/Widgets/ObjectTableWidget.cs
View file

@ -46,11 +46,11 @@ internal class ObjectTableWidget : IDataWindowWidget
if (clientState.LocalPlayer == null)
{
ImGui.TextUnformatted("LocalPlayer null."u8);
ImGui.Text("LocalPlayer null."u8);
}
else if (clientState.IsPvPExcludingDen)
{
ImGui.TextUnformatted("Cannot access object table while in PvP."u8);
ImGui.Text("Cannot access object table while in PvP."u8);
}
else
{
@ -62,7 +62,7 @@ internal class ObjectTableWidget : IDataWindowWidget
stateString += $"LastLinkedItem: {chatGui.LastLinkedItemId}\n";
stateString += $"TerritoryType: {clientState.TerritoryType}\n\n";
ImGui.TextUnformatted(stateString);
ImGui.Text(stateString);
ImGui.Checkbox("Draw characters on screen"u8, ref this.drawCharacters);
ImGui.SliderFloat("Draw Distance"u8, ref this.maxCharaDrawDistance, 2f, 40f);
@ -112,7 +112,7 @@ internal class ObjectTableWidget : IDataWindowWidget
ImGuiWindowFlags.NoDocking |
ImGuiWindowFlags.NoFocusOnAppearing |
ImGuiWindowFlags.NoNav))
ImGui.TextUnformatted(objectText);
ImGui.Text(objectText);
ImGui.End();
}
}

14
Dalamud/Interface/Internal/Windows/Data/Widgets/PartyListWidget.cs
View file

@ -33,28 +33,28 @@ internal class PartyListWidget : IDataWindowWidget
ImGui.Checkbox("Resolve GameData"u8, ref this.resolveGameData);
ImGui.TextUnformatted($"GroupManager: {partyList.GroupManagerAddress.ToInt64():X}");
ImGui.TextUnformatted($"GroupList: {partyList.GroupListAddress.ToInt64():X}");
ImGui.TextUnformatted($"AllianceList: {partyList.AllianceListAddress.ToInt64():X}");
ImGui.Text($"GroupManager: {partyList.GroupManagerAddress.ToInt64():X}");
ImGui.Text($"GroupList: {partyList.GroupListAddress.ToInt64():X}");
ImGui.Text($"AllianceList: {partyList.AllianceListAddress.ToInt64():X}");
ImGui.TextUnformatted($"{partyList.Length} Members");
ImGui.Text($"{partyList.Length} Members");
for (var i = 0; i < partyList.Length; i++)
{
var member = partyList[i];
if (member == null)
{
ImGui.TextUnformatted($"[{i}] was null");
ImGui.Text($"[{i}] was null");
continue;
}
ImGui.TextUnformatted($"[{i}] {member.Address.ToInt64():X} - {member.Name} - {member.GameObject?.GameObjectId}");
ImGui.Text($"[{i}] {member.Address.ToInt64():X} - {member.Name} - {member.GameObject?.GameObjectId}");
if (this.resolveGameData)
{
var actor = member.GameObject;
if (actor == null)
{
ImGui.TextUnformatted("Actor was null"u8);
ImGui.Text("Actor was null"u8);
}
else
{

2
Dalamud/Interface/Internal/Windows/Data/Widgets/PluginIpcWidget.cs
View file

@ -120,6 +120,6 @@ internal class PluginIpcWidget : IDataWindowWidget
}
if (!this.callGateResponse.IsNullOrEmpty())
ImGui.TextUnformatted($"Response: {this.callGateResponse}");
ImGui.Text($"Response: {this.callGateResponse}");
}
}

2
Dalamud/Interface/Internal/Windows/Data/Widgets/SeFontTestWidget.cs
View file

@ -36,6 +36,6 @@ internal class SeFontTestWidget : IDataWindowWidget
for (var i = min; i <= max; i++)
specialChars += $"0x{(int)i:X} - {(SeIconChar)i} - {i}\n";
ImGui.TextUnformatted(specialChars);
ImGui.Text(specialChars);
}
}

56
Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs
View file

@ -272,10 +272,10 @@ internal class SeStringCreatorWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableNextColumn(); // Id
ImGui.TextUnformatted(i.ToString());
ImGui.Text(i.ToString());
ImGui.TableNextColumn(); // Type
ImGui.TextUnformatted(item.Type.ToString());
ImGui.Text(item.Type.ToString());
ImGui.TableNextColumn(); // ValuePtr
WidgetUtil.DrawCopyableText($"0x{(nint)item.ValuePtr:X}");
@ -293,7 +293,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
if (item.ReferencedUtf8StringValue != null)
WidgetUtil.DrawCopyableText(new ReadOnlySeStringSpan(item.ReferencedUtf8StringValue->Utf8String).ToString());
else
ImGui.TextUnformatted("null"u8);
ImGui.Text("null"u8);
break;
@ -301,12 +301,12 @@ internal class SeStringCreatorWidget : IDataWindowWidget
if (item.StringValue.Value != null)
WidgetUtil.DrawCopyableText(item.StringValue.ToString());
else
ImGui.TextUnformatted("null"u8);
ImGui.Text("null"u8);
break;
}
ImGui.TableNextColumn();
ImGui.TextUnformatted(i switch
ImGui.Text(i switch
{
0 => "Player Name",
1 => "Temp Player 1 Name",
@ -522,7 +522,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
if (!raptureTextModule->MacroEncoder.EncoderError.IsEmpty)
{
ImGui.SameLine();
ImGui.TextUnformatted(raptureTextModule->MacroEncoder.EncoderError.ToString()); // TODO: EncoderError doesn't clear
ImGui.Text(raptureTextModule->MacroEncoder.EncoderError.ToString()); // TODO: EncoderError doesn't clear
}
ImGui.SameLine();
@ -579,7 +579,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
var rowIdChanged = ImGui.InputInt("RowId"u8, ref this.importRowId, 1, 10);
ImGui.SameLine(0, ImGui.GetStyle().ItemInnerSpacing.X);
ImGui.TextUnformatted($"(Range: {minRowId} - {maxRowId})");
ImGui.Text($"(Range: {minRowId} - {maxRowId})");
if (sheetChanged || rowIdChanged)
{
@ -596,7 +596,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
return;
}
ImGui.TextUnformatted("Select string to add:"u8);
ImGui.Text("Select string to add:"u8);
using var table = ImRaii.Table("StringSelectionTable"u8, 2, ImGuiTableFlags.Borders | ImGuiTableFlags.NoSavedSettings);
if (!table) return;
@ -618,7 +618,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted(i.ToString());
ImGui.Text(i.ToString());
ImGui.TableNextColumn();
if (ImGui.Selectable($"{value.ToString().Truncate(100)}###Column{i}"))
@ -644,7 +644,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
}
catch (Exception e)
{
ImGui.TextUnformatted(e.Message);
ImGui.Text(e.Message);
return;
}
}
@ -904,7 +904,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted(payload.Type == ReadOnlySePayloadType.Text ? "Text" : "ToString()");
ImGui.Text(payload.Type == ReadOnlySePayloadType.Text ? "Text" : "ToString()");
ImGui.TableNextColumn();
var text = payload.ToString();
WidgetUtil.DrawCopyableText($"\"{text}\"", text);
@ -944,13 +944,13 @@ internal class SeStringCreatorWidget : IDataWindowWidget
ImGui.TableNextColumn();
var expressionName = this.GetExpressionName(macroCode, subType, exprIdx, expr);
ImGui.TextUnformatted($"[{exprIdx}] " + (string.IsNullOrEmpty(expressionName) ? $"Expr {exprIdx}" : expressionName));
ImGui.Text($"[{exprIdx}] " + (string.IsNullOrEmpty(expressionName) ? $"Expr {exprIdx}" : expressionName));
ImGui.TableNextColumn();
if (expr.Body.IsEmpty)
{
ImGui.TextUnformatted("(?)"u8);
ImGui.Text("(?)"u8);
return;
}
@ -994,7 +994,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
if (!string.IsNullOrEmpty(name))
{
ImGui.SameLine();
ImGui.TextUnformatted(name);
ImGui.Text(name);
}
}
@ -1015,13 +1015,13 @@ internal class SeStringCreatorWidget : IDataWindowWidget
_ => typeof(EnglishArticleType),
};
ImGui.SameLine();
ImGui.TextUnformatted(Enum.GetName(articleTypeEnumType, u32));
ImGui.Text(Enum.GetName(articleTypeEnumType, u32));
}
if (macroCode is MacroCode.DeNoun && exprIdx == 4 && u32 is >= 0 and <= 4)
{
ImGui.SameLine();
ImGui.TextUnformatted(NounProcessorWidget.GermanCases[u32]);
ImGui.Text(NounProcessorWidget.GermanCases[u32]);
}
if (macroCode is MacroCode.Fixed && subType != null && fixedType != null && fixedType is 100 or 200 && subType == 5 && exprIdx == 2)
@ -1041,34 +1041,34 @@ internal class SeStringCreatorWidget : IDataWindowWidget
{
case LinkMacroPayloadType.Item when dataManager.GetExcelSheet<Item>(this.language).TryGetRow(u32, out var itemRow):
ImGui.SameLine();
ImGui.TextUnformatted(itemRow.Name.ExtractText());
ImGui.Text(itemRow.Name.ExtractText());
break;
case LinkMacroPayloadType.Quest when dataManager.GetExcelSheet<Quest>(this.language).TryGetRow(u32, out var questRow):
ImGui.SameLine();
ImGui.TextUnformatted(questRow.Name.ExtractText());
ImGui.Text(questRow.Name.ExtractText());
break;
case LinkMacroPayloadType.Achievement when dataManager.GetExcelSheet<Achievement>(this.language).TryGetRow(u32, out var achievementRow):
ImGui.SameLine();
ImGui.TextUnformatted(achievementRow.Name.ExtractText());
ImGui.Text(achievementRow.Name.ExtractText());
break;
case LinkMacroPayloadType.HowTo when dataManager.GetExcelSheet<HowTo>(this.language).TryGetRow(u32, out var howToRow):
ImGui.SameLine();
ImGui.TextUnformatted(howToRow.Name.ExtractText());
ImGui.Text(howToRow.Name.ExtractText());
break;
case LinkMacroPayloadType.Status when dataManager.GetExcelSheet<Status>(this.language).TryGetRow(u32, out var statusRow):
ImGui.SameLine();
ImGui.TextUnformatted(statusRow.Name.ExtractText());
ImGui.Text(statusRow.Name.ExtractText());
break;
case LinkMacroPayloadType.AkatsukiNote when
dataManager.GetSubrowExcelSheet<AkatsukiNote>(this.language).TryGetRow(u32, out var akatsukiNoteRow) &&
dataManager.GetExcelSheet<AkatsukiNoteString>(this.language).TryGetRow((uint)akatsukiNoteRow[0].Unknown2, out var akatsukiNoteStringRow):
ImGui.SameLine();
ImGui.TextUnformatted(akatsukiNoteStringRow.Unknown0.ExtractText());
ImGui.Text(akatsukiNoteStringRow.Unknown0.ExtractText());
break;
}
}
@ -1086,11 +1086,11 @@ internal class SeStringCreatorWidget : IDataWindowWidget
{
if (((ExpressionType)exprType).GetNativeName() is { } nativeName)
{
ImGui.TextUnformatted(nativeName);
ImGui.Text(nativeName);
return;
}
ImGui.TextUnformatted($"?x{exprType:X02}");
ImGui.Text($"?x{exprType:X02}");
return;
}
@ -1098,7 +1098,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
{
if (((ExpressionType)exprType).GetNativeName() is { } nativeName)
{
ImGui.TextUnformatted($"{nativeName}({e1.ToString()})");
ImGui.Text($"{nativeName}({e1.ToString()})");
return;
}
@ -1109,7 +1109,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
{
if (((ExpressionType)exprType).GetNativeName() is { } nativeName)
{
ImGui.TextUnformatted($"{e1.ToString()} {nativeName} {e2.ToString()}");
ImGui.Text($"{e1.ToString()} {nativeName} {e2.ToString()}");
return;
}
@ -1122,7 +1122,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
for (var i = 1; i < expr.Body.Length; i++)
sb.Append($" {expr.Body[i]:X02}");
sb.Append(')');
ImGui.TextUnformatted(sb.ToString());
ImGui.Text(sb.ToString());
}
private string GetExpressionName(MacroCode macroCode, uint? subType, int idx, ReadOnlySeExpressionSpan expr)
@ -1258,7 +1258,7 @@ internal class SeStringCreatorWidget : IDataWindowWidget
if (ImGui.IsItemHovered())
{
ImGui.BeginTooltip();
ImGui.TextUnformatted(tooltip);
ImGui.Text(tooltip);
ImGui.EndTooltip();
}

4
Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringRendererTestWidget.cs
View file

@ -203,7 +203,7 @@ internal unsafe class SeStringRendererTestWidget : IDataWindowWidget
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted($"{row.RowId}");
ImGui.Text($"{row.RowId}");
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();
@ -299,7 +299,7 @@ internal unsafe class SeStringRendererTestWidget : IDataWindowWidget
ImGui.Separator();
if (this.alignToFramePadding)
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted($"Hovered[{offset}]: {new ReadOnlySeStringSpan(envelope).ToString()}; {payload}");
ImGui.Text($"Hovered[{offset}]: {new ReadOnlySeStringSpan(envelope).ToString()}; {payload}");
if (clicked && payload is DalamudLinkPayload { Plugin: "test" } dlp)
Util.OpenLink(dlp.ExtraString);
}

12
Dalamud/Interface/Internal/Windows/Data/Widgets/ServicesWidget.cs
View file

@ -196,10 +196,10 @@ internal class ServicesWidget : IDataWindowWidget
ImGui.SetCursorPos((new Vector2(rc.X, rc.Y) - pos) + ((cellSize - textSize) / 2));
ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, Vector2.Zero);
ImGui.TextUnformatted(node.DisplayedName);
ImGui.Text(node.DisplayedName);
ImGui.SameLine();
ImGui.PushStyleColor(ImGuiCol.Text, node.TypeSuffixColor);
ImGui.TextUnformatted(node.TypeSuffix);
ImGui.Text(node.TypeSuffix);
ImGui.PopStyleVar();
ImGui.PopStyleColor();
}
@ -248,21 +248,21 @@ internal class ServicesWidget : IDataWindowWidget
if (isPublic)
{
using var color = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
ImGui.TextUnformatted("\t => PUBLIC!!!"u8);
ImGui.Text("\t => PUBLIC!!!"u8);
}
switch (instance.Value.Visibility)
{
case ObjectInstanceVisibility.Internal:
ImGui.TextUnformatted("\t => Internally resolved"u8);
ImGui.Text("\t => Internally resolved"u8);
break;
case ObjectInstanceVisibility.ExposedToPlugins:
var hasInterface = container.InterfaceToTypeMap.Values.Any(x => x == instance.Key);
using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed, !hasInterface))
{
ImGui.TextUnformatted("\t => Exposed to plugins!"u8);
ImGui.TextUnformatted(
ImGui.Text("\t => Exposed to plugins!"u8);
ImGui.Text(
hasInterface
? $"\t => Provided via interface: {container.InterfaceToTypeMap.First(x => x.Value == instance.Key).Key.FullName}"
: "\t => NO INTERFACE!!!");

2
Dalamud/Interface/Internal/Windows/Data/Widgets/StartInfoWidget.cs
View file

@ -28,6 +28,6 @@ internal class StartInfoWidget : IDataWindowWidget
{
var startInfo = Service<Dalamud>.Get().StartInfo;
ImGui.TextUnformatted(JsonConvert.SerializeObject(startInfo, Formatting.Indented));
ImGui.Text(JsonConvert.SerializeObject(startInfo, Formatting.Indented));
}
}

6
Dalamud/Interface/Internal/Windows/Data/Widgets/TargetWidget.cs
View file

@ -40,7 +40,7 @@ internal class TargetWidget : IDataWindowWidget
{
Util.PrintGameObject(targetMgr.Target, "CurrentTarget", this.resolveGameData);
ImGui.TextUnformatted("Target"u8);
ImGui.Text("Target"u8);
Util.ShowGameObjectStruct(targetMgr.Target);
var tot = targetMgr.Target.TargetObject;
@ -49,7 +49,7 @@ internal class TargetWidget : IDataWindowWidget
ImGuiHelpers.ScaledDummy(10);
ImGui.Separator();
ImGui.TextUnformatted("ToT"u8);
ImGui.Text("ToT"u8);
Util.ShowGameObjectStruct(tot);
}
@ -92,7 +92,7 @@ internal class TargetWidget : IDataWindowWidget
}
else
{
ImGui.TextUnformatted("LocalPlayer is null."u8);
ImGui.Text("LocalPlayer is null."u8);
}
}
}

12
Dalamud/Interface/Internal/Windows/Data/Widgets/TaskSchedulerWidget.cs
View file

@ -69,7 +69,7 @@ internal class TaskSchedulerWidget : IDataWindowWidget
this.taskSchedulerCancelSource = new();
}
ImGui.TextUnformatted("Run in any thread: "u8);
ImGui.Text("Run in any thread: "u8);
ImGui.SameLine();
if (ImGui.Button("Short Task.Run"u8))
@ -104,7 +104,7 @@ internal class TaskSchedulerWidget : IDataWindowWidget
});
}
ImGui.TextUnformatted("Run in Framework.Update: "u8);
ImGui.Text("Run in Framework.Update: "u8);
ImGui.SameLine();
if (ImGui.Button("ASAP"u8))
@ -264,12 +264,12 @@ internal class TaskSchedulerWidget : IDataWindowWidget
});
}
ImGui.TextUnformatted($"{this.downloadState.Downloaded:##,###}/{this.downloadState.Total:##,###} ({this.downloadState.Percentage:0.00}%)");
ImGui.Text($"{this.downloadState.Downloaded:##,###}/{this.downloadState.Total:##,###} ({this.downloadState.Percentage:0.00}%)");
using var disabled =
ImRaii.Disabled(this.downloadTask?.IsCompleted is false || this.localPath[0] == 0);
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted("Download"u8);
ImGui.Text("Download"u8);
ImGui.SameLine();
var downloadUsingGlobalScheduler = ImGui.Button("using default scheduler"u8);
ImGui.SameLine();
@ -430,13 +430,13 @@ internal class TaskSchedulerWidget : IDataWindowWidget
ImGuiHelpers.ScaledDummy(10);
ImGui.TextUnformatted(task.StackTrace?.ToString());
ImGui.Text(task.StackTrace?.ToString());
if (task.Exception != null)
{
ImGuiHelpers.ScaledDummy(15);
ImGuiHelpers.SafeTextColored(ImGuiColors.DalamudRed, "EXCEPTION:"u8);
ImGui.TextUnformatted(task.Exception.ToString());
ImGui.Text(task.Exception.ToString());
}
}
else

14
Dalamud/Interface/Internal/Windows/Data/Widgets/TexWidget.cs
View file

@ -305,13 +305,13 @@ internal class TexWidget : IDataWindowWidget
pres->Release();
pres->Release();
ImGui.TextUnformatted($"RC: Resource({rcres})/View({rcsrv})");
ImGui.TextUnformatted(source.ToString());
ImGui.Text($"RC: Resource({rcres})/View({rcsrv})");
ImGui.Text(source.ToString());
}
else
{
ImGui.TextUnformatted("RC: -"u8);
ImGui.TextUnformatted(" "u8);
ImGui.Text("RC: -"u8);
ImGui.Text(" "u8);
}
}
@ -327,12 +327,12 @@ internal class TexWidget : IDataWindowWidget
}
else
{
ImGui.TextUnformatted(t.DescribeError() ?? "Loading");
ImGui.Text(t.DescribeError() ?? "Loading");
}
}
catch (Exception e)
{
ImGui.TextUnformatted(e.ToString());
ImGui.Text(e.ToString());
}
}
@ -566,7 +566,7 @@ internal class TexWidget : IDataWindowWidget
// Should not happen
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted("?"u8);
ImGui.Text("?"u8);
continue;
}

2
Dalamud/Interface/Internal/Windows/Data/Widgets/UIColorWidget.cs
View file

@ -87,7 +87,7 @@ internal class UiColorWidget : IDataWindowWidget
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted($"{id}");
ImGui.Text($"{id}");
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();

94
Dalamud/Interface/Internal/Windows/Data/Widgets/UldWidget.cs
View file

@ -96,7 +96,7 @@ internal class UldWidget : IDataWindowWidget
ClearTask(ref this.uldNamesTask);
goto default;
default:
ImGui.TextUnformatted("Loading..."u8);
ImGui.Text("Loading..."u8);
return;
}
@ -109,7 +109,7 @@ internal class UldWidget : IDataWindowWidget
if (ImGuiComponents.IconButton("selectUldRight", FontAwesomeIcon.AngleRight))
this.selectedUld = (this.selectedUld + 1) % uldNames.Length;
ImGui.SameLine();
ImGui.TextUnformatted("Select ULD File"u8);
ImGui.Text("Select ULD File"u8);
if (selectedUldPrev != this.selectedUld)
{
// reset selected parts when changing ULD
@ -125,7 +125,7 @@ internal class UldWidget : IDataWindowWidget
if (ImGuiComponents.IconButton("selectThemeRight", FontAwesomeIcon.AngleRight))
this.selectedTheme = (this.selectedTheme + 1) % ThemeDisplayNames.Length;
ImGui.SameLine();
ImGui.TextUnformatted("Select Theme"u8);
ImGui.Text("Select Theme"u8);
var dataManager = Service<DataManager>.Get();
var textureManager = Service<TextureManager>.Get();
@ -146,7 +146,7 @@ internal class UldWidget : IDataWindowWidget
this.selectedUldFileTask = null;
goto default;
default:
ImGui.TextUnformatted("Loading..."u8);
ImGui.Text("Loading..."u8);
return;
}
@ -182,7 +182,7 @@ internal class UldWidget : IDataWindowWidget
}
else if (uld.Timelines.Length == 0)
{
ImGui.TextUnformatted("No entry exists."u8);
ImGui.Text("No entry exists."u8);
}
else
{
@ -201,7 +201,7 @@ internal class UldWidget : IDataWindowWidget
}
else if (uld.Parts.Length == 0)
{
ImGui.TextUnformatted("No entry exists."u8);
ImGui.Text("No entry exists."u8);
}
else
{
@ -269,7 +269,7 @@ internal class UldWidget : IDataWindowWidget
{
var path = GetStringNullTerminated(textureEntry.Path);
ImGui.TableNextColumn();
ImGui.TextUnformatted(textureEntry.Id.ToString());
ImGui.Text(textureEntry.Id.ToString());
ImGui.TableNextColumn();
this.TextColumnCopiable(path, false, false);
@ -278,27 +278,27 @@ internal class UldWidget : IDataWindowWidget
if (string.IsNullOrWhiteSpace(path))
return;
ImGui.TextUnformatted("Preview"u8);
ImGui.Text("Preview"u8);
if (ImGui.IsItemHovered())
{
ImGui.BeginTooltip();
var texturePath = GetStringNullTerminated(textureEntry.Path);
ImGui.TextUnformatted($"Base path at {texturePath}:");
ImGui.Text($"Base path at {texturePath}:");
if (textureManager.Shared.GetFromGame(texturePath).TryGetWrap(out var wrap, out var e))
ImGui.Image(wrap.Handle, wrap.Size);
else if (e is not null)
ImGui.TextUnformatted(e.ToString());
ImGui.Text(e.ToString());
if (this.selectedTheme != 0)
{
var texturePathThemed = this.ToThemedPath(texturePath);
ImGui.TextUnformatted($"Themed path at {texturePathThemed}:");
ImGui.Text($"Themed path at {texturePathThemed}:");
if (textureManager.Shared.GetFromGame(texturePathThemed).TryGetWrap(out wrap, out e))
ImGui.Image(wrap.Handle, wrap.Size);
else if (e is not null)
ImGui.TextUnformatted(e.ToString());
ImGui.Text(e.ToString());
}
ImGui.EndTooltip();
@ -309,11 +309,11 @@ internal class UldWidget : IDataWindowWidget
{
ImGui.SliderInt("FrameData"u8, ref this.selectedFrameData, 0, timeline.FrameData.Length - 1);
var frameData = timeline.FrameData[this.selectedFrameData];
ImGui.TextUnformatted($"FrameInfo: {frameData.StartFrame} -> {frameData.EndFrame}");
ImGui.Text($"FrameInfo: {frameData.StartFrame} -> {frameData.EndFrame}");
ImGui.Indent();
foreach (var frameDataKeyGroup in frameData.KeyGroups)
{
ImGui.TextUnformatted($"{frameDataKeyGroup.Usage:G} {frameDataKeyGroup.Type:G}");
ImGui.Text($"{frameDataKeyGroup.Usage:G} {frameDataKeyGroup.Type:G}");
foreach (var keyframe in frameDataKeyGroup.Frames)
this.DrawTimelineKeyGroupFrame(keyframe);
}
@ -326,147 +326,147 @@ internal class UldWidget : IDataWindowWidget
switch (frame)
{
case BaseKeyframeData baseKeyframeData:
ImGui.TextUnformatted(
ImGui.Text(
$"Time: {baseKeyframeData.Time} | Interpolation: {baseKeyframeData.Interpolation} | Acceleration: {baseKeyframeData.Acceleration} | Deceleration: {baseKeyframeData.Deceleration}");
break;
case Float1Keyframe float1Keyframe:
this.DrawTimelineKeyGroupFrame(float1Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value: {float1Keyframe.Value}");
ImGui.Text($" | Value: {float1Keyframe.Value}");
break;
case Float2Keyframe float2Keyframe:
this.DrawTimelineKeyGroupFrame(float2Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value1: {float2Keyframe.Value[0]} | Value2: {float2Keyframe.Value[1]}");
ImGui.Text($" | Value1: {float2Keyframe.Value[0]} | Value2: {float2Keyframe.Value[1]}");
break;
case Float3Keyframe float3Keyframe:
this.DrawTimelineKeyGroupFrame(float3Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | Value1: {float3Keyframe.Value[0]} | Value2: {float3Keyframe.Value[1]} | Value3: {float3Keyframe.Value[2]}");
break;
case SByte1Keyframe sbyte1Keyframe:
this.DrawTimelineKeyGroupFrame(sbyte1Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value: {sbyte1Keyframe.Value}");
ImGui.Text($" | Value: {sbyte1Keyframe.Value}");
break;
case SByte2Keyframe sbyte2Keyframe:
this.DrawTimelineKeyGroupFrame(sbyte2Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value1: {sbyte2Keyframe.Value[0]} | Value2: {sbyte2Keyframe.Value[1]}");
ImGui.Text($" | Value1: {sbyte2Keyframe.Value[0]} | Value2: {sbyte2Keyframe.Value[1]}");
break;
case SByte3Keyframe sbyte3Keyframe:
this.DrawTimelineKeyGroupFrame(sbyte3Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | Value1: {sbyte3Keyframe.Value[0]} | Value2: {sbyte3Keyframe.Value[1]} | Value3: {sbyte3Keyframe.Value[2]}");
break;
case Byte1Keyframe byte1Keyframe:
this.DrawTimelineKeyGroupFrame(byte1Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value: {byte1Keyframe.Value}");
ImGui.Text($" | Value: {byte1Keyframe.Value}");
break;
case Byte2Keyframe byte2Keyframe:
this.DrawTimelineKeyGroupFrame(byte2Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value1: {byte2Keyframe.Value[0]} | Value2: {byte2Keyframe.Value[1]}");
ImGui.Text($" | Value1: {byte2Keyframe.Value[0]} | Value2: {byte2Keyframe.Value[1]}");
break;
case Byte3Keyframe byte3Keyframe:
this.DrawTimelineKeyGroupFrame(byte3Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | Value1: {byte3Keyframe.Value[0]} | Value2: {byte3Keyframe.Value[1]} | Value3: {byte3Keyframe.Value[2]}");
break;
case Short1Keyframe short1Keyframe:
this.DrawTimelineKeyGroupFrame(short1Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value: {short1Keyframe.Value}");
ImGui.Text($" | Value: {short1Keyframe.Value}");
break;
case Short2Keyframe short2Keyframe:
this.DrawTimelineKeyGroupFrame(short2Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value1: {short2Keyframe.Value[0]} | Value2: {short2Keyframe.Value[1]}");
ImGui.Text($" | Value1: {short2Keyframe.Value[0]} | Value2: {short2Keyframe.Value[1]}");
break;
case Short3Keyframe short3Keyframe:
this.DrawTimelineKeyGroupFrame(short3Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | Value1: {short3Keyframe.Value[0]} | Value2: {short3Keyframe.Value[1]} | Value3: {short3Keyframe.Value[2]}");
break;
case UShort1Keyframe ushort1Keyframe:
this.DrawTimelineKeyGroupFrame(ushort1Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value: {ushort1Keyframe.Value}");
ImGui.Text($" | Value: {ushort1Keyframe.Value}");
break;
case UShort2Keyframe ushort2Keyframe:
this.DrawTimelineKeyGroupFrame(ushort2Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value1: {ushort2Keyframe.Value[0]} | Value2: {ushort2Keyframe.Value[1]}");
ImGui.Text($" | Value1: {ushort2Keyframe.Value[0]} | Value2: {ushort2Keyframe.Value[1]}");
break;
case UShort3Keyframe ushort3Keyframe:
this.DrawTimelineKeyGroupFrame(ushort3Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | Value1: {ushort3Keyframe.Value[0]} | Value2: {ushort3Keyframe.Value[1]} | Value3: {ushort3Keyframe.Value[2]}");
break;
case Int1Keyframe int1Keyframe:
this.DrawTimelineKeyGroupFrame(int1Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value: {int1Keyframe.Value}");
ImGui.Text($" | Value: {int1Keyframe.Value}");
break;
case Int2Keyframe int2Keyframe:
this.DrawTimelineKeyGroupFrame(int2Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value1: {int2Keyframe.Value[0]} | Value2: {int2Keyframe.Value[1]}");
ImGui.Text($" | Value1: {int2Keyframe.Value[0]} | Value2: {int2Keyframe.Value[1]}");
break;
case Int3Keyframe int3Keyframe:
this.DrawTimelineKeyGroupFrame(int3Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | Value1: {int3Keyframe.Value[0]} | Value2: {int3Keyframe.Value[1]} | Value3: {int3Keyframe.Value[2]}");
break;
case UInt1Keyframe uint1Keyframe:
this.DrawTimelineKeyGroupFrame(uint1Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value: {uint1Keyframe.Value}");
ImGui.Text($" | Value: {uint1Keyframe.Value}");
break;
case UInt2Keyframe uint2Keyframe:
this.DrawTimelineKeyGroupFrame(uint2Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value1: {uint2Keyframe.Value[0]} | Value2: {uint2Keyframe.Value[1]}");
ImGui.Text($" | Value1: {uint2Keyframe.Value[0]} | Value2: {uint2Keyframe.Value[1]}");
break;
case UInt3Keyframe uint3Keyframe:
this.DrawTimelineKeyGroupFrame(uint3Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | Value1: {uint3Keyframe.Value[0]} | Value2: {uint3Keyframe.Value[1]} | Value3: {uint3Keyframe.Value[2]}");
break;
case Bool1Keyframe bool1Keyframe:
this.DrawTimelineKeyGroupFrame(bool1Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value: {bool1Keyframe.Value}");
ImGui.Text($" | Value: {bool1Keyframe.Value}");
break;
case Bool2Keyframe bool2Keyframe:
this.DrawTimelineKeyGroupFrame(bool2Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted($" | Value1: {bool2Keyframe.Value[0]} | Value2: {bool2Keyframe.Value[1]}");
ImGui.Text($" | Value1: {bool2Keyframe.Value[0]} | Value2: {bool2Keyframe.Value[1]}");
break;
case Bool3Keyframe bool3Keyframe:
this.DrawTimelineKeyGroupFrame(bool3Keyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | Value1: {bool3Keyframe.Value[0]} | Value2: {bool3Keyframe.Value[1]} | Value3: {bool3Keyframe.Value[2]}");
break;
case ColorKeyframe colorKeyframe:
this.DrawTimelineKeyGroupFrame(colorKeyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | Add: {colorKeyframe.AddRed} {colorKeyframe.AddGreen} {colorKeyframe.AddBlue} | Multiply: {colorKeyframe.MultiplyRed} {colorKeyframe.MultiplyGreen} {colorKeyframe.MultiplyBlue}");
break;
case LabelKeyframe labelKeyframe:
this.DrawTimelineKeyGroupFrame(labelKeyframe.Keyframe);
ImGui.SameLine(0, 0);
ImGui.TextUnformatted(
ImGui.Text(
$" | LabelCommand: {labelKeyframe.LabelCommand} | JumpId: {labelKeyframe.JumpId} | LabelId: {labelKeyframe.LabelId}");
break;
}
@ -479,7 +479,7 @@ internal class UldWidget : IDataWindowWidget
{
for (var index = 0; index < partsData.Parts.Length; index++)
{
ImGui.TextUnformatted($"Index: {index}");
ImGui.Text($"Index: {index}");
var partsDataPart = partsData.Parts[index];
ImGui.SameLine();
@ -494,14 +494,14 @@ internal class UldWidget : IDataWindowWidget
if (path is null)
{
ImGui.TextUnformatted($"Could not find texture for id {partsDataPart.TextureId}");
ImGui.Text($"Could not find texture for id {partsDataPart.TextureId}");
continue;
}
var texturePath = GetStringNullTerminated(path);
if (string.IsNullOrWhiteSpace(texturePath))
{
ImGui.TextUnformatted("Texture path is empty."u8);
ImGui.Text("Texture path is empty."u8);
continue;
}
@ -518,7 +518,7 @@ internal class UldWidget : IDataWindowWidget
// neither the supposedly original path nor themed path had a file we could load.
if (e is not null && e2 is not null)
{
ImGui.TextUnformatted($"{texturePathThemed}: {e}\n{texturePath}: {e2}");
ImGui.Text($"{texturePathThemed}: {e}\n{texturePath}: {e2}");
continue;
}
}
@ -542,8 +542,8 @@ internal class UldWidget : IDataWindowWidget
if (ImGui.IsItemHovered())
{
ImGui.BeginTooltip();
ImGui.TextUnformatted("Click to copy:"u8);
ImGui.TextUnformatted(texturePath);
ImGui.Text("Click to copy:"u8);
ImGui.Text(texturePath);
ImGui.EndTooltip();
}
}

62
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -692,7 +692,7 @@ internal class PluginInstallerWindow : Window, IDisposable
var headerText = Locs.Header_Hint;
var headerTextSize = ImGui.CalcTextSize(headerText);
ImGui.TextUnformatted(headerText);
ImGui.Text(headerText);
ImGui.SameLine();
@ -925,7 +925,7 @@ internal class PluginInstallerWindow : Window, IDisposable
if (ImGui.BeginPopupModal(modalTitle, ref this.errorModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
{
ImGui.TextUnformatted(this.errorModalMessage);
ImGui.Text(this.errorModalMessage);
ImGui.Spacing();
var buttonWidth = 120f;
@ -961,7 +961,7 @@ internal class PluginInstallerWindow : Window, IDisposable
if (ImGui.BeginPopupModal(modalTitle, ref this.updateModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
{
ImGui.TextUnformatted(Locs.UpdateModal_UpdateAvailable(this.updateModalPlugin.Name));
ImGui.Text(Locs.UpdateModal_UpdateAvailable(this.updateModalPlugin.Name));
ImGui.Spacing();
var buttonWidth = 120f;
@ -1002,7 +1002,7 @@ internal class PluginInstallerWindow : Window, IDisposable
if (ImGui.BeginPopupModal(modalTitle, ref this.testingWarningModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
{
ImGui.TextUnformatted(Locs.TestingWarningModal_DowngradeBody);
ImGui.Text(Locs.TestingWarningModal_DowngradeBody);
ImGuiHelpers.ScaledDummy(10);
@ -1047,11 +1047,11 @@ internal class PluginInstallerWindow : Window, IDisposable
if (this.deletePluginConfigWarningModalExplainTesting)
{
ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudOrange);
ImGui.TextUnformatted(Locs.DeletePluginConfigWarningModal_ExplainTesting());
ImGui.Text(Locs.DeletePluginConfigWarningModal_ExplainTesting());
ImGui.PopStyleColor();
}
ImGui.TextUnformatted(Locs.DeletePluginConfigWarningModal_Body(this.deletePluginConfigWarningModalPluginName));
ImGui.Text(Locs.DeletePluginConfigWarningModal_Body(this.deletePluginConfigWarningModalPluginName));
ImGui.Spacing();
var buttonWidth = 120f;
@ -1092,7 +1092,7 @@ internal class PluginInstallerWindow : Window, IDisposable
if (ImGui.BeginPopupModal(modalTitle, ref this.feedbackModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
{
ImGui.TextUnformatted(Locs.FeedbackModal_Text(this.feedbackPlugin.Name));
ImGui.Text(Locs.FeedbackModal_Text(this.feedbackPlugin.Name));
if (this.feedbackPlugin?.FeedbackMessage != null)
{
@ -1123,7 +1123,7 @@ internal class PluginInstallerWindow : Window, IDisposable
});
}
ImGui.TextUnformatted(Locs.FeedbackModal_ContactInformationHelp);
ImGui.Text(Locs.FeedbackModal_ContactInformationHelp);
ImGuiHelpers.SafeTextColored(ImGuiColors.DalamudRed, Locs.FeedbackModal_ContactInformationWarning);
@ -1706,7 +1706,7 @@ internal class PluginInstallerWindow : Window, IDisposable
break;
default:
ImGui.TextUnformatted("You found a mysterious category. Please keep it to yourself."u8);
ImGui.Text("You found a mysterious category. Please keep it to yourself."u8);
break;
}
@ -1731,7 +1731,7 @@ internal class PluginInstallerWindow : Window, IDisposable
break;
default:
ImGui.TextUnformatted("You found a secret category. Please feel a sense of pride and accomplishment."u8);
ImGui.Text("You found a secret category. Please feel a sense of pride and accomplishment."u8);
break;
}
@ -1752,7 +1752,7 @@ internal class PluginInstallerWindow : Window, IDisposable
break;
default:
ImGui.TextUnformatted("You found a quiet category. Please don't wake it up."u8);
ImGui.Text("You found a quiet category. Please don't wake it up."u8);
break;
}
@ -1813,7 +1813,7 @@ internal class PluginInstallerWindow : Window, IDisposable
var cursor = ImGui.GetCursorPos();
// Name
ImGui.TextUnformatted("My Cool Plugin"u8);
ImGui.Text("My Cool Plugin"u8);
// Download count
var downloadCountText = Locs.PluginBody_AuthorWithDownloadCount("Plugin Enjoyer", 69420);
@ -1887,13 +1887,13 @@ internal class PluginInstallerWindow : Window, IDisposable
if (!imageTask.IsCompleted)
{
ImGui.TextUnformatted("Loading..."u8);
ImGui.Text("Loading..."u8);
continue;
}
if (imageTask.Exception is not null)
{
ImGui.TextUnformatted(imageTask.Exception.ToString());
ImGui.Text(imageTask.Exception.ToString());
continue;
}
@ -1961,7 +1961,7 @@ internal class PluginInstallerWindow : Window, IDisposable
if (!imageTask.IsCompleted)
{
ImGui.TextUnformatted("Loading..."u8);
ImGui.Text("Loading..."u8);
return;
}
@ -1969,19 +1969,19 @@ internal class PluginInstallerWindow : Window, IDisposable
if (imageTask.Exception is { } exc)
{
ImGui.TextUnformatted(exc.ToString());
ImGui.Text(exc.ToString());
}
else
{
var image = imageTask.Result;
if (image.Width > maxWidth || image.Height > maxHeight)
{
ImGui.TextUnformatted(
ImGui.Text(
$"Image is larger than the maximum allowed resolution ({image.Width}x{image.Height} > {maxWidth}x{maxHeight})");
}
if (requireSquare && image.Width != image.Height)
ImGui.TextUnformatted($"Image must be square! Current size: {image.Width}x{image.Height}");
ImGui.Text($"Image must be square! Current size: {image.Width}x{image.Height}");
}
ImGui.PopStyleColor();
@ -2218,12 +2218,12 @@ internal class PluginInstallerWindow : Window, IDisposable
var cursor = ImGui.GetCursorPos();
// Name
ImGui.TextUnformatted(label);
ImGui.Text(label);
// Verified Checkmark or dev plugin wrench
{
ImGui.SameLine();
ImGui.TextUnformatted(" "u8);
ImGui.Text(" "u8);
ImGui.SameLine();
var verifiedOutlineColor = KnownColor.White.Vector() with { W = 0.75f };
@ -2406,7 +2406,7 @@ internal class PluginInstallerWindow : Window, IDisposable
ImGui.SameLine();
var cursor = ImGui.GetCursorPos();
ImGui.TextUnformatted(log.Title);
ImGui.Text(log.Title);
ImGui.SameLine();
ImGuiHelpers.SafeTextColored(ImGuiColors.DalamudGrey3, $" v{log.Version}");
@ -2829,7 +2829,7 @@ internal class PluginInstallerWindow : Window, IDisposable
ImGui.Indent();
// Name
ImGui.TextUnformatted(manifest.Name);
ImGui.Text(manifest.Name);
// Download count
var downloadText = plugin.IsDev
@ -2982,7 +2982,7 @@ internal class PluginInstallerWindow : Window, IDisposable
if (ImGui.BeginChild("##changelog"u8, new Vector2(-1, 100), true, ImGuiWindowFlags.NoNavFocus | ImGuiWindowFlags.NoNavInputs | ImGuiWindowFlags.AlwaysAutoResize))
{
ImGui.TextUnformatted("Changelog:"u8);
ImGui.Text("Changelog:"u8);
ImGuiHelpers.ScaledDummy(2);
ImGuiHelpers.SafeTextWrapped(changelog!);
}
@ -3121,7 +3121,7 @@ internal class PluginInstallerWindow : Window, IDisposable
ImGui.SameLine();
ImGui.TextUnformatted(profile.Name);
ImGui.Text(profile.Name);
didAny = true;
}
@ -3147,7 +3147,7 @@ internal class PluginInstallerWindow : Window, IDisposable
}
ImGui.SameLine();
ImGui.TextUnformatted(Locs.Profiles_RemoveFromAll);
ImGui.Text(Locs.Profiles_RemoveFromAll);
ImGui.EndPopup();
}
@ -3432,7 +3432,7 @@ internal class PluginInstallerWindow : Window, IDisposable
if (problems.Count == 0)
{
ImGui.PushFont(InterfaceManager.IconFont);
ImGui.TextUnformatted(FontAwesomeIcon.Check.ToIconString());
ImGui.Text(FontAwesomeIcon.Check.ToIconString());
ImGui.PopFont();
ImGui.SameLine();
ImGuiHelpers.SafeTextColoredWrapped(ImGuiColors.HealerGreen, "No validation issues found in this plugin!"u8);
@ -3489,13 +3489,13 @@ internal class PluginInstallerWindow : Window, IDisposable
switch (problem.Severity)
{
case PluginValidator.ValidationSeverity.Fatal:
ImGui.TextUnformatted(FontAwesomeIcon.TimesCircle.ToIconString());
ImGui.Text(FontAwesomeIcon.TimesCircle.ToIconString());
break;
case PluginValidator.ValidationSeverity.Warning:
ImGui.TextUnformatted(FontAwesomeIcon.ExclamationTriangle.ToIconString());
ImGui.Text(FontAwesomeIcon.ExclamationTriangle.ToIconString());
break;
case PluginValidator.ValidationSeverity.Information:
ImGui.TextUnformatted(FontAwesomeIcon.InfoCircle.ToIconString());
ImGui.Text(FontAwesomeIcon.InfoCircle.ToIconString());
break;
default:
throw new ArgumentOutOfRangeException();
@ -3986,7 +3986,7 @@ internal class PluginInstallerWindow : Window, IDisposable
if (x is 0 && y is 0) continue;
ImGui.SetCursorPos(cursorStart + new Vector2(x, y));
ImGui.TextUnformatted(icon.ToIconString());
ImGui.Text(icon.ToIconString());
}
}
@ -3994,7 +3994,7 @@ internal class PluginInstallerWindow : Window, IDisposable
ImGui.PushStyleColor(ImGuiCol.Text, iconColor);
ImGui.SetCursorPos(cursorStart);
ImGui.TextUnformatted(icon.ToIconString());
ImGui.Text(icon.ToIconString());
ImGui.PopStyleColor();
ImGui.PopFont();

12
Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs
View file

@ -227,7 +227,7 @@ internal class ProfileManagerWidget
// Center text in frame height
var textHeight = ImGui.CalcTextSize(profile.Name);
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (ImGui.GetFrameHeight() / 2) - (textHeight.Y / 2));
ImGui.TextUnformatted(profile.Name);
ImGui.Text(profile.Name);
ImGui.SameLine();
ImGui.SetCursorPosX(windowSize.X - (ImGuiHelpers.GlobalScale * 30));
@ -400,7 +400,7 @@ internal class ProfileManagerWidget
ImGuiHelpers.ScaledDummy(5);
ImGui.TextUnformatted(Locs.StartupBehavior);
ImGui.Text(Locs.StartupBehavior);
if (ImGui.BeginCombo("##startupBehaviorPicker"u8, Locs.PolicyToLocalisedName(profile.StartupPolicy)))
{
foreach (var policy in Enum.GetValues(typeof(ProfileModelV1.ProfileStartupPolicy)).Cast<ProfileModelV1.ProfileStartupPolicy>())
@ -456,7 +456,7 @@ internal class ProfileManagerWidget
var before = ImGui.GetCursorPos();
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (pluginLineHeight / 2) - (textHeight.Y / 2));
ImGui.TextUnformatted(text);
ImGui.Text(text);
ImGui.SetCursorPos(before);
}
@ -470,7 +470,7 @@ internal class ProfileManagerWidget
var before = ImGui.GetCursorPos();
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (pluginLineHeight / 2) - (textHeight.Y / 2));
ImGui.TextUnformatted(text);
ImGui.Text(text);
var firstAvailableInstalled = pm.InstalledPlugins.FirstOrDefault(x => x.InternalName == profileEntry.InternalName);
var installable =
@ -479,7 +479,7 @@ internal class ProfileManagerWidget
if (firstAvailableInstalled != null)
{
ImGui.TextUnformatted($"Match to plugin '{firstAvailableInstalled.Name}'?");
ImGui.Text($"Match to plugin '{firstAvailableInstalled.Name}'?");
ImGui.SameLine();
if (ImGuiComponents.IconButtonWithText(
FontAwesomeIcon.Check,
@ -572,7 +572,7 @@ internal class ProfileManagerWidget
ImGuiHelpers.ScaledDummy(5);
ImGui.SameLine();
ImGui.TextUnformatted(addPluginsText);
ImGui.Text(addPluginsText);
ImGuiHelpers.ScaledDummy(10);
}

24
Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
View file

@ -138,18 +138,18 @@ internal class PluginStatWindow : Window
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted(plugin.Manifest.Name);
ImGui.Text(plugin.Manifest.Name);
if (plugin.DalamudInterface != null)
{
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{plugin.DalamudInterface.LocalUiBuilder.LastDrawTime / 10000f:F4}ms");
ImGui.Text($"{plugin.DalamudInterface.LocalUiBuilder.LastDrawTime / 10000f:F4}ms");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{plugin.DalamudInterface.LocalUiBuilder.MaxDrawTime / 10000f:F4}ms");
ImGui.Text($"{plugin.DalamudInterface.LocalUiBuilder.MaxDrawTime / 10000f:F4}ms");
ImGui.TableNextColumn();
ImGui.TextUnformatted(plugin.DalamudInterface.LocalUiBuilder.DrawTimeHistory.Count > 0
ImGui.Text(plugin.DalamudInterface.LocalUiBuilder.DrawTimeHistory.Count > 0
? $"{plugin.DalamudInterface.LocalUiBuilder.DrawTimeHistory.Average() / 10000f:F4}ms"
: "-");
}
@ -245,16 +245,16 @@ internal class PluginStatWindow : Window
ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{handlerHistory.Key}");
ImGui.Text($"{handlerHistory.Key}");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{handlerHistory.Value.Last():F4}ms");
ImGui.Text($"{handlerHistory.Value.Last():F4}ms");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{handlerHistory.Value.Max():F4}ms");
ImGui.Text($"{handlerHistory.Value.Max():F4}ms");
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{handlerHistory.Value.Average():F4}ms");
ImGui.Text($"{handlerHistory.Value.Average():F4}ms");
}
}
}
@ -309,7 +309,7 @@ internal class PluginStatWindow : Window
ImGui.TableNextColumn();
ImGui.TextUnformatted($"{trackedHook.Delegate.Target} :: {trackedHook.Delegate.Method.Name}");
ImGui.Text($"{trackedHook.Delegate.Target} :: {trackedHook.Delegate.Method.Name}");
ImGui.TextDisabled(trackedHook.Assembly.FullName);
ImGui.TableNextColumn();
if (!trackedHook.Hook.IsDisposed)
@ -335,16 +335,16 @@ internal class PluginStatWindow : Window
if (trackedHook.Hook.IsDisposed)
{
ImGui.TextUnformatted("Disposed"u8);
ImGui.Text("Disposed"u8);
}
else
{
ImGui.TextUnformatted(trackedHook.Hook.IsEnabled ? "Enabled" : "Disabled");
ImGui.Text(trackedHook.Hook.IsEnabled ? "Enabled" : "Disabled");
}
ImGui.TableNextColumn();
ImGui.TextUnformatted(trackedHook.Hook.BackendName);
ImGui.Text(trackedHook.Hook.BackendName);
}
catch (Exception ex)
{

18
Dalamud/Interface/Internal/Windows/ProfilerWindow.cs
View file

@ -43,7 +43,7 @@ public class ProfilerWindow : Window
var actualMin = Timings.AllTimings.Keys.Min(x => x.StartTime);
var actualMax = Timings.AllTimings.Keys.Max(x => x.EndTime);
ImGui.TextUnformatted("Timings"u8);
ImGui.Text("Timings"u8);
var childHeight = Math.Max(300, 20 * (2.5f + this.occupied.Count));
@ -178,12 +178,12 @@ public class ProfilerWindow : Window
if (rectInfo.Hover)
{
ImGui.BeginTooltip();
ImGui.TextUnformatted(rectInfo.Timing.Name);
ImGui.TextUnformatted(rectInfo.Timing.MemberName);
ImGui.TextUnformatted($"{rectInfo.Timing.FileName}:{rectInfo.Timing.LineNumber}");
ImGui.TextUnformatted($"Duration: {rectInfo.Timing.Duration}ms");
ImGui.Text(rectInfo.Timing.Name);
ImGui.Text(rectInfo.Timing.MemberName);
ImGui.Text($"{rectInfo.Timing.FileName}:{rectInfo.Timing.LineNumber}");
ImGui.Text($"Duration: {rectInfo.Timing.Duration}ms");
if (rectInfo.Timing.Parent != null)
ImGui.TextUnformatted($"Parent: {rectInfo.Timing.Parent.Name}");
ImGui.Text($"Parent: {rectInfo.Timing.Parent.Name}");
ImGui.EndTooltip();
}
}
@ -254,9 +254,9 @@ public class ProfilerWindow : Window
this.max = this.min + (sizeShown * 1000f);
}
ImGui.TextUnformatted("Min: " + actualMin.ToString("0.000"));
ImGui.TextUnformatted("Max: " + actualMax.ToString("0.000"));
ImGui.TextUnformatted("Timings: " + Timings.AllTimings.Count);
ImGui.Text("Min: " + actualMin.ToString("0.000"));
ImGui.Text("Max: " + actualMax.ToString("0.000"));
ImGui.Text("Timings: " + Timings.AllTimings.Count);
}
[SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:Fields should be private", Justification = "Internals")]

12
Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
View file

@ -118,7 +118,7 @@ internal class SelfTestWindow : Window
ImGui.SameLine();
ImGui.TextUnformatted($"Step: {this.currentStep} / {this.steps.Count}");
ImGui.Text($"Step: {this.currentStep} / {this.steps.Count}");
ImGui.Spacing();
@ -154,7 +154,7 @@ internal class SelfTestWindow : Window
if (!resultChild) return;
var step = this.steps[this.currentStep];
ImGui.TextUnformatted($"Current: {step.Name}");
ImGui.Text($"Current: {step.Name}");
ImGuiHelpers.ScaledDummy(10);
@ -214,7 +214,7 @@ internal class SelfTestWindow : Window
ImGui.TableSetColumnIndex(0);
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted(i.ToString());
ImGui.Text(i.ToString());
if (this.selfTestRunning && this.scrollToStep == i)
{
@ -224,7 +224,7 @@ internal class SelfTestWindow : Window
ImGui.TableSetColumnIndex(1);
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted(step.Name);
ImGui.Text(step.Name);
if (this.testIndexToResult.TryGetValue(i, out var result))
{
@ -248,7 +248,7 @@ internal class SelfTestWindow : Window
if (result.Duration.HasValue)
{
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted(this.FormatTimeSpan(result.Duration.Value));
ImGui.Text(this.FormatTimeSpan(result.Duration.Value));
}
}
else
@ -268,7 +268,7 @@ internal class SelfTestWindow : Window
ImGui.AlignTextToFramePadding();
if (this.selfTestRunning && this.currentStep == i)
{
ImGui.TextUnformatted(this.FormatTimeSpan(DateTimeOffset.Now - this.lastTestStart));
ImGui.Text(this.FormatTimeSpan(DateTimeOffset.Now - this.lastTestStart));
}
}

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/ActorTableSelfTestStep.cs
View file

@ -19,7 +19,7 @@ internal class ActorTableSelfTestStep : ISelfTestStep
{
var objectTable = Service<ObjectTable>.Get();
ImGui.TextUnformatted("Checking actor table..."u8);
ImGui.Text("Checking actor table..."u8);
if (this.index == objectTable.Length - 1)
{

8
Dalamud/Interface/Internal/Windows/SelfTest/Steps/AddonLifecycleSelfTestStep.cs
View file

@ -66,19 +66,19 @@ internal class AddonLifecycleSelfTestStep : ISelfTestStep
switch (this.currentStep)
{
case TestStep.CharacterRefresh:
ImGui.TextUnformatted("Open Character Window."u8);
ImGui.Text("Open Character Window."u8);
break;
case TestStep.CharacterSetup:
ImGui.TextUnformatted("Open Character Window."u8);
ImGui.Text("Open Character Window."u8);
break;
case TestStep.CharacterRequestedUpdate:
ImGui.TextUnformatted("Change tabs, or un-equip/equip gear."u8);
ImGui.Text("Change tabs, or un-equip/equip gear."u8);
break;
case TestStep.CharacterFinalize:
ImGui.TextUnformatted("Close Character Window."u8);
ImGui.Text("Close Character Window."u8);
break;
case TestStep.CharacterUpdate:

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/AetheryteListSelfTestStep.cs
View file

@ -19,7 +19,7 @@ internal class AetheryteListSelfTestStep : ISelfTestStep
{
var list = Service<AetheryteList>.Get();
ImGui.TextUnformatted("Checking aetheryte list..."u8);
ImGui.Text("Checking aetheryte list..."u8);
if (this.index == list.Length - 1)
{

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/ChatSelfTestStep.cs
View file

@ -31,7 +31,7 @@ internal class ChatSelfTestStep : ISelfTestStep
break;
case 1:
ImGui.TextUnformatted("Type \"/e DALAMUD\" in chat...");
ImGui.Text("Type \"/e DALAMUD\" in chat...");
if (!this.subscribed)
{

16
Dalamud/Interface/Internal/Windows/SelfTest/Steps/CompletionSelfTestStep.cs
View file

@ -28,7 +28,7 @@ internal class CompletionSelfTestStep : ISelfTestStep
break;
case 1:
ImGui.TextUnformatted("[Chat Log]"u8);
ImGui.Text("[Chat Log]"u8);
ImGuiHelpers.SafeTextWrapped("Use the category menus to navigate to [Dalamud], then complete a command from the list. Did it work?"u8);
if (ImGui.Button("Yes"u8))
this.step++;
@ -38,8 +38,8 @@ internal class CompletionSelfTestStep : ISelfTestStep
return SelfTestStepResult.Fail;
break;
case 2:
ImGui.TextUnformatted("[Chat Log]"u8);
ImGui.TextUnformatted("Type /xl into the chat log and tab-complete a dalamud command. Did it work?"u8);
ImGui.Text("[Chat Log]"u8);
ImGui.Text("Type /xl into the chat log and tab-complete a dalamud command. Did it work?"u8);
if (ImGui.Button("Yes"u8))
this.step++;
@ -51,14 +51,14 @@ internal class CompletionSelfTestStep : ISelfTestStep
break;
case 3:
ImGui.TextUnformatted("[Chat Log]"u8);
ImGui.Text("[Chat Log]"u8);
if (!this.registered)
{
cmdManager.AddHandler("/xlselftestcompletion", new CommandInfo((_, _) => this.commandRun = true));
this.registered = true;
}
ImGui.TextUnformatted("Tab-complete /xlselftestcompletion in the chat log and send the command"u8);
ImGui.Text("Tab-complete /xlselftestcompletion in the chat log and send the command"u8);
if (this.commandRun)
this.step++;
@ -66,9 +66,9 @@ internal class CompletionSelfTestStep : ISelfTestStep
break;
case 4:
ImGui.TextUnformatted("[Other text inputs]"u8);
ImGui.TextUnformatted("Open the party finder recruitment criteria dialog and try to tab-complete /xldev in the text box."u8);
ImGui.TextUnformatted("Did the command appear in the text box? (It should not have)"u8);
ImGui.Text("[Other text inputs]"u8);
ImGui.Text("Open the party finder recruitment criteria dialog and try to tab-complete /xldev in the text box."u8);
ImGui.Text("Did the command appear in the text box? (It should not have)"u8);
if (ImGui.Button("Yes"u8))
return SelfTestStepResult.Fail;
ImGui.SameLine();

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/ConditionSelfTestStep.cs
View file

@ -23,7 +23,7 @@ internal class ConditionSelfTestStep : ISelfTestStep
return SelfTestStepResult.Fail;
}
ImGui.TextUnformatted("Please jump..."u8);
ImGui.Text("Please jump..."u8);
return condition[ConditionFlag.Jumping] ? SelfTestStepResult.Pass : SelfTestStepResult.Waiting;
}

10
Dalamud/Interface/Internal/Windows/SelfTest/Steps/ContextMenuSelfTestStep.cs
View file

@ -48,7 +48,7 @@ internal class ContextMenuSelfTestStep : ISelfTestStep
this.materiaSheet = dataMgr.GetExcelSheet<Materia>();
this.stainSheet = dataMgr.GetExcelSheet<Stain>();
ImGui.TextUnformatted(this.currentSubStep.ToString());
ImGui.Text(this.currentSubStep.ToString());
switch (this.currentSubStep)
{
@ -59,7 +59,7 @@ internal class ContextMenuSelfTestStep : ISelfTestStep
case SubStep.TestInventoryAndSubmenu:
if (this.targetInventorySubmenuOpened == true)
{
ImGui.TextUnformatted($"Is the data in the submenu correct?");
ImGui.Text($"Is the data in the submenu correct?");
if (ImGui.Button("Yes"u8))
this.currentSubStep++;
@ -71,7 +71,7 @@ internal class ContextMenuSelfTestStep : ISelfTestStep
}
else
{
ImGui.TextUnformatted("Right-click an item and select \"Self Test\".");
ImGui.Text("Right-click an item and select \"Self Test\".");
if (ImGui.Button("Skip"u8))
this.currentSubStep++;
@ -82,7 +82,7 @@ internal class ContextMenuSelfTestStep : ISelfTestStep
case SubStep.TestDefault:
if (this.targetCharacter is { } character)
{
ImGui.TextUnformatted($"Did you click \"{character.Name}\" ({character.ClassJob.Value.Abbreviation.ExtractText()})?");
ImGui.Text($"Did you click \"{character.Name}\" ({character.ClassJob.Value.Abbreviation.ExtractText()})?");
if (ImGui.Button("Yes"u8))
this.currentSubStep++;
@ -94,7 +94,7 @@ internal class ContextMenuSelfTestStep : ISelfTestStep
}
else
{
ImGui.TextUnformatted("Right-click a character."u8);
ImGui.Text("Right-click a character."u8);
if (ImGui.Button("Skip"u8))
this.currentSubStep++;

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/DutyStateSelfTestStep.cs
View file

@ -19,7 +19,7 @@ internal class DutyStateSelfTestStep : ISelfTestStep
{
var dutyState = Service<DutyState>.Get();
ImGui.TextUnformatted("Enter a duty now..."u8);
ImGui.Text("Enter a duty now..."u8);
if (!this.subscribed)
{

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/EnterTerritorySelfTestStep.cs
View file

@ -32,7 +32,7 @@ internal class EnterTerritorySelfTestStep : ISelfTestStep
{
var clientState = Service<ClientState>.Get();
ImGui.TextUnformatted(this.Name);
ImGui.Text(this.Name);
if (!this.subscribed)
{

4
Dalamud/Interface/Internal/Windows/SelfTest/Steps/FateTableSelfTestStep.cs
View file

@ -19,11 +19,11 @@ internal class FateTableSelfTestStep : ISelfTestStep
{
var fateTable = Service<FateTable>.Get();
ImGui.TextUnformatted("Checking fate table..."u8);
ImGui.Text("Checking fate table..."u8);
if (fateTable.Length == 0)
{
ImGui.TextUnformatted("Go to a zone that has FATEs currently up."u8);
ImGui.Text("Go to a zone that has FATEs currently up."u8);
return SelfTestStepResult.Waiting;
}

8
Dalamud/Interface/Internal/Windows/SelfTest/Steps/GameConfigSelfTestStep.cs
View file

@ -43,7 +43,7 @@ internal class GameConfigSelfTestStep : ISelfTestStep
}
else
{
ImGui.TextUnformatted("Switch Movement Type to Standard"u8);
ImGui.Text("Switch Movement Type to Standard"u8);
}
return SelfTestStepResult.Waiting;
@ -57,7 +57,7 @@ internal class GameConfigSelfTestStep : ISelfTestStep
}
else
{
ImGui.TextUnformatted("Switch Movement Type to Legacy"u8);
ImGui.Text("Switch Movement Type to Legacy"u8);
}
return SelfTestStepResult.Waiting;
@ -73,7 +73,7 @@ internal class GameConfigSelfTestStep : ISelfTestStep
}
else
{
ImGui.TextUnformatted("Switch Movement Type to Legacy"u8);
ImGui.Text("Switch Movement Type to Legacy"u8);
}
return SelfTestStepResult.Waiting;
@ -87,7 +87,7 @@ internal class GameConfigSelfTestStep : ISelfTestStep
}
else
{
ImGui.TextUnformatted("Switch Movement Type to Standard"u8);
ImGui.Text("Switch Movement Type to Standard"u8);
}
return SelfTestStepResult.Waiting;

4
Dalamud/Interface/Internal/Windows/SelfTest/Steps/HoverSelfTestStep.cs
View file

@ -21,7 +21,7 @@ internal class HoverSelfTestStep : ISelfTestStep
if (!this.clearedItem)
{
ImGui.TextUnformatted("Hover WHM soul crystal..."u8);
ImGui.Text("Hover WHM soul crystal..."u8);
if (gameGui.HoveredItem == 4547)
{
@ -31,7 +31,7 @@ internal class HoverSelfTestStep : ISelfTestStep
if (!this.clearedAction)
{
ImGui.TextUnformatted("Hover \"Open Linkshells\" action...");
ImGui.Text("Hover \"Open Linkshells\" action...");
if (gameGui.HoveredAction != null &&
gameGui.HoveredAction.ActionKind == HoverActionKind.MainCommand &&

12
Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs
View file

@ -43,7 +43,7 @@ internal class ItemPayloadSelfTestStep : ISelfTestStep
SeString? toPrint = null;
ImGui.TextUnformatted(this.currentSubStep.ToString());
ImGui.Text(this.currentSubStep.ToString());
switch (this.currentSubStep)
{
@ -52,7 +52,7 @@ internal class ItemPayloadSelfTestStep : ISelfTestStep
this.currentSubStep++;
break;
case SubStep.HoverNormalItem:
ImGui.TextUnformatted("Hover the item."u8);
ImGui.Text("Hover the item."u8);
if (gameGui.HoveredItem != normalItemId)
return SelfTestStepResult.Waiting;
this.currentSubStep++;
@ -62,7 +62,7 @@ internal class ItemPayloadSelfTestStep : ISelfTestStep
this.currentSubStep++;
break;
case SubStep.HoverHqItem:
ImGui.TextUnformatted("Hover the item."u8);
ImGui.Text("Hover the item."u8);
if (gameGui.HoveredItem != 1_000_000 + hqItemId)
return SelfTestStepResult.Waiting;
this.currentSubStep++;
@ -72,7 +72,7 @@ internal class ItemPayloadSelfTestStep : ISelfTestStep
this.currentSubStep++;
break;
case SubStep.HoverCollectable:
ImGui.TextUnformatted("Hover the item."u8);
ImGui.Text("Hover the item."u8);
if (gameGui.HoveredItem != 500_000 + collectableItemId)
return SelfTestStepResult.Waiting;
this.currentSubStep++;
@ -82,7 +82,7 @@ internal class ItemPayloadSelfTestStep : ISelfTestStep
this.currentSubStep++;
break;
case SubStep.HoverEventItem:
ImGui.TextUnformatted("Hover the item."u8);
ImGui.Text("Hover the item."u8);
if (gameGui.HoveredItem != eventItemId)
return SelfTestStepResult.Waiting;
this.currentSubStep++;
@ -92,7 +92,7 @@ internal class ItemPayloadSelfTestStep : ISelfTestStep
this.currentSubStep++;
break;
case SubStep.HoverNormalWithText:
ImGui.TextUnformatted("Hover the item."u8);
ImGui.Text("Hover the item."u8);
if (gameGui.HoveredItem != normalItemId)
return SelfTestStepResult.Waiting;
this.currentSubStep++;

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/KeyStateSelfTestStep.cs
View file

@ -16,7 +16,7 @@ internal class KeyStateSelfTestStep : ISelfTestStep
{
var keyState = Service<KeyState>.Get();
ImGui.TextUnformatted("Hold down D,A,L,M,U"u8);
ImGui.Text("Hold down D,A,L,M,U"u8);
if (keyState[VirtualKey.D]
&& keyState[VirtualKey.A]

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/LoginEventSelfTestStep.cs
View file

@ -19,7 +19,7 @@ internal class LoginEventSelfTestStep : ISelfTestStep
{
var clientState = Service<ClientState>.Get();
ImGui.TextUnformatted("Log in now..."u8);
ImGui.Text("Log in now..."u8);
if (!this.subscribed)
{

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/LogoutEventSelfTestStep.cs
View file

@ -19,7 +19,7 @@ internal class LogoutEventSelfTestStep : ISelfTestStep
{
var clientState = Service<ClientState>.Get();
ImGui.TextUnformatted("Log out now..."u8);
ImGui.Text("Log out now..."u8);
if (!this.subscribed)
{

58
Dalamud/Interface/Internal/Windows/SelfTest/Steps/MarketBoardSelfTestStep.cs
View file

@ -43,7 +43,7 @@ internal class MarketBoardSelfTestStep : ISelfTestStep
this.SubscribeToEvents();
}
ImGui.TextUnformatted($"Testing: {this.currentSubStep.ToString()}");
ImGui.Text($"Testing: {this.currentSubStep.ToString()}");
switch (this.currentSubStep)
{
@ -51,16 +51,16 @@ internal class MarketBoardSelfTestStep : ISelfTestStep
if (this.historyListing == null)
{
ImGui.TextUnformatted("Goto a Market Board. Open any item that has historical sale listings."u8);
ImGui.Text("Goto a Market Board. Open any item that has historical sale listings."u8);
}
else
{
ImGui.TextUnformatted("Does one of the historical sales match this information?"u8);
ImGui.Text("Does one of the historical sales match this information?"u8);
ImGui.Separator();
ImGui.TextUnformatted($"Quantity: {this.historyListing.Quantity.ToString()}");
ImGui.TextUnformatted($"Buyer: {this.historyListing.BuyerName}");
ImGui.TextUnformatted($"Sale Price: {this.historyListing.SalePrice.ToString()}");
ImGui.TextUnformatted($"Purchase Time: {this.historyListing.PurchaseTime.ToLocalTime().ToString(CultureInfo.InvariantCulture)}");
ImGui.Text($"Quantity: {this.historyListing.Quantity.ToString()}");
ImGui.Text($"Buyer: {this.historyListing.BuyerName}");
ImGui.Text($"Sale Price: {this.historyListing.SalePrice.ToString()}");
ImGui.Text($"Purchase Time: {this.historyListing.PurchaseTime.ToLocalTime().ToString(CultureInfo.InvariantCulture)}");
ImGui.Separator();
if (ImGui.Button("Looks Correct / Skip"u8))
{
@ -79,16 +79,16 @@ internal class MarketBoardSelfTestStep : ISelfTestStep
if (this.itemListing == null)
{
ImGui.TextUnformatted("Goto a Market Board. Open any item that has sale listings."u8);
ImGui.Text("Goto a Market Board. Open any item that has sale listings."u8);
}
else
{
ImGui.TextUnformatted("Does one of the sales match this information?"u8);
ImGui.Text("Does one of the sales match this information?"u8);
ImGui.Separator();
ImGui.TextUnformatted($"Quantity: {this.itemListing.ItemQuantity.ToString()}");
ImGui.TextUnformatted($"Price Per Unit: {this.itemListing.PricePerUnit}");
ImGui.TextUnformatted($"Retainer Name: {this.itemListing.RetainerName}");
ImGui.TextUnformatted($"Is HQ?: {(this.itemListing.IsHq ? "Yes" : "No")}");
ImGui.Text($"Quantity: {this.itemListing.ItemQuantity.ToString()}");
ImGui.Text($"Price Per Unit: {this.itemListing.PricePerUnit}");
ImGui.Text($"Retainer Name: {this.itemListing.RetainerName}");
ImGui.Text($"Is HQ?: {(this.itemListing.IsHq ? "Yes" : "No")}");
ImGui.Separator();
if (ImGui.Button("Looks Correct / Skip"u8))
{
@ -106,15 +106,15 @@ internal class MarketBoardSelfTestStep : ISelfTestStep
case SubStep.PurchaseRequests:
if (this.marketBoardPurchaseRequest == null)
{
ImGui.TextUnformatted("Goto a Market Board. Purchase any item, the cheapest you can find."u8);
ImGui.Text("Goto a Market Board. Purchase any item, the cheapest you can find."u8);
}
else
{
ImGuiHelpers.SafeTextWrapped("Does this information match the purchase you made? This is testing the request to the server."u8);
ImGui.Separator();
ImGui.TextUnformatted($"Quantity: {this.marketBoardPurchaseRequest.ItemQuantity.ToString()}");
ImGui.TextUnformatted($"Item ID: {this.marketBoardPurchaseRequest.CatalogId}");
ImGui.TextUnformatted($"Price Per Unit: {this.marketBoardPurchaseRequest.PricePerUnit}");
ImGui.Text($"Quantity: {this.marketBoardPurchaseRequest.ItemQuantity.ToString()}");
ImGui.Text($"Item ID: {this.marketBoardPurchaseRequest.CatalogId}");
ImGui.Text($"Price Per Unit: {this.marketBoardPurchaseRequest.PricePerUnit}");
ImGui.Separator();
if (ImGui.Button("Looks Correct / Skip"u8))
{
@ -132,14 +132,14 @@ internal class MarketBoardSelfTestStep : ISelfTestStep
case SubStep.Purchases:
if (this.marketBoardPurchase == null)
{
ImGui.TextUnformatted("Goto a Market Board. Purchase any item, the cheapest you can find."u8);
ImGui.Text("Goto a Market Board. Purchase any item, the cheapest you can find."u8);
}
else
{
ImGuiHelpers.SafeTextWrapped("Does this information match the purchase you made? This is testing the response from the server."u8);
ImGui.Separator();
ImGui.TextUnformatted($"Quantity: {this.marketBoardPurchase.ItemQuantity.ToString()}");
ImGui.TextUnformatted($"Item ID: {this.marketBoardPurchase.CatalogId}");
ImGui.Text($"Quantity: {this.marketBoardPurchase.ItemQuantity.ToString()}");
ImGui.Text($"Item ID: {this.marketBoardPurchase.CatalogId}");
ImGui.Separator();
if (ImGui.Button("Looks Correct / Skip"u8))
{
@ -161,16 +161,16 @@ internal class MarketBoardSelfTestStep : ISelfTestStep
}
else
{
ImGui.TextUnformatted("Does this market tax rate information look correct?"u8);
ImGui.Text("Does this market tax rate information look correct?"u8);
ImGui.Separator();
ImGui.TextUnformatted($"Uldah: {this.marketTaxRate.UldahTax.ToString()}");
ImGui.TextUnformatted($"Gridania: {this.marketTaxRate.GridaniaTax.ToString()}");
ImGui.TextUnformatted($"Limsa Lominsa: {this.marketTaxRate.LimsaLominsaTax.ToString()}");
ImGui.TextUnformatted($"Ishgard: {this.marketTaxRate.IshgardTax.ToString()}");
ImGui.TextUnformatted($"Kugane: {this.marketTaxRate.KuganeTax.ToString()}");
ImGui.TextUnformatted($"Crystarium: {this.marketTaxRate.CrystariumTax.ToString()}");
ImGui.TextUnformatted($"Sharlayan: {this.marketTaxRate.SharlayanTax.ToString()}");
ImGui.TextUnformatted($"Tuliyollal: {this.marketTaxRate.TuliyollalTax.ToString()}");
ImGui.Text($"Uldah: {this.marketTaxRate.UldahTax.ToString()}");
ImGui.Text($"Gridania: {this.marketTaxRate.GridaniaTax.ToString()}");
ImGui.Text($"Limsa Lominsa: {this.marketTaxRate.LimsaLominsaTax.ToString()}");
ImGui.Text($"Ishgard: {this.marketTaxRate.IshgardTax.ToString()}");
ImGui.Text($"Kugane: {this.marketTaxRate.KuganeTax.ToString()}");
ImGui.Text($"Crystarium: {this.marketTaxRate.CrystariumTax.ToString()}");
ImGui.Text($"Sharlayan: {this.marketTaxRate.SharlayanTax.ToString()}");
ImGui.Text($"Tuliyollal: {this.marketTaxRate.TuliyollalTax.ToString()}");
ImGui.Separator();
if (ImGui.Button("Looks Correct / Skip"u8))
{

4
Dalamud/Interface/Internal/Windows/SelfTest/Steps/NamePlateSelfTestStep.cs
View file

@ -40,11 +40,11 @@ internal class NamePlateSelfTestStep : ISelfTestStep
break;
case SubStep.Confirm:
ImGui.TextUnformatted("Click to redraw all visible nameplates"u8);
ImGui.Text("Click to redraw all visible nameplates"u8);
if (ImGui.Button("Request redraw"u8))
namePlateGui.RequestRedraw();
ImGui.TextUnformatted("Can you see marker icons above nameplates, and does\n" +
ImGui.Text("Can you see marker icons above nameplates, and does\n" +
"the update count increase when using request redraw?");
if (ImGui.Button("Yes"u8))

6
Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs
View file

@ -225,9 +225,9 @@ internal class NounProcessorSelfTestStep : ISelfTestStep
if (e.ExpectedResult != output)
{
ImGui.TextUnformatted($"Mismatch detected (Test #{i}):");
ImGui.TextUnformatted($"Got: {output}");
ImGui.TextUnformatted($"Expected: {e.ExpectedResult}");
ImGui.Text($"Mismatch detected (Test #{i}):");
ImGui.Text($"Got: {output}");
ImGui.Text($"Expected: {e.ExpectedResult}");
if (ImGui.Button("Continue"u8))
return SelfTestStepResult.Fail;

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/PartyFinderSelfTestStep.cs
View file

@ -33,7 +33,7 @@ internal class PartyFinderSelfTestStep : ISelfTestStep
return SelfTestStepResult.Pass;
}
ImGui.TextUnformatted("Open Party Finder"u8);
ImGui.Text("Open Party Finder"u8);
return SelfTestStepResult.Waiting;
}

14
Dalamud/Interface/Internal/Windows/SelfTest/Steps/SeStringEvaluatorSelfTestStep.cs
View file

@ -23,13 +23,13 @@ internal class SeStringEvaluatorSelfTestStep : ISelfTestStep
switch (this.step)
{
case 0:
ImGui.TextUnformatted("Is this the current time, and is it ticking?"u8);
ImGui.Text("Is this the current time, and is it ticking?"u8);
// This checks that EvaluateFromAddon fetches the correct Addon row,
// that MacroDecoder.GetMacroTime()->SetTime() has been called
// and that local and global parameters have been read correctly.
ImGui.TextUnformatted(seStringEvaluator.EvaluateFromAddon(31, [(uint)DateTimeOffset.UtcNow.ToUnixTimeSeconds()]).ExtractText());
ImGui.Text(seStringEvaluator.EvaluateFromAddon(31, [(uint)DateTimeOffset.UtcNow.ToUnixTimeSeconds()]).ExtractText());
if (ImGui.Button("Yes"u8))
this.step++;
@ -42,7 +42,7 @@ internal class SeStringEvaluatorSelfTestStep : ISelfTestStep
break;
case 1:
ImGui.TextUnformatted("Checking pcname macro using the local player name..."u8);
ImGui.Text("Checking pcname macro using the local player name..."u8);
// This makes sure that NameCache.Instance()->TryGetCharacterInfoByEntityId() has been called,
// that it returned the local players name by using its EntityId,
@ -52,7 +52,7 @@ internal class SeStringEvaluatorSelfTestStep : ISelfTestStep
var localPlayer = clientState.LocalPlayer;
if (localPlayer is null)
{
ImGui.TextUnformatted("You need to be logged in for this step."u8);
ImGui.Text("You need to be logged in for this step."u8);
if (ImGui.Button("Skip"u8))
return SelfTestStepResult.NotRan;
@ -65,9 +65,9 @@ internal class SeStringEvaluatorSelfTestStep : ISelfTestStep
if (evaluatedPlayerName != localPlayerName)
{
ImGui.TextUnformatted("The player name doesn't match:"u8);
ImGui.TextUnformatted($"Evaluated Player Name (got): {evaluatedPlayerName}");
ImGui.TextUnformatted($"Local Player Name (expected): {localPlayerName}");
ImGui.Text("The player name doesn't match:"u8);
ImGui.Text($"Evaluated Player Name (got): {evaluatedPlayerName}");
ImGui.Text($"Local Player Name (expected): {localPlayerName}");
if (ImGui.Button("Continue"u8))
return SelfTestStepResult.Fail;

8
Dalamud/Interface/Internal/Windows/SelfTest/Steps/SheetRedirectResolverSelfTestStep.cs
View file

@ -102,10 +102,10 @@ internal class SheetRedirectResolverSelfTestStep : ISelfTestStep
if (utf8SheetName->ToString() != sheetName2 || rowId1 != rowId2 || colIndex1 != colIndex2 || flags1 != flags2)
{
ImGui.TextUnformatted($"Mismatch detected (Test #{i}):");
ImGui.TextUnformatted($"Input: {redirect.SheetName}#{redirect.RowId}");
ImGui.TextUnformatted($"Game: {utf8SheetName->ToString()}#{rowId1}-{colIndex1} ({flags1})");
ImGui.TextUnformatted($"Evaluated: {sheetName2}#{rowId2}-{colIndex2} ({flags2})");
ImGui.Text($"Mismatch detected (Test #{i}):");
ImGui.Text($"Input: {redirect.SheetName}#{redirect.RowId}");
ImGui.Text($"Game: {utf8SheetName->ToString()}#{rowId1}-{colIndex1} ({flags1})");
ImGui.Text($"Evaluated: {sheetName2}#{rowId2}-{colIndex2} ({flags2})");
if (ImGui.Button("Continue"u8))
return SelfTestStepResult.Fail;

6
Dalamud/Interface/Internal/Windows/SelfTest/Steps/TargetSelfTestStep.cs
View file

@ -31,7 +31,7 @@ internal class TargetSelfTestStep : ISelfTestStep
break;
case 1:
ImGui.TextUnformatted("Target a player..."u8);
ImGui.Text("Target a player..."u8);
var cTarget = targetManager.Target;
if (cTarget is PlayerCharacter)
@ -42,7 +42,7 @@ internal class TargetSelfTestStep : ISelfTestStep
break;
case 2:
ImGui.TextUnformatted("Focus-Target a Battle NPC..."u8);
ImGui.Text("Focus-Target a Battle NPC..."u8);
var fTarget = targetManager.FocusTarget;
if (fTarget is BattleNpc)
@ -53,7 +53,7 @@ internal class TargetSelfTestStep : ISelfTestStep
break;
case 3:
ImGui.TextUnformatted("Soft-Target an EventObj..."u8);
ImGui.Text("Soft-Target an EventObj..."u8);
var sTarget = targetManager.SoftTarget;
if (sTarget is EventObj)

2
Dalamud/Interface/Internal/Windows/SelfTest/Steps/ToastSelfTestStep.cs
View file

@ -25,7 +25,7 @@ internal class ToastSelfTestStep : ISelfTestStep
this.sentToasts = true;
}
ImGui.TextUnformatted("Did you see a normal toast, a quest toast and an error toast?"u8);
ImGui.Text("Did you see a normal toast, a quest toast and an error toast?"u8);
if (ImGui.Button("Yes"u8))
{

6
Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAbout.cs
View file

@ -276,7 +276,7 @@ Contribute at: https://github.com/goatcorp/Dalamud
using (ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, Vector2.Zero))
{
ImGuiHelpers.ScaledDummy(0, windowSize.Y + 20f);
ImGui.TextUnformatted(string.Empty);
ImGui.Text(string.Empty);
const float imageSize = 190f;
ImGui.SameLine((ImGui.GetWindowWidth() / 2) - (imageSize / 2));
@ -293,7 +293,7 @@ Contribute at: https://github.com/goatcorp/Dalamud
ImGui.Dummy(new Vector2((windowX / 2) - (lineLenX / 2), 0f));
ImGui.SameLine();
ImGui.TextUnformatted(creditsLine);
ImGui.Text(creditsLine);
}
ImGuiHelpers.ScaledDummy(0, 40f);
@ -305,7 +305,7 @@ Contribute at: https://github.com/goatcorp/Dalamud
ImGui.Dummy(new Vector2((windowX / 2) - (thankYouLenX / 2), 0f));
ImGui.SameLine();
ImGui.TextUnformatted(ThankYouText);
ImGui.Text(ThankYouText);
}
ImGuiHelpers.ScaledDummy(0, windowSize.Y + 50f);

4
Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAutoUpdate.cs
View file

@ -136,7 +136,7 @@ public class SettingsTabAutoUpdates : SettingsTab
var before = ImGui.GetCursorPos();
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (pluginLineHeight / 2) - (textHeight.Y / 2));
ImGui.TextUnformatted(text);
ImGui.Text(text);
ImGui.SetCursorPos(before);
}
@ -150,7 +150,7 @@ public class SettingsTabAutoUpdates : SettingsTab
var before = ImGui.GetCursorPos();
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (pluginLineHeight / 2) - (textHeight.Y / 2));
ImGui.TextUnformatted(text);
ImGui.Text(text);
ImGui.SetCursorPos(before);
}

6
Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs
View file

@ -101,7 +101,7 @@ public class SettingsTabDtr : SettingsTab
ImGui.SameLine();
// if (isRequired) {
// ImGui.TextUnformatted($"Search in {name}");
// ImGui.Text($"Search in {name}");
// } else {
var isShown = ignore.All(x => x != title);
@ -133,11 +133,11 @@ public class SettingsTabDtr : SettingsTab
ImGuiHelpers.ScaledDummy(10);
ImGui.TextUnformatted(Loc.Localize("DalamudSettingServerInfoBarSpacing", "Server Info Bar spacing"));
ImGui.Text(Loc.Localize("DalamudSettingServerInfoBarSpacing", "Server Info Bar spacing"));
ImGuiHelpers.SafeTextColoredWrapped(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarSpacingHint", "Configure the amount of space between entries in the server info bar here."));
ImGui.SliderInt("Spacing"u8, ref this.dtrSpacing, 0, 40);
ImGui.TextUnformatted(Loc.Localize("DalamudSettingServerInfoBarDirection", "Server Info Bar direction"));
ImGui.Text(Loc.Localize("DalamudSettingServerInfoBarDirection", "Server Info Bar direction"));
ImGuiHelpers.SafeTextColoredWrapped(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarDirectionHint", "If checked, the Server Info Bar elements will expand to the right instead of the left."));
ImGui.Checkbox("Swap Direction"u8, ref this.dtrSwapDirection);

8
Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabLook.cs
View file

@ -170,7 +170,7 @@ public class SettingsTabLook : SettingsTab
ImGui.SameLine();
ImGui.PushStyleVar(ImGuiStyleVar.Alpha, v / 100);
ImGui.TextUnformatted("\uE020\uE021\uE022\uE023\uE024\uE025\uE026\uE027"u8);
ImGui.Text("\uE020\uE021\uE022\uE023\uE024\uE025\uE026\uE027"u8);
ImGui.PopStyleVar(1);
},
}
@ -184,7 +184,7 @@ public class SettingsTabLook : SettingsTab
var fontBuildTask = interfaceManager.FontBuildTask;
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted(Loc.Localize("DalamudSettingsGlobalUiScale", "Global Font Scale"));
ImGui.Text(Loc.Localize("DalamudSettingsGlobalUiScale", "Global Font Scale"));
var buttonSize =
GlobalUiScalePresets
@ -210,7 +210,7 @@ public class SettingsTabLook : SettingsTab
var len = Encoding.UTF8.GetByteCount(buildingFonts);
var p = stackalloc byte[len];
Encoding.UTF8.GetBytes(buildingFonts, new(p, len));
ImGui.TextUnformatted(
ImGui.Text(
new ReadOnlySpan<byte>(p, len)[..((len + ((Environment.TickCount / 200) % 3)) - 2)]);
}
}
@ -234,7 +234,7 @@ public class SettingsTabLook : SettingsTab
&& ImGui.CollapsingHeader("##DalamudSetingsFontBuildFaultReason"u8))
{
foreach (var e in fontBuildTask.Exception.InnerExceptions)
ImGui.TextUnformatted(e.ToString());
ImGui.Text(e.ToString());
}
}

16
Dalamud/Interface/Internal/Windows/Settings/Widgets/DevPluginsSettingsEntry.cs
View file

@ -59,13 +59,13 @@ public class DevPluginsSettingsEntry : SettingsEntry
public override void Draw()
{
using var id = ImRaii.PushId("devPluginLocation"u8);
ImGui.TextUnformatted(this.Name);
ImGui.Text(this.Name);
if (this.devPluginLocationsChanged)
{
using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.HealerGreen))
{
ImGui.SameLine();
ImGui.TextUnformatted(Loc.Localize("DalamudSettingsChanged", "(Changed)"));
ImGui.Text(Loc.Localize("DalamudSettingsChanged", "(Changed)"));
}
}
@ -97,13 +97,13 @@ public class DevPluginsSettingsEntry : SettingsEntry
ImGui.Separator();
ImGui.TextUnformatted("#"u8);
ImGui.Text("#"u8);
ImGui.NextColumn();
ImGui.TextUnformatted("Path"u8);
ImGui.Text("Path"u8);
ImGui.NextColumn();
ImGui.TextUnformatted("Enabled"u8);
ImGui.Text("Enabled"u8);
ImGui.NextColumn();
ImGui.TextUnformatted(string.Empty);
ImGui.Text(string.Empty);
ImGui.NextColumn();
ImGui.Separator();
@ -118,7 +118,7 @@ public class DevPluginsSettingsEntry : SettingsEntry
id.Push(devPluginLocationSetting.Path);
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 8 - (ImGui.CalcTextSize(locNumber.ToString()).X / 2));
ImGui.TextUnformatted(locNumber.ToString());
ImGui.Text(locNumber.ToString());
ImGui.NextColumn();
ImGui.SetNextItemWidth(-1);
@ -175,7 +175,7 @@ public class DevPluginsSettingsEntry : SettingsEntry
}
ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 8 - (ImGui.CalcTextSize(locNumber.ToString()).X / 2));
ImGui.TextUnformatted(locNumber.ToString());
ImGui.Text(locNumber.ToString());
ImGui.NextColumn();
ImGui.SetNextItemWidth(-1);
ImGui.InputText("##devPluginLocationInput"u8, ref this.devPluginTempLocation, 300);

4
Dalamud/Interface/Internal/Windows/Settings/Widgets/EnumSettingsEntry{T}.cs
View file

@ -135,7 +135,7 @@ internal sealed class EnumSettingsEntry<T> : SettingsEntry
{
using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed))
{
ImGui.TextUnformatted(validityMsg);
ImGui.Text(validityMsg);
}
}
}
@ -150,7 +150,7 @@ internal sealed class EnumSettingsEntry<T> : SettingsEntry
{
using (ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed))
{
ImGui.TextUnformatted(warningMessage);
ImGui.Text(warningMessage);
}
}
}

2
Dalamud/Interface/Internal/Windows/Settings/Widgets/LanguageChooserSettingsEntry.cs
View file

@ -69,7 +69,7 @@ public sealed class LanguageChooserSettingsEntry : SettingsEntry
public override void Draw()
{
ImGui.TextUnformatted(this.Name);
ImGui.Text(this.Name);
ImGui.Combo("##XlLangCombo", ref this.langIndex, this.locLanguages);
ImGuiHelpers.SafeTextColoredWrapped(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsLanguageHint", "Select the language Dalamud will be displayed in."));
}

Some files were not shown because too many files have changed in this diff Show more