Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-01-26 08:13:45 +01:00
Code Releases Wiki Activity

Docking: Fixed incomplete merge of 36e714a leading to undocking. #2109

Browse Source
This commit is contained in:
omar 2019-05-18 13:00:00 +02:00
parent 4158cba1ff
commit 2e5860b5a0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
imgui.cpp
View File

@ -13724,8 +13724,7 @@ void ImGui::BeginDocked(ImGuiWindow* window, bool* p_open)
// Calling SetNextWindowPos() undock windows by default (by setting PosUndock) // Calling SetNextWindowPos() undock windows by default (by setting PosUndock)
bool want_undock = false; bool want_undock = false;
want_undock |= (window->Flags & ImGuiWindowFlags_NoDocking) != 0; want_undock |= (window->Flags & ImGuiWindowFlags_NoDocking) != 0;
want_undock |= (g.NextWindowData.PosCond && (window->SetWindowPosAllowFlags & g.NextWindowData.PosCond) && g.NextWindowData.PosUndock); want_undock |= (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasPos) && (window->SetWindowPosAllowFlags & g.NextWindowData.PosCond) && g.NextWindowData.PosUndock;
g.NextWindowData.PosUndock = false;
if (want_undock) if (want_undock)
{ {
DockContextProcessUndockWindow(ctx, window); DockContextProcessUndockWindow(ctx, window);