ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

add "disable for this session" button to ImGui asserts

Browse source
This commit is contained in:
goat 2024-12-25 17:03:22 +01:00
parent 12bf2f4478
commit 9d8bcb7a24
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Dalamud/Interface/Internal/AssertHandler.cs → Dalamud/Interface/Internal/Asserts/AssertHandler.cs
View file

@ -8,7 +8,7 @@ using Dalamud.Utility;
using Serilog;
namespace Dalamud.Interface.Internal;
namespace Dalamud.Interface.Internal.Asserts;
/// <summary>
/// Class responsible for registering and handling ImGui asserts.
@ -36,7 +36,7 @@ internal class AssertHandler : IDisposable
/// <summary>
/// Gets or sets a value indicating whether ImGui asserts should be shown to the user.
/// </summary>
public bool ShowAsserts { get; set; } = false;
public bool ShowAsserts { get; set; }
/// <summary>
/// Register the cimgui assert handler with the native library.
@ -93,7 +93,7 @@ internal class AssertHandler : IDisposable
var gitHubUrl = GetRepoUrl();
var showOnGitHubButton = new TaskDialogButton
{
Text = "Show on GitHub",
Text = "Open GitHub",
AllowCloseDialog = false,
Enabled = !gitHubUrl.IsNullOrEmpty(),
};
@ -108,9 +108,14 @@ internal class AssertHandler : IDisposable
Text = "Break",
AllowCloseDialog = true,
};
var disableButton = new TaskDialogButton
{
Text = "Disable for this session",
AllowCloseDialog = true,
};
var ignoreButton = TaskDialogButton.Ignore;
var abortButton = TaskDialogButton.Abort;
TaskDialogButton? result = null;
void DialogThreadStart()
@ -119,7 +124,7 @@ internal class AssertHandler : IDisposable
// this session since it already loaded visual styles...
Application.EnableVisualStyles();
var page = new TaskDialogPage()
var page = new TaskDialogPage
{
Heading = "ImGui assertion failed",
Caption = "Dalamud",
@ -135,8 +140,8 @@ internal class AssertHandler : IDisposable
[
showOnGitHubButton,
breakButton,
disableButton,
ignoreButton,
abortButton,
],
DefaultButton = showOnGitHubButton,
};
@ -157,9 +162,9 @@ internal class AssertHandler : IDisposable
{
Debugger.Break();
}
else if (result == abortButton)
else if (result == disableButton)
{
Environment.Exit(-1);
this.ShowAsserts = false;
}
else if (result == ignoreButton)
{
@ -171,7 +176,7 @@ internal class AssertHandler : IDisposable
{
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
#pragma warning disable SA1300
public static extern void igCustom_SetAssertCallback(AssertCallbackDelegate callback);
public static extern void igCustom_SetAssertCallback(AssertCallbackDelegate? callback);
#pragma warning restore SA1300
}
}

1
Dalamud/Interface/Internal/InterfaceManager.cs
View file

@ -19,6 +19,7 @@ using Dalamud.Hooking.Internal;
using Dalamud.Hooking.WndProcHook;
using Dalamud.Interface.ImGuiNotification;
using Dalamud.Interface.ImGuiNotification.Internal;
using Dalamud.Interface.Internal.Asserts;
using Dalamud.Interface.Internal.DesignSystem;
using Dalamud.Interface.Internal.ReShadeHandling;
using Dalamud.Interface.ManagedFontAtlas;