Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-18 14:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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 commit is contained in:
omar 2018-01-11 16:43:03 +01:00
parent a8bbb0b7dd
commit 651538e13b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
imgui.cpp
View File

@ -2386,11 +2386,14 @@ 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])
{ {
ImVec2 pos = g.IO.MousePos - g.ActiveIdClickOffset; if (!(g.MovingWindow->Flags & ImGuiWindowFlags_NoMove) && !(g.MovingWindow->RootWindow->Flags & ImGuiWindowFlags_NoMove))
if (g.MovingWindow->RootWindow->PosFloat.x != pos.x || g.MovingWindow->RootWindow->PosFloat.y != pos.y) {
MarkIniSettingsDirty(g.MovingWindow->RootWindow); ImVec2 pos = g.IO.MousePos - g.ActiveIdClickOffset;
g.MovingWindow->RootWindow->PosFloat = pos; if (g.MovingWindow->RootWindow->PosFloat.x != pos.x || g.MovingWindow->RootWindow->PosFloat.y != pos.y)
FocusWindow(g.MovingWindow); MarkIniSettingsDirty(g.MovingWindow->RootWindow);
g.MovingWindow->RootWindow->PosFloat = pos;
FocusWindow(g.MovingWindow);
}
} }
else else
{ {
@ -2934,14 +2937,13 @@ 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);
if (!(g.HoveredWindow->Flags & ImGuiWindowFlags_NoMove) && !(g.HoveredRootWindow->Flags & ImGuiWindowFlags_NoMove)) g.MovingWindow = g.HoveredWindow;
{ g.MovingWindowMoveId = g.MovingWindow->MoveId;
g.MovingWindow = g.HoveredWindow; SetActiveID(g.MovingWindowMoveId, g.HoveredRootWindow);
g.MovingWindowMoveId = g.MovingWindow->MoveId; g.ActiveIdClickOffset = g.IO.MousePos - g.HoveredRootWindow->Pos;
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)
{ {