Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-01-31 12:03:49 +01:00
Code Releases Wiki Activity

Docking: DockBuilderDockWindow() API calls don't clear docking order if the target node is same as existing one

Browse Source 
+ Add more debug log + Display DockOrder in metrics.
This commit is contained in:
ocornut 2023-06-13 11:37:35 +02:00
parent 3f63cee4c1
commit fa5d2656b0
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/CHANGELOG.txt
View File

@ -110,6 +110,8 @@ Docking+Viewports Branch:
- Docking: Fixed dragging from title-bar empty space (regression from 1.88 related to - Docking: Fixed dragging from title-bar empty space (regression from 1.88 related to
keeping ID alive when calling low-level ButtonBehavior() directly). (#5181, #2645) keeping ID alive when calling low-level ButtonBehavior() directly). (#5181, #2645)
- Docking: [Internal] DockBuilderDockWindow() API calls don't clear docking order
if the target node is same as existing one.
----------------------------------------------------------------------- -----------------------------------------------------------------------

28
imgui.cpp
View File

@ -17767,12 +17767,16 @@ ImGuiID ImGui::DockSpaceOverViewport(const ImGuiViewport* viewport, ImGuiDockNod
void ImGui::DockBuilderDockWindow(const char* window_name, ImGuiID node_id) void ImGui::DockBuilderDockWindow(const char* window_name, ImGuiID node_id)
{ {
// We don't preserve relative order of multiple docked windows (by clearing DockOrder back to -1) // We don't preserve relative order of multiple docked windows (by clearing DockOrder back to -1)
ImGuiContext& g = *GImGui; IM_UNUSED(g);
IMGUI_DEBUG_LOG_DOCKING("[docking] DockBuilderDockWindow '%s' to node 0x%08X\n", window_name, node_id);
ImGuiID window_id = ImHashStr(window_name); ImGuiID window_id = ImHashStr(window_name);
if (ImGuiWindow* window = FindWindowByID(window_id)) if (ImGuiWindow* window = FindWindowByID(window_id))
{ {
// Apply to created window // Apply to created window
ImGuiID prev_node_id = window->DockId;
SetWindowDock(window, node_id, ImGuiCond_Always); SetWindowDock(window, node_id, ImGuiCond_Always);
window->DockOrder = -1; if (window->DockId != prev_node_id)
window->DockOrder = -1;
} }
else else
{ {
@ -17780,8 +17784,9 @@ void ImGui::DockBuilderDockWindow(const char* window_name, ImGuiID node_id)
ImGuiWindowSettings* settings = FindWindowSettingsByID(window_id); ImGuiWindowSettings* settings = FindWindowSettingsByID(window_id);
if (settings == NULL) if (settings == NULL)
settings = CreateNewWindowSettings(window_name); settings = CreateNewWindowSettings(window_name);
if (settings->DockId != node_id)
settings->DockOrder = -1;
settings->DockId = node_id; settings->DockId = node_id;
settings->DockOrder = -1;
} }
} }
@ -17819,22 +17824,24 @@ void ImGui::DockBuilderSetNodeSize(ImGuiID node_id, ImVec2 size)
// For various reason, the splitting code currently needs a base size otherwise space may not be allocated as precisely as you would expect. // For various reason, the splitting code currently needs a base size otherwise space may not be allocated as precisely as you would expect.
// - Use (id == 0) to let the system allocate a node identifier. // - Use (id == 0) to let the system allocate a node identifier.
// - Existing node with a same id will be removed. // - Existing node with a same id will be removed.
ImGuiID ImGui::DockBuilderAddNode(ImGuiID id, ImGuiDockNodeFlags flags) ImGuiID ImGui::DockBuilderAddNode(ImGuiID node_id, ImGuiDockNodeFlags flags)
{ {
ImGuiContext* ctx = GImGui; ImGuiContext* ctx = GImGui;
ImGuiContext& g = *ctx; IM_UNUSED(g);
IMGUI_DEBUG_LOG_DOCKING("[docking] DockBuilderAddNode 0x%08X flags=%08X\n", node_id, flags);
if (id != 0) if (node_id != 0)
DockBuilderRemoveNode(id); DockBuilderRemoveNode(node_id);
ImGuiDockNode* node = NULL; ImGuiDockNode* node = NULL;
if (flags & ImGuiDockNodeFlags_DockSpace) if (flags & ImGuiDockNodeFlags_DockSpace)
{ {
DockSpace(id, ImVec2(0, 0), (flags & ~ImGuiDockNodeFlags_DockSpace) | ImGuiDockNodeFlags_KeepAliveOnly); DockSpace(node_id, ImVec2(0, 0), (flags & ~ImGuiDockNodeFlags_DockSpace) | ImGuiDockNodeFlags_KeepAliveOnly);
node = DockContextFindNodeByID(ctx, id); node = DockContextFindNodeByID(ctx, node_id);
} }
else else
{ {
node = DockContextAddNode(ctx, id); node = DockContextAddNode(ctx, node_id);
node->SetLocalFlags(flags); node->SetLocalFlags(flags);
} }
node->LastFrameAlive = ctx->FrameCount; // Set this otherwise BeginDocked will undock during the same frame. node->LastFrameAlive = ctx->FrameCount; // Set this otherwise BeginDocked will undock during the same frame.
@ -17844,6 +17851,9 @@ ImGuiID ImGui::DockBuilderAddNode(ImGuiID id, ImGuiDockNodeFlags flags)
void ImGui::DockBuilderRemoveNode(ImGuiID node_id) void ImGui::DockBuilderRemoveNode(ImGuiID node_id)
{ {
ImGuiContext* ctx = GImGui; ImGuiContext* ctx = GImGui;
ImGuiContext& g = *ctx; IM_UNUSED(g);
IMGUI_DEBUG_LOG_DOCKING("[docking] DockBuilderRemoveNode 0x%08X\n", node_id);
ImGuiDockNode* node = DockContextFindNodeByID(ctx, node_id); ImGuiDockNode* node = DockContextFindNodeByID(ctx, node_id);
if (node == NULL) if (node == NULL)
return; return;
@ -19439,7 +19449,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
Text("In SettingsWindows:"); Text("In SettingsWindows:");
for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings)) for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings))
if (settings->DockId != 0) if (settings->DockId != 0)
BulletText("Window '%s' -> DockId %08X", settings->GetName(), settings->DockId); BulletText("Window '%s' -> DockId %08X DockOrder=%d", settings->GetName(), settings->DockId, settings->DockOrder);
Text("In SettingsNodes:"); Text("In SettingsNodes:");
for (int n = 0; n < dc->NodesSettings.Size; n++) for (int n = 0; n < dc->NodesSettings.Size; n++)
{ {