update imgui (see second fix in ocornut/imgui#8242)

pthom · Dec 22, 2024 · 8dfcc00 · 8dfcc00
1 parent e5f7c3a
commit 8dfcc00
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/bindings/imgui_bundle/imgui/internal.pyi b/bindings/imgui_bundle/imgui/internal.pyi
@@ -3397,14 +3397,14 @@ class Context:
     frame_count_platform_ended: int
     # int                     FrameCountRendered;    /* original C++ signature */
     frame_count_rendered: int
+    # ImGuiID                 WithinEndChildID;    /* original C++ signature */
+    within_end_child_id: ID  # Set within EndChild()
     # bool                    WithinFrameScope;    /* original C++ signature */
     within_frame_scope: bool  # Set by NewFrame(), cleared by EndFrame()
     # bool                    WithinFrameScopeWithImplicitWindow;    /* original C++ signature */
     within_frame_scope_with_implicit_window: (
         bool  # Set by NewFrame(), cleared by EndFrame() when the implicit debug window has been pushed
     )
-    # bool                    WithinEndChild;    /* original C++ signature */
-    within_end_child: bool  # Set within EndChild()
     # bool                    GcCompactAll;    /* original C++ signature */
     gc_compact_all: bool  # Request full GC
     # bool                    TestEngineHookItems;    /* original C++ signature */

diff --git a/external/imgui/bindings/pybind_imgui_internal.cpp b/external/imgui/bindings/pybind_imgui_internal.cpp
@@ -2153,9 +2153,9 @@ void py_init_module_imgui_internal(nb::module_& m)
         .def_rw("frame_count_ended", &ImGuiContext::FrameCountEnded, "")
         .def_rw("frame_count_platform_ended", &ImGuiContext::FrameCountPlatformEnded, "")
         .def_rw("frame_count_rendered", &ImGuiContext::FrameCountRendered, "")
+        .def_rw("within_end_child_id", &ImGuiContext::WithinEndChildID, "Set within EndChild()")
         .def_rw("within_frame_scope", &ImGuiContext::WithinFrameScope, "Set by NewFrame(), cleared by EndFrame()")
         .def_rw("within_frame_scope_with_implicit_window", &ImGuiContext::WithinFrameScopeWithImplicitWindow, "Set by NewFrame(), cleared by EndFrame() when the implicit debug window has been pushed")
-        .def_rw("within_end_child", &ImGuiContext::WithinEndChild, "Set within EndChild()")
         .def_rw("gc_compact_all", &ImGuiContext::GcCompactAll, "Request full GC")
         .def_rw("test_engine_hook_items", &ImGuiContext::TestEngineHookItems, "Will call test engine hooks: ImGuiTestEngineHook_ItemAdd(), ImGuiTestEngineHook_ItemInfo(), ImGuiTestEngineHook_Log()")
         .def_rw("test_engine", &ImGuiContext::TestEngine, "Test engine user data")

diff --git a/external/imgui/imgui b/external/imgui/imgui
diff --git a/external/imgui_test_engine/imgui_test_engine b/external/imgui_test_engine/imgui_test_engine
+4 −4		backends/imgui_impl_dx12.cpp
+1 −0		backends/imgui_impl_opengl3.cpp
+8 −0		docs/CHANGELOG.txt
+8 −8		docs/EXAMPLES.md
+28 −15		imgui.cpp
+2 −1		imgui.h
+4 −0		imgui_demo.cpp
+47 −2		imgui_draw.cpp
+3 −2		imgui_internal.h
+4 −0		imgui_tables.cpp
+18 −4		imgui_widgets.cpp
+10 −0		docs/CHANGELOG.txt
+5 −2		imgui_test_engine/imgui_te_context.cpp
+5 −4		imgui_test_engine/imgui_te_engine.cpp
+4 −2		imgui_test_suite/imgui_test_suite.cpp
+41 −1		imgui_test_suite/imgui_tests_core.cpp
+1 −1		imgui_test_suite/imgui_tests_nav.cpp
+56 −0		imgui_test_suite/imgui_tests_widgets.cpp
+3 −1		imgui_test_suite/imgui_tests_widgets_inputtext.cpp