Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-20 14:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Docking: fix 58f5092 (#4310)

Browse Source 
If we clear _ChildWindow flag we must remove it from here otherwise render loop will fail.
This commit is contained in:
ocornut 2021-08-27 21:29:27 +02:00
parent 58f5092c53
commit 0eb45a0577
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imgui.cpp
View File

@ -13112,8 +13112,11 @@ void ImGui::DockContextProcessUndockNode(ImGuiContext* ctx, ImGuiDockNode* node)
DockSettingsRenameNodeReferences(node->ID, new_node->ID); DockSettingsRenameNodeReferences(node->ID, new_node->ID);
for (int n = 0; n < new_node->Windows.Size; n++) for (int n = 0; n < new_node->Windows.Size; n++)
{ {
new_node->Windows[n]->Flags &= ~ImGuiWindowFlags_ChildWindow; ImGuiWindow* window = new_node->Windows[n];
UpdateWindowParentAndRootLinks(new_node->Windows[n], new_node->Windows[n]->Flags, NULL); window->Flags &= ~ImGuiWindowFlags_ChildWindow;
if (window->ParentWindow)
window->ParentWindow->DC.ChildWindows.find_erase(window);
UpdateWindowParentAndRootLinks(window, window->Flags, NULL);
} }
node = new_node; node = new_node;
} }
@ -13297,6 +13300,8 @@ static void ImGui::DockNodeRemoveWindow(ImGuiDockNode* node, ImGuiWindow* window
window->DockIsActive = window->DockTabWantClose = false; window->DockIsActive = window->DockTabWantClose = false;
window->DockId = save_dock_id; window->DockId = save_dock_id;
window->Flags &= ~ImGuiWindowFlags_ChildWindow; window->Flags &= ~ImGuiWindowFlags_ChildWindow;
if (window->ParentWindow)
window->ParentWindow->DC.ChildWindows.find_erase(window);
UpdateWindowParentAndRootLinks(window, window->Flags, NULL); // Update immediately UpdateWindowParentAndRootLinks(window, window->Flags, NULL); // Update immediately
// Remove window // Remove window