commit 17ec4f1f6fa64a08892d8dcfa61ace684bae53fc
author ocornut <omarcornut@gmail.com> Mon Jul 12 16:42:53 2021 +0200
committer ocornut <omarcornut@gmail.com> Mon Jul 12 16:42:53 2021 +0200
tree 0b3bf5c9f7ddb5399523017555f402bf7d5b485c
parent fb4bbeb033254e0139b820525b9338262a1e03e6

TestEngine, MenuItem: call IMGUI_TEST_ENGINE_ITEM_INFO() at the right stack level. (amend f8fae02)

imgui_widgets.cpp

diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index f841018..a7fd04c 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -2534,6 +2534,7 @@
     TextEx(label, FindRenderedTextEnd(label));
     EndGroup();
     PopID();
+
     return value_changed;
 }
 
@@ -6583,6 +6584,7 @@
 // - EndMainMenuBar()
 // - BeginMenu()
 // - EndMenu()
+// - MenuItemEx() [Internal]
 // - MenuItem()
 //-------------------------------------------------------------------------
 
@@ -6852,7 +6854,6 @@
     }
     if (!enabled)
         PopDisabled();
-    PopID();
 
     const bool hovered = (g.HoveredId == id) && enabled;
     if (menuset_is_open)
@@ -6927,6 +6928,7 @@
         ClosePopupToLevel(g.BeginPopupStack.Size, true);
 
     IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.LastItemStatusFlags | ImGuiItemStatusFlags_Openable | (menu_is_open ? ImGuiItemStatusFlags_Opened : 0));
+    PopID();
 
     if (!menu_is_open && want_open && g.OpenPopupStack.Size > g.BeginPopupStack.Size)
     {
@@ -7022,11 +7024,11 @@
         if (selected)
             RenderCheckMark(window->DrawList, pos + ImVec2(offsets->OffsetMark + stretch_w + g.FontSize * 0.40f, g.FontSize * 0.134f * 0.5f), GetColorU32(ImGuiCol_Text), g.FontSize  * 0.866f);
     }
+    IMGUI_TEST_ENGINE_ITEM_INFO(window->DC.LastItemId, label, window->DC.LastItemStatusFlags | ImGuiItemStatusFlags_Checkable | (selected ? ImGuiItemStatusFlags_Checked : 0));
     if (!enabled)
         PopDisabled();
     PopID();
 
-    IMGUI_TEST_ENGINE_ITEM_INFO(window->DC.LastItemId, label, window->DC.LastItemStatusFlags | ImGuiItemStatusFlags_Checkable | (selected ? ImGuiItemStatusFlags_Checked : 0));
     return pressed;
 }