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

Fix crafting log rendering bug (ugh)

Browse Source
This commit is contained in:
Asriel Camora
2024-02-22 22:04:10 -08:00
parent dd2f92de87
commit e9e4227313
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Craftimizer/Windows/RecipeNote.cs
+19 -6
View File
@@ -113,6 +113,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
return isOpen; return isOpen;
} }
private bool StatsChanged { get; set; }
private bool ShouldDraw() private bool ShouldDraw()
{ {
if (Service.ClientState.LocalPlayer == null) if (Service.ClientState.LocalPlayer == null)
@@ -132,7 +133,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
return false; return false;
} }
var statsChanged = false; StatsChanged = false;
{ {
var instance = CSRecipeNote.Instance(); var instance = CSRecipeNote.Instance();
@@ -148,7 +149,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
if (recipeId != RecipeData?.RecipeId) if (recipeId != RecipeData?.RecipeId)
{ {
RecipeData = new(recipeId); RecipeData = new(recipeId);
statsChanged = true; StatsChanged = true;
} }
} }
@@ -166,7 +167,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
if (characterStats != CharacterStats) if (characterStats != CharacterStats)
{ {
CharacterStats = characterStats; CharacterStats = characterStats;
statsChanged = true; StatsChanged = true;
} }
} }
@@ -174,10 +175,10 @@ public sealed unsafe class RecipeNote : Window, IDisposable
if (craftStatus != CraftStatus) if (craftStatus != CraftStatus)
{ {
CraftStatus = craftStatus; CraftStatus = craftStatus;
statsChanged = true; StatsChanged = true;
} }
if (statsChanged && CraftStatus == CraftableStatus.OK) if (StatsChanged && CraftStatus == CraftableStatus.OK)
CalculateBestMacros(); CalculateBestMacros();
return true; return true;
@@ -199,10 +200,16 @@ public sealed unsafe class RecipeNote : Window, IDisposable
public override void Draw() public override void Draw()
{ {
var availWidth = ImGui.GetContentRegionAvail().X; var availWidth = ImGui.GetContentRegionAvail().X;
using (var table = ImRaii.Table("stats", 2, ImGuiTableFlags.BordersInnerV | ImGuiTableFlags.SizingFixedSame)) using (var table = ImRaii.Table("stats", 2, ImGuiTableFlags.BordersInnerV | ImGuiTableFlags.SizingFixedSame | ImGuiTableFlags.NoSavedSettings))
{ {
if (table) if (table)
{ {
if (StatsChanged)
{
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 150);
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 150);
}
ImGui.TableNextColumn(); ImGui.TableNextColumn();
DrawCharacterStats(); DrawCharacterStats();
ImGui.TableNextColumn(); ImGui.TableNextColumn();
@@ -437,6 +444,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
if (table) if (table)
{ {
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 100); ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 100);
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthStretch);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.Text("Craftsmanship"); ImGui.Text("Craftsmanship");
@@ -456,6 +464,9 @@ public sealed unsafe class RecipeNote : Window, IDisposable
} }
break; break;
} }
using var _spacing = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, Vector2.Zero);
ImGui.Dummy(Vector2.Zero);
} }
private void DrawRecipeStats() private void DrawRecipeStats()
@@ -525,6 +536,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
if (table) if (table)
{ {
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 100); ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 100);
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthStretch);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.Text("Progress"); ImGui.Text("Progress");
@@ -704,6 +716,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
if (table) if (table)
{ {
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 100); ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthFixed, 100);
ImGui.TableSetupColumn("", ImGuiTableColumnFlags.WidthStretch);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
ImGui.Text("Current"); ImGui.Text("Current");