Fixed a bug allowing to move a _NoMove window from a child that doesn't have the flag. (#1381)

broken by e56eba44fe (#1337)
This commit is contained in:
omar 2017-10-20 16:09:24 +02:00
parent 87ae40843c
commit 3b485cda51

View File

@ -2781,7 +2781,7 @@ void ImGui::EndFrame()
if (g.HoveredRootWindow != NULL) if (g.HoveredRootWindow != NULL)
{ {
FocusWindow(g.HoveredWindow); FocusWindow(g.HoveredWindow);
if (!(g.HoveredWindow->Flags & ImGuiWindowFlags_NoMove)) if (!(g.HoveredWindow->Flags & ImGuiWindowFlags_NoMove) && !(g.HoveredRootWindow->Flags & ImGuiWindowFlags_NoMove))
{ {
g.MovedWindow = g.HoveredWindow; g.MovedWindow = g.HoveredWindow;
g.MovedWindowMoveId = g.HoveredWindow->MoveId; g.MovedWindowMoveId = g.HoveredWindow->MoveId;