JonKazama-Hellion/Craftimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Don't break macro editor when font atlas isn't built yet

Browse Source
This commit is contained in:
Asriel Camora
2024-06-22 15:33:01 -07:00
parent 90f53de3d8
commit 8035e68ee0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Craftimizer/Windows/MacroEditor.cs
+5 -4
View File
@@ -726,12 +726,13 @@ public sealed class MacroEditor : Window, IDisposable
ushort? newRecipe = null; ushort? newRecipe = null;
{ {
var recipe = RecipeData.Recipe; var recipe = RecipeData.Recipe;
using var fontHandle = AxisFont.Lock(); using var lockedFontHandle = AxisFont.Available ? AxisFont.Lock() : null;
var fontHandle = lockedFontHandle?.ImFont ?? ImGui.GetFont();
if (ImGuiUtils.SearchableCombo( if (ImGuiUtils.SearchableCombo(
"combo", "combo",
ref recipe, ref recipe,
LuminaSheets.RecipeSheet.Where(r => r.RecipeLevelTable.Row != 0 && r.ItemResult.Row != 0), LuminaSheets.RecipeSheet.Where(r => r.RecipeLevelTable.Row != 0 && r.ItemResult.Row != 0),
fontHandle.ImFont, fontHandle,
ImGui.GetContentRegionAvail().X - rightSideWidth, ImGui.GetContentRegionAvail().X - rightSideWidth,
r => r.ItemResult.Value!.Name.ToDalamudString().ToString(), r => r.ItemResult.Value!.Name.ToDalamudString().ToString(),
r => r.RowId.ToString(), r => r.RowId.ToString(),
@@ -744,7 +745,7 @@ public sealed class MacroEditor : Window, IDisposable
var textLevelSize = ImGui.CalcTextSize(textLevel); var textLevelSize = ImGui.CalcTextSize(textLevel);
ImGui.SameLine(); ImGui.SameLine();
var imageSize = fontHandle.ImFont.FontSize; var imageSize = fontHandle.FontSize;
ImGuiUtils.AlignRight( ImGuiUtils.AlignRight(
imageSize + 5 + imageSize + 5 +
textLevelSize.X, textLevelSize.X,
@@ -758,7 +759,7 @@ public sealed class MacroEditor : Window, IDisposable
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + ImGui.GetStyle().FramePadding.Y / 2); ImGui.SetCursorPosY(ImGui.GetCursorPosY() + ImGui.GetStyle().FramePadding.Y / 2);
ImGui.Image(Service.IconManager.GetIcon(classJob.GetIconId()).ImGuiHandle, new Vector2(imageSize), uv0, uv1); ImGui.Image(Service.IconManager.GetIcon(classJob.GetIconId()).ImGuiHandle, new Vector2(imageSize), uv0, uv1);
ImGui.SameLine(0, 5); ImGui.SameLine(0, 5);
ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (fontHandle.ImFont.FontSize - textLevelSize.Y) / 2); ImGui.SetCursorPosY(ImGui.GetCursorPosY() + (fontHandle.FontSize - textLevelSize.Y) / 2);
ImGui.TextUnformatted(textLevel); ImGui.TextUnformatted(textLevel);
})) }))
{ {