From 8ed21b46457b93930fa90e173ed97818b5b8c65d Mon Sep 17 00:00:00 2001 From: Haselnussbomber Date: Wed, 22 Oct 2025 07:16:13 +0200 Subject: [PATCH 1/2] Public ImRaii end objects --- Dalamud/Interface/Utility/Raii/EndObjects.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dalamud/Interface/Utility/Raii/EndObjects.cs b/Dalamud/Interface/Utility/Raii/EndObjects.cs index f84844dda..8243c7dfb 100644 --- a/Dalamud/Interface/Utility/Raii/EndObjects.cs +++ b/Dalamud/Interface/Utility/Raii/EndObjects.cs @@ -242,7 +242,7 @@ public static partial class ImRaii // Use end-function regardless of success. // Used by Child, Group and Tooltip. - private struct EndUnconditionally : IEndObject + public struct EndUnconditionally : IEndObject { private Action EndAction { get; } @@ -268,7 +268,7 @@ public static partial class ImRaii } // Use end-function only on success. - private struct EndConditionally : IEndObject + public struct EndConditionally : IEndObject { public EndConditionally(Action endAction, bool success) { From f0568216cbc802d594d4f9eb9d79b26ef358b679 Mon Sep 17 00:00:00 2001 From: Haselnussbomber Date: Wed, 22 Oct 2025 07:18:43 +0200 Subject: [PATCH 2/2] Provide PopupModal with flags --- Dalamud/Interface/Utility/Raii/EndObjects.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dalamud/Interface/Utility/Raii/EndObjects.cs b/Dalamud/Interface/Utility/Raii/EndObjects.cs index 8243c7dfb..80122360c 100644 --- a/Dalamud/Interface/Utility/Raii/EndObjects.cs +++ b/Dalamud/Interface/Utility/Raii/EndObjects.cs @@ -40,6 +40,9 @@ public static partial class ImRaii public static IEndObject PopupModal(ImU8String id) => new EndConditionally(ImGui.EndPopup, ImGui.BeginPopupModal(id)); + public static IEndObject PopupModal(ImU8String id, ImGuiWindowFlags flags) + => new EndConditionally(ImGui.EndPopup, ImGui.BeginPopupModal(id, flags)); + public static IEndObject PopupModal(ImU8String id, ref bool open) => new EndConditionally(ImGui.EndPopup, ImGui.BeginPopupModal(id, ref open));