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

chore: remove ManagedAsserts from ImGuiScene, change to our own

Browse source
This commit is contained in:
goat 2021-09-15 01:57:54 +02:00
parent 1b7856e54e
commit 5c5ad9e2f5
No known key found for this signature in database
GPG key ID: F18F057873895461
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/Interface/Internal/DalamudInterface.cs
View file

@ -8,6 +8,7 @@ using Dalamud.Configuration.Internal;
using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.Gui; using Dalamud.Game.Gui;
using Dalamud.Game.Internal; using Dalamud.Game.Internal;
using Dalamud.Interface.Internal.ManagedAsserts;
using Dalamud.Interface.Internal.Windows; using Dalamud.Interface.Internal.Windows;
using Dalamud.Interface.Internal.Windows.SelfTest; using Dalamud.Interface.Internal.Windows.SelfTest;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
@ -16,7 +17,6 @@ using Dalamud.Logging.Internal;
using Dalamud.Plugin.Internal; using Dalamud.Plugin.Internal;
using Dalamud.Utility; using Dalamud.Utility;
using ImGuiNET; using ImGuiNET;
using ImGuiScene.ManagedAsserts;
using PInvoke; using PInvoke;
using Serilog.Events; using Serilog.Events;
@ -90,7 +90,7 @@ namespace Dalamud.Interface.Internal
this.WindowSystem.AddWindow(this.settingsWindow); this.WindowSystem.AddWindow(this.settingsWindow);
this.WindowSystem.AddWindow(this.selfTestWindow); this.WindowSystem.AddWindow(this.selfTestWindow);
ImGuiManagedAsserts.EnableAsserts = true; ImGuiManagedAsserts.AssertsEnabled = true;
Service<InterfaceManager>.Get().Draw += this.OnDraw; Service<InterfaceManager>.Get().Draw += this.OnDraw;
@ -485,7 +485,11 @@ namespace Dalamud.Interface.Internal
ImGui.Separator(); 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")) if (ImGui.MenuItem("Clear focus"))
{ {

4
Dalamud/Interface/Internal/ManagedAsserts/ImGuiManagedAsserts.cs
View file

@ -12,9 +12,9 @@ namespace Dalamud.Interface.Internal.ManagedAsserts
internal static class ImGuiManagedAsserts internal static class ImGuiManagedAsserts
{ {
/// <summary> /// <summary>
/// Gets a value indicating whether asserts are enabled for ImGui. /// Gets or sets a value indicating whether asserts are enabled for ImGui.
/// </summary> /// </summary>
public static bool AssertsEnabled { get; private set; } public static bool AssertsEnabled { get; set; }
/// <summary> /// <summary>
/// Create a snapshot of the current ImGui context. /// Create a snapshot of the current ImGui context.

2
lib/ImGuiScene

@ -1 +1 @@
Subproject commit 304d78d229d3bbca46d3e0752761c732e98ffe03 Subproject commit 165ba91e332572bef2b80107720c436c450fac51