commit 1dd964f87dc1ea0a76b137baf3401bd201fc2012
author ocornut <omarcornut@gmail.com> Fri Sep 16 22:25:20 2022 +0200
committer ocornut <omarcornut@gmail.com> Fri Sep 16 23:27:16 2022 +0200
tree 4962bbd97d96c048d1f024caf6bd86fa83db6f5c
parent 440f2576884909d9a27a36f581d98eb9cfc56bec

Popups & Modals: Fix (amended) somehow undocumented Popup+Child behavior (useful for e.g. #718, #4461 and probably other things)

(broken by 1c4066cd)

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index a4322bd..5cc6ca2 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -5511,7 +5511,7 @@
 {
     ImGuiContext& g = *GImGui;
 
-    const bool new_is_explicit_child = (new_flags & ImGuiWindowFlags_ChildWindow) != 0;
+    const bool new_is_explicit_child = (new_flags & ImGuiWindowFlags_ChildWindow) != 0 && ((new_flags & ImGuiWindowFlags_Popup) == 0 || (new_flags & ImGuiWindowFlags_ChildMenu) != 0);
     const bool child_flag_changed = new_is_explicit_child != window->IsExplicitChild;
     if ((just_created || child_flag_changed) && !new_is_explicit_child)
     {

imgui.h

diff --git a/imgui.h b/imgui.h
index 552a5f5..2f15165 100644
--- a/imgui.h
+++ b/imgui.h
@@ -23,7 +23,7 @@
 // Library Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM > 12345')
 #define IMGUI_VERSION               "1.89 WIP"
-#define IMGUI_VERSION_NUM           18820
+#define IMGUI_VERSION_NUM           18821
 #define IMGUI_HAS_TABLE
 
 /*