mirrors/imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)"

Browse Source 
This reverts commit 651538e13b.
This commit is contained in:
omar 2018-01-11 18:08:14 +01:00
parent 7d2a068dea
commit b74f24c3e5
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
imgui.cpp
View File

@ -2386,14 +2386,11 @@ void ImGui::NewFrame()
IM_ASSERT(g.MovingWindow->MoveId == g.MovingWindowMoveId); IM_ASSERT(g.MovingWindow->MoveId == g.MovingWindowMoveId);
if (g.IO.MouseDown[0]) if (g.IO.MouseDown[0])
{ {
if (!(g.MovingWindow->Flags & ImGuiWindowFlags_NoMove) && !(g.MovingWindow->RootWindow->Flags & ImGuiWindowFlags_NoMove)) ImVec2 pos = g.IO.MousePos - g.ActiveIdClickOffset;
{ if (g.MovingWindow->RootWindow->PosFloat.x != pos.x || g.MovingWindow->RootWindow->PosFloat.y != pos.y)
ImVec2 pos = g.IO.MousePos - g.ActiveIdClickOffset; MarkIniSettingsDirty(g.MovingWindow->RootWindow);
if (g.MovingWindow->RootWindow->PosFloat.x != pos.x || g.MovingWindow->RootWindow->PosFloat.y != pos.y) g.MovingWindow->RootWindow->PosFloat = pos;
MarkIniSettingsDirty(g.MovingWindow->RootWindow); FocusWindow(g.MovingWindow);
g.MovingWindow->RootWindow->PosFloat = pos;
FocusWindow(g.MovingWindow);
}
} }
else else
{ {
@ -2937,13 +2934,14 @@ void ImGui::EndFrame()
{ {
if (g.HoveredRootWindow != NULL) if (g.HoveredRootWindow != NULL)
{ {
// Mark for moving even if the _NoMove flag is set (the tests will be done during actual moving)
// Because we always want to set an ActiveId, without it dragging away from a window with _NoMove would activate hover on other windows.
FocusWindow(g.HoveredWindow); FocusWindow(g.HoveredWindow);
g.MovingWindow = g.HoveredWindow; if (!(g.HoveredWindow->Flags & ImGuiWindowFlags_NoMove) && !(g.HoveredRootWindow->Flags & ImGuiWindowFlags_NoMove))
g.MovingWindowMoveId = g.MovingWindow->MoveId; {
SetActiveID(g.MovingWindowMoveId, g.HoveredRootWindow); g.MovingWindow = g.HoveredWindow;
g.ActiveIdClickOffset = g.IO.MousePos - g.HoveredRootWindow->Pos; g.MovingWindowMoveId = g.MovingWindow->MoveId;
SetActiveID(g.MovingWindowMoveId, g.HoveredRootWindow);
g.ActiveIdClickOffset = g.IO.MousePos - g.MovingWindow->RootWindow->Pos;
}
} }
else if (g.NavWindow != NULL && GetFrontMostModalRootWindow() == NULL) else if (g.NavWindow != NULL && GetFrontMostModalRootWindow() == NULL)
{ {