Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 17:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Docking: Explicitly inhibit constraint when docked for now (#2690, #2109)

Browse Source 
Added asserts to catch issues.
This commit is contained in:
omar 2019-07-24 11:18:13 -07:00
parent 7fbd72b735
commit 7c183dc6a1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgui.cpp
View File

@ -5852,6 +5852,9 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
{ {
BeginDocked(window, p_open); BeginDocked(window, p_open);
flags = window->Flags; flags = window->Flags;
// Docking currently override constraints
g.NextWindowData.Flags &= ~ImGuiNextWindowDataFlags_HasSizeConstraint;
} }
} }
@ -13050,6 +13053,7 @@ void ImGui::DockNodeTreeUpdatePosSize(ImGuiDockNode* node, ImVec2 pos, ImVec2 si
{ {
// During the regular dock node update we write to all nodes. // During the regular dock node update we write to all nodes.
// 'only_write_to_marked_nodes' is only set when turning a node visible mid-frame and we need its size right-away. // 'only_write_to_marked_nodes' is only set when turning a node visible mid-frame and we need its size right-away.
IM_ASSERT(size.x > 0.0f && size.y > 0.0f);
const bool write_to_node = (only_write_to_marked_nodes == false) || (node->MarkedForPosSizeWrite); const bool write_to_node = (only_write_to_marked_nodes == false) || (node->MarkedForPosSizeWrite);
if (write_to_node) if (write_to_node)
{ {
@ -13082,6 +13086,7 @@ void ImGui::DockNodeTreeUpdatePosSize(ImGuiDockNode* node, ImVec2 pos, ImVec2 si
child_0->WantLockSizeOnce = false; child_0->WantLockSizeOnce = false;
child_0_size[axis] = child_0->SizeRef[axis] = child_0->Size[axis]; child_0_size[axis] = child_0->SizeRef[axis] = child_0->Size[axis];
child_1_size[axis] = child_1->SizeRef[axis] = (size_avail - child_0_size[axis]); child_1_size[axis] = child_1->SizeRef[axis] = (size_avail - child_0_size[axis]);
IM_ASSERT(child_0->SizeRef[axis] > 0.0f && child_1->SizeRef[axis] > 0.0f);
} }
else if (child_1->WantLockSizeOnce) else if (child_1->WantLockSizeOnce)
@ -13089,6 +13094,7 @@ void ImGui::DockNodeTreeUpdatePosSize(ImGuiDockNode* node, ImVec2 pos, ImVec2 si
child_1->WantLockSizeOnce = false; child_1->WantLockSizeOnce = false;
child_1_size[axis] = child_1->SizeRef[axis] = child_1->Size[axis]; child_1_size[axis] = child_1->SizeRef[axis] = child_1->Size[axis];
child_0_size[axis] = child_0->SizeRef[axis] = (size_avail - child_1_size[axis]); child_0_size[axis] = child_0->SizeRef[axis] = (size_avail - child_1_size[axis]);
IM_ASSERT(child_0->SizeRef[axis] > 0.0f && child_1->SizeRef[axis] > 0.0f);
} }
// 3) If one window is the central node (~ use remaining space, should be made explicit!), use explicit size from the other, and remainder for the central node // 3) If one window is the central node (~ use remaining space, should be made explicit!), use explicit size from the other, and remainder for the central node
@ -13373,6 +13379,7 @@ void ImGui::DockSpace(ImGuiID id, const ImVec2& size_arg, ImGuiDockNodeFlags fla
size.x = ImMax(content_avail.x + size.x, 4.0f); // Arbitrary minimum child size (0.0f causing too much issues) size.x = ImMax(content_avail.x + size.x, 4.0f); // Arbitrary minimum child size (0.0f causing too much issues)
if (size.y <= 0.0f) if (size.y <= 0.0f)
size.y = ImMax(content_avail.y + size.y, 4.0f); size.y = ImMax(content_avail.y + size.y, 4.0f);
IM_ASSERT(size.x > 0.0f && size.y > 0.0f);
node->Pos = window->DC.CursorPos; node->Pos = window->DC.CursorPos;
node->Size = node->SizeRef = size; node->Size = node->SizeRef = size;
@ -13493,6 +13500,7 @@ void ImGui::DockBuilderSetNodeSize(ImGuiID node_id, ImVec2 size)
ImGuiDockNode* node = DockContextFindNodeByID(ctx, node_id); ImGuiDockNode* node = DockContextFindNodeByID(ctx, node_id);
if (node == NULL) if (node == NULL)
return; return;
IM_ASSERT(size.x > 0.0f && size.y > 0.0f);
node->Size = node->SizeRef = size; node->Size = node->SizeRef = size;
node->AuthorityForSize = ImGuiDataAuthority_DockNode; node->AuthorityForSize = ImGuiDataAuthority_DockNode;
} }