Force TextUnformatted

This commit is contained in:
Asriel Camora
2024-06-19 18:49:19 -07:00
parent e3e7329fe3
commit 28125ad15b
5 changed files with 35 additions and 35 deletions
+1 -1
View File
@@ -614,7 +614,7 @@ internal static class ImGuiUtils
var textBuf = text.AsSpan();
var lineSize = font.CalcWordWrapPositionA(1, textBuf, currentWrapWidth) ?? textBuf.Length;
var lineBuf = textBuf[..lineSize];
ImGui.Text(lineBuf.ToString());
ImGui.TextUnformatted(lineBuf.ToString());
var remainingBuf = textBuf[lineSize..].TrimStart();
if (!remainingBuf.IsEmpty)
+1 -1
View File
@@ -120,7 +120,7 @@ internal static class DynamicBars
{
ImGuiUtils.TextRight($"{bar.Value:0}", maxSize);
ImGui.SameLine(0, spacing / 2);
ImGui.Text("/");
ImGui.TextUnformatted("/");
ImGui.SameLine(0, spacing / 2);
ImGuiUtils.TextRight($"{bar.Max:0}", maxSize);
}
+12 -12
View File
@@ -240,7 +240,7 @@ public sealed class MacroEditor : Window, IDisposable
void DrawStat(string name, int value, Action<int> setter)
{
ImGui.AlignTextToFramePadding();
ImGui.Text(name);
ImGui.TextUnformatted(name);
ImGui.SameLine(0, 5);
ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);
@@ -280,7 +280,7 @@ public sealed class MacroEditor : Window, IDisposable
levelTextWidth);
ImGui.AlignTextToFramePadding();
ImGui.Text(SqText.LevelPrefix.ToIconString());
ImGui.TextUnformatted(SqText.LevelPrefix.ToIconString());
ImGui.SameLine(0, 3);
ImGui.SetNextItemWidth(levelTextWidth);
var levelText = SqText.ToLevelString(CharacterStats.Level);
@@ -759,7 +759,7 @@ public sealed class MacroEditor : Window, IDisposable
ImGui.Image(Service.IconManager.GetIcon(classJob.GetIconId()).ImGuiHandle, new Vector2(imageSize), uv0, uv1);
ImGui.SameLine(0, 5);
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (fontHandle.ImFont.FontSize - textLevelSize.Y) / 2);
ImGui.Text(textLevel);
ImGui.TextUnformatted(textLevel);
}))
{
newRecipe = (ushort)recipe.RowId;
@@ -767,7 +767,7 @@ public sealed class MacroEditor : Window, IDisposable
}
ImGui.SameLine(0, 5);
ImGui.Text(textLevel);
ImGui.TextUnformatted(textLevel);
if (ImGui.IsItemHovered())
ImGuiUtils.Tooltip($"RLvl {RecipeData.RecipeInfo.RLvl}");
@@ -808,17 +808,17 @@ public sealed class MacroEditor : Window, IDisposable
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();
ImGui.Text("Progress");
ImGui.TextUnformatted("Progress");
ImGui.SameLine();
ImGuiUtils.TextRight($"{RecipeData.RecipeInfo.MaxProgress}");
ImGui.TableNextColumn();
ImGui.Text("Quality");
ImGui.TextUnformatted("Quality");
ImGui.SameLine();
ImGuiUtils.TextRight($"{RecipeData.RecipeInfo.MaxQuality}");
ImGui.TableNextColumn();
ImGui.Text("Durability");
ImGui.TextUnformatted("Durability");
ImGui.SameLine();
ImGuiUtils.TextRight($"{RecipeData.RecipeInfo.MaxDurability}");
}
@@ -917,7 +917,7 @@ public sealed class MacroEditor : Window, IDisposable
}
ImGui.SameLine(0, 5);
ImGui.AlignTextToFramePadding();
ImGui.Text("/");
ImGui.TextUnformatted("/");
ImGui.SameLine(0, 5);
ImGui.AlignTextToFramePadding();
ImGuiUtils.TextCentered($"{ingredient.Amount}");
@@ -1019,7 +1019,7 @@ public sealed class MacroEditor : Window, IDisposable
ImGui.Dummy(new(ImGui.GetFrameHeight()));
ImGui.SameLine(0, spacing);
ImGui.AlignTextToFramePadding();
ImGui.Text(condition.Name());
ImGui.TextUnformatted(condition.Name());
}
if (ImGui.IsItemHovered())
ImGuiUtils.Tooltip(condition.Description(CharacterStats.HasSplendorousBuff));
@@ -1165,7 +1165,7 @@ public sealed class MacroEditor : Window, IDisposable
{
ImGuiUtils.TextRight($"{bar.Value:0}", maxSize);
ImGui.SameLine(0, spacing / 2);
ImGui.Text("/");
ImGui.TextUnformatted("/");
ImGui.SameLine(0, spacing / 2);
ImGuiUtils.TextRight($"{bar.Max:0}", maxSize);
}
@@ -1443,10 +1443,10 @@ public sealed class MacroEditor : Window, IDisposable
if (ImGui.IsItemHovered())
{
using var t = ImRaii.Tooltip();
ImGui.Text("Supported sites:");
ImGui.TextUnformatted("Supported sites:");
ImGui.BulletText("ffxivteamcraft.com");
ImGui.BulletText("craftingway.app");
ImGui.Text("More suggestions are appreciated!");
ImGui.TextUnformatted("More suggestions are appreciated!");
}
ImGui.SetNextItemWidth(availWidth);
submittedUrl = ImGui.InputTextWithHint("", ExampleUrl, ref popupImportUrl, 2048, ImGuiInputTextFlags.AutoSelectAll | ImGuiInputTextFlags.EnterReturnsTrue);
+17 -17
View File
@@ -462,7 +462,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
if (level != 0)
{
ImGui.Text(levelText);
ImGui.TextUnformatted(levelText);
if (ImGui.IsItemHovered())
ImGuiUtils.Tooltip($"CLvl {Gearsets.CalculateCLvl(level)}");
ImGui.SameLine(0, 3);
@@ -509,7 +509,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
var unlockText = $"Unlock it from {questGiver}";
ImGuiUtils.AlignCentered(ImGui.CalcTextSize(unlockText).X + 5 + ImGui.GetFrameHeight());
ImGui.AlignTextToFramePadding();
ImGui.Text(unlockText);
ImGui.TextUnformatted(unlockText);
ImGui.SameLine(0, 5);
if (ImGuiComponents.IconButton(FontAwesomeIcon.Flag))
Service.GameGui.OpenMapWithMapLink(mapPayload);
@@ -544,7 +544,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
var unlockText = $"Trade a Soul of the Crafter to {vendorName}";
ImGuiUtils.AlignCentered(ImGui.CalcTextSize(unlockText).X + 5 + ImGui.GetFrameHeight());
ImGui.AlignTextToFramePadding();
ImGui.Text(unlockText);
ImGui.TextUnformatted(unlockText);
ImGui.SameLine(0, 5);
if (ImGuiComponents.IconButton(FontAwesomeIcon.Flag))
Service.GameGui.OpenMapWithMapLink(mapPayload);
@@ -565,7 +565,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
ImGui.AlignTextToFramePadding();
ImGui.Image(Service.IconManager.GetIcon(item.Icon).ImGuiHandle, new(imageSize));
ImGui.SameLine(0, 5);
ImGui.Text(itemName);
ImGui.TextUnformatted(itemName);
}
break;
case CraftableStatus.RequiredStatus:
@@ -580,7 +580,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
ImGui.AlignTextToFramePadding();
ImGui.Image(statusIcon.ImGuiHandle, imageSize);
ImGui.SameLine(0, 5);
ImGui.Text(statusName);
ImGui.TextUnformatted(statusName);
}
break;
case CraftableStatus.CraftsmanshipTooLow:
@@ -606,17 +606,17 @@ public sealed unsafe class RecipeNote : Window, IDisposable
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthStretch);
ImGui.TableNextColumn();
ImGui.Text("Craftsmanship");
ImGui.TextUnformatted("Craftsmanship");
ImGui.TableNextColumn();
ImGuiUtils.TextRight($"{CharacterStats!.Craftsmanship}");
ImGui.TableNextColumn();
ImGui.Text("Control");
ImGui.TextUnformatted("Control");
ImGui.TableNextColumn();
ImGuiUtils.TextRight($"{CharacterStats.Control}");
ImGui.TableNextColumn();
ImGui.Text("CP");
ImGui.TextUnformatted("CP");
ImGui.TableNextColumn();
ImGuiUtils.TextRight($"{CharacterStats.CP}");
}
@@ -658,7 +658,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
ImGui.Image(Service.IconManager.GetIcon(RecipeData.Recipe.ItemResult.Value!.Icon).ImGuiHandle, new Vector2(imageSize));
ImGui.SameLine(0, 5);
ImGui.Text(textLevel);
ImGui.TextUnformatted(textLevel);
if (ImGui.IsItemHovered())
ImGuiUtils.Tooltip($"RLvl {RecipeData.RecipeInfo.RLvl}");
@@ -699,17 +699,17 @@ public sealed unsafe class RecipeNote : Window, IDisposable
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthStretch);
ImGui.TableNextColumn();
ImGui.Text("Progress");
ImGui.TextUnformatted("Progress");
ImGui.TableNextColumn();
ImGuiUtils.TextRight($"{RecipeData.RecipeInfo.MaxProgress}");
ImGui.TableNextColumn();
ImGui.Text("Quality");
ImGui.TextUnformatted("Quality");
ImGui.TableNextColumn();
ImGuiUtils.TextRight($"{RecipeData.RecipeInfo.MaxQuality}");
ImGui.TableNextColumn();
ImGui.Text("Durability");
ImGui.TextUnformatted("Durability");
ImGui.TableNextColumn();
ImGuiUtils.TextRight($"{RecipeData.RecipeInfo.MaxDurability}");
}
@@ -825,7 +825,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
ImGui.SameLine(0, spacing);
ImGuiUtils.AlignMiddle(calcTextSize, new(calcTextSize.X, windowHeight));
ImGui.Text("Calculating...");
ImGui.TextUnformatted("Calculating...");
ImGui.SetCursorPos(c + new Vector2(0, windowHeight + ImGui.GetStyle().ItemSpacing.Y - 1));
break;
}
@@ -1013,19 +1013,19 @@ public sealed unsafe class RecipeNote : Window, IDisposable
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthStretch);
ImGui.TableNextColumn();
ImGui.Text("Current");
ImGui.TextUnformatted("Current");
ImGui.TableNextColumn();
ImGui.TextColored(new(0, 1, 0, 1), $"{current}");
ImGui.TableNextColumn();
ImGui.Text("Required");
ImGui.TextUnformatted("Required");
ImGui.TableNextColumn();
ImGui.TextColored(new(1, 0, 0, 1), $"{required}");
ImGui.TableNextColumn();
ImGui.Text("You need");
ImGui.TextUnformatted("You need");
ImGui.TableNextColumn();
ImGui.Text($"{required - current}");
ImGui.TextUnformatted($"{required - current}");
}
}
+4 -4
View File
@@ -287,7 +287,7 @@ public sealed class Settings : Window, IDisposable
using (var color = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudOrange))
{
using var font = ImRaii.PushFont(UiBuilder.IconFont);
ImGui.Text(FontAwesomeIcon.ExclamationCircle.ToIconString());
ImGui.TextUnformatted(FontAwesomeIcon.ExclamationCircle.ToIconString());
}
if (ImGui.IsItemHovered())
ImGuiUtils.Tooltip("Macro Chain is not installed");
@@ -522,7 +522,7 @@ public sealed class Settings : Window, IDisposable
{
poolWidth -= ImGui.GetStyle().ItemSpacing.X * 2;
ImGui.Text("Select the actions you want the solver to choose from.");
ImGui.TextUnformatted("Select the actions you want the solver to choose from.");
var pool = config.ActionPool;
DrawActionPool(ref pool, poolWidth, out var isPoolDirty);
@@ -954,11 +954,11 @@ public sealed class Settings : Window, IDisposable
ImGuiUtils.TextCentered($"v{plugin.Version} {plugin.BuildConfiguration}");
ImGuiUtils.AlignCentered(ImGui.CalcTextSize($"By {plugin.Author} (WorkingRobot)").X);
ImGui.Text($"By {plugin.Author} (");
ImGui.TextUnformatted($"By {plugin.Author} (");
ImGui.SameLine(0, 0);
ImGuiUtils.Hyperlink("WorkingRobot", "https://github.com/WorkingRobot");
ImGui.SameLine(0, 0);
ImGui.Text(")");
ImGui.TextUnformatted(")");
ImGuiUtils.AlignCentered(ImGui.CalcTextSize($"Ko-fi").X);
ImGuiUtils.Hyperlink("Ko-fi", "https://ko-fi.com/camora");