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

Docking: Maintain CentralNode. When SetNextWindowDockID() on a now split node id, we dig to find the central node or the last focused node. (#2109)

Browse Source
This commit is contained in:
omar 2018-11-27 13:35:05 +01:00
parent 4575354bc0
commit fc16e54612
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
imgui.cpp
View File

@ -11752,9 +11752,25 @@ void ImGui::SetWindowDock(ImGuiWindow* window, ImGuiID dock_id, ImGuiCond cond)
return; return;
window->SetWindowDockAllowFlags &= ~(ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing); window->SetWindowDockAllowFlags &= ~(ImGuiCond_Once | ImGuiCond_FirstUseEver | ImGuiCond_Appearing);
// Set
if (window->DockId == dock_id) if (window->DockId == dock_id)
return; return;
// If the user attempt to set a dock id that is a split node, we'll dig within to find a suitable docking spot
ImGuiContext* ctx = GImGui;
if (ImGuiDockNode* new_node = DockContextFindNodeByID(ctx, dock_id))
if (new_node->IsSplitNode())
{
// Policy: Find central node or latest focused node. We first move back to our root node.
new_node = DockNodeGetRootNode(new_node);
if (new_node->CentralNode)
dock_id = new_node->CentralNode->ID;
else
dock_id = new_node->LastFocusedNodeID;
}
if (window->DockId == dock_id)
return;
if (window->DockNode) if (window->DockNode)
DockNodeRemoveWindow(window->DockNode, window, 0); DockNodeRemoveWindow(window->DockNode, window, 0);
window->DockId = dock_id; window->DockId = dock_id;
@ -12228,15 +12244,18 @@ void ImGui::BeginDocked(ImGuiWindow* window, bool* p_open)
if (window->DockId != 0 && dock_node == NULL) if (window->DockId != 0 && dock_node == NULL)
{ {
dock_node = DockContextFindNodeByID(ctx, window->DockId); dock_node = DockContextFindNodeByID(ctx, window->DockId);
if (dock_node == NULL)
dock_node = DockContextAddNode(ctx, window->DockId); // We should not be docking into a split node (SetWindowDock should avoid this)
if (dock_node && dock_node->IsSplitNode())
if (dock_node->IsSplitNode())
{ {
DockContextProcessUndockWindow(ctx, window); DockContextProcessUndockWindow(ctx, window);
return; return;
} }
// Create node
if (dock_node == NULL)
dock_node = DockContextAddNode(ctx, window->DockId);
DockNodeAddWindow(dock_node, window, true); DockNodeAddWindow(dock_node, window, true);
IM_ASSERT(dock_node == window->DockNode); IM_ASSERT(dock_node == window->DockNode);