From bc024b17e10fdbd3134575ba3dbc3543f5e661bf Mon Sep 17 00:00:00 2001 From: Raymond Date: Tue, 10 Aug 2021 08:35:21 -0400 Subject: [PATCH] Fix duplicate imgui ID on plugin control buttons --- .../Internal/Windows/PluginInstallerWindow.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index b99c1beb9..902976feb 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -614,7 +614,9 @@ namespace Dalamud.Interface.Internal.Windows label += Locs.PluginTitleMod_TestingVersion; } - if (this.DrawPluginCollapsingHeader(label, manifest, false, false, index)) + ImGui.PushID($"available{index}{manifest.InternalName}"); + + if (ImGui.CollapsingHeader($"{label}###Header")) { ImGuiHelpers.ScaledDummy(5); @@ -709,6 +711,8 @@ namespace Dalamud.Interface.Internal.Windows ImGui.EndPopup(); } + + ImGui.PopID(); } private void DrawInstalledPlugin(LocalPlugin plugin, int index, bool showInstalled = false) @@ -782,7 +786,9 @@ namespace Dalamud.Interface.Internal.Windows trouble = true; } - if (this.DrawPluginCollapsingHeader(label, plugin.Manifest, trouble, availablePluginUpdate != default, index)) + ImGui.PushID($"installed{index}{plugin.Manifest.InternalName}"); + + if (ImGui.CollapsingHeader($"{label}###Header")) { var manifest = plugin.Manifest; @@ -880,6 +886,8 @@ namespace Dalamud.Interface.Internal.Windows ImGui.EndPopup(); } + + ImGui.PopID(); } private void DrawPluginControlButton(LocalPlugin plugin)