|
@@ -5844,19 +5844,15 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
|
|
|
window->DC.ParentLayoutType = parent_window ? parent_window->DC.LayoutType : ImGuiLayoutType_Vertical;
|
|
|
window->DC.FocusCounterRegular = window->DC.FocusCounterTabStop = -1;
|
|
|
|
|
|
- window->DC.ItemFlags = parent_window ? parent_window->DC.ItemFlags : ImGuiItemFlags_Default_;
|
|
|
window->DC.ItemWidth = window->ItemWidthDefault;
|
|
|
window->DC.TextWrapPos = -1.0f; // disabled
|
|
|
window->DC.ItemFlagsStack.resize(0);
|
|
|
window->DC.ItemWidthStack.resize(0);
|
|
|
window->DC.TextWrapPosStack.resize(0);
|
|
|
window->DC.GroupStack.resize(0);
|
|
|
-
|
|
|
- if ((flags & ImGuiWindowFlags_ChildWindow) && (window->DC.ItemFlags != parent_window->DC.ItemFlags))
|
|
|
- {
|
|
|
- window->DC.ItemFlags = parent_window->DC.ItemFlags;
|
|
|
+ window->DC.ItemFlags = parent_window ? parent_window->DC.ItemFlags : ImGuiItemFlags_Default_;
|
|
|
+ if (parent_window)
|
|
|
window->DC.ItemFlagsStack.push_back(window->DC.ItemFlags);
|
|
|
- }
|
|
|
|
|
|
if (window->AutoFitFramesX > 0)
|
|
|
window->AutoFitFramesX--;
|