From 5c5ad9e2f53dbf1a3a6e521790aed6346b687c50 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Wed, 15 Sep 2021 01:57:54 +0200 Subject: [PATCH] chore: remove ManagedAsserts from ImGuiScene, change to our own --- Dalamud/Interface/Internal/DalamudInterface.cs | 10 +++++++--- .../Internal/ManagedAsserts/ImGuiManagedAsserts.cs | 4 ++-- lib/ImGuiScene | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs index 92b5ef31d..c989b4393 100644 --- a/Dalamud/Interface/Internal/DalamudInterface.cs +++ b/Dalamud/Interface/Internal/DalamudInterface.cs @@ -8,6 +8,7 @@ using Dalamud.Configuration.Internal; using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.Gui; using Dalamud.Game.Internal; +using Dalamud.Interface.Internal.ManagedAsserts; using Dalamud.Interface.Internal.Windows; using Dalamud.Interface.Internal.Windows.SelfTest; using Dalamud.Interface.Windowing; @@ -16,7 +17,6 @@ using Dalamud.Logging.Internal; using Dalamud.Plugin.Internal; using Dalamud.Utility; using ImGuiNET; -using ImGuiScene.ManagedAsserts; using PInvoke; using Serilog.Events; @@ -90,7 +90,7 @@ namespace Dalamud.Interface.Internal this.WindowSystem.AddWindow(this.settingsWindow); this.WindowSystem.AddWindow(this.selfTestWindow); - ImGuiManagedAsserts.EnableAsserts = true; + ImGuiManagedAsserts.AssertsEnabled = true; Service.Get().Draw += this.OnDraw; @@ -485,7 +485,11 @@ namespace Dalamud.Interface.Internal ImGui.Separator(); - ImGui.MenuItem("Enable Asserts", string.Empty, ref ImGuiManagedAsserts.EnableAsserts); + var val = ImGuiManagedAsserts.AssertsEnabled; + if (ImGui.MenuItem("Enable Asserts", string.Empty, ref val)) + { + ImGuiManagedAsserts.AssertsEnabled = val; + } if (ImGui.MenuItem("Clear focus")) { diff --git a/Dalamud/Interface/Internal/ManagedAsserts/ImGuiManagedAsserts.cs b/Dalamud/Interface/Internal/ManagedAsserts/ImGuiManagedAsserts.cs index b0df91162..ae5a0c3ff 100644 --- a/Dalamud/Interface/Internal/ManagedAsserts/ImGuiManagedAsserts.cs +++ b/Dalamud/Interface/Internal/ManagedAsserts/ImGuiManagedAsserts.cs @@ -12,9 +12,9 @@ namespace Dalamud.Interface.Internal.ManagedAsserts internal static class ImGuiManagedAsserts { /// - /// Gets a value indicating whether asserts are enabled for ImGui. + /// Gets or sets a value indicating whether asserts are enabled for ImGui. /// - public static bool AssertsEnabled { get; private set; } + public static bool AssertsEnabled { get; set; } /// /// Create a snapshot of the current ImGui context. diff --git a/lib/ImGuiScene b/lib/ImGuiScene index 304d78d22..165ba91e3 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit 304d78d229d3bbca46d3e0752761c732e98ffe03 +Subproject commit 165ba91e332572bef2b80107720c436c450fac51