From 3b485cda51807b9a29cb0ba3a3e22c2b500f7cdc Mon Sep 17 00:00:00 2001 From: omar Date: Fri, 20 Oct 2017 16:09:24 +0200 Subject: [PATCH] Fixed a bug allowing to move a _NoMove window from a child that doesn't have the flag. (#1381) broken by e56eba44fe0724a64f88f041fddad2eac3661cc3 (#1337) --- imgui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgui.cpp b/imgui.cpp index 93385989..e9619bac 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -2781,7 +2781,7 @@ void ImGui::EndFrame() if (g.HoveredRootWindow != NULL) { 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.MovedWindowMoveId = g.HoveredWindow->MoveId;