Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-23 16:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Docking: Fixed crash using DockBuilderSplitNode(). (#2109)

Browse Source
This commit is contained in:
omar 2018-10-02 11:09:53 +02:00
parent 2cff3f6a65
commit 44bfa24cc3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imgui.cpp
View File

@ -10092,7 +10092,6 @@ void ImGui::DockContextProcessDock(ImGuiContext* ctx, ImGuiDockRequest* req)
TabBarAddTab(target_node->TabBar, target_node->Windows[n], ImGuiTabItemFlags_None); TabBarAddTab(target_node->TabBar, target_node->Windows[n], ImGuiTabItemFlags_None);
} }
const ImGuiID payload_node_id = payload_node ? payload_node->ID : payload_window->DockId;
if (payload_node != NULL) if (payload_node != NULL)
{ {
// Transfer full payload node (with 1+ child windows or child nodes) // Transfer full payload node (with 1+ child windows or child nodes)
@ -10116,18 +10115,20 @@ void ImGui::DockContextProcessDock(ImGuiContext* ctx, ImGuiDockRequest* req)
} }
else else
{ {
const ImGuiID payload_dock_id = payload_node->ID;
DockNodeMoveWindows(target_node, payload_node); DockNodeMoveWindows(target_node, payload_node);
DockSettingsMoveDockReferencesInInactiveWindow(payload_node_id, target_node->ID); DockSettingsMoveDockReferencesInInactiveWindow(payload_dock_id, target_node->ID);
} }
DockContextRemoveNode(ctx, payload_node, true); DockContextRemoveNode(ctx, payload_node, true);
} }
else if (payload_window) else if (payload_window)
{ {
// Transfer single window // Transfer single window
const ImGuiID payload_dock_id = payload_window->DockId;
target_node->VisibleWindow = payload_window; target_node->VisibleWindow = payload_window;
DockNodeAddWindow(target_node, payload_window, true); DockNodeAddWindow(target_node, payload_window, true);
if (payload_node_id != 0) if (payload_dock_id != 0)
DockSettingsMoveDockReferencesInInactiveWindow(payload_node_id, target_node->ID); DockSettingsMoveDockReferencesInInactiveWindow(payload_dock_id, target_node->ID);
} }
} }