Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 09:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed presumably obsolete MovingWindow tests which prevent move/merge logic in viewport branch from working in all situations (e.g. docking away when ActiveId is the ID of a tab)

Browse Source
This commit is contained in:
omar 2018-04-24 16:48:26 +02:00
parent cb78e62df9
commit 679f4882a5
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgui.cpp
View File

@ -3336,10 +3336,10 @@ static void ImGui::UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImG
static void ImGui::UpdateMovingWindow() static void ImGui::UpdateMovingWindow()
{ {
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
if (g.MovingWindow && g.MovingWindow->MoveId == g.ActiveId && g.ActiveIdSource == ImGuiInputSource_Mouse) if (g.MovingWindow != NULL)
{ {
// We actually want to move the root window. g.MovingWindow == window we clicked on (could be a child window). // We actually want to move the root window. g.MovingWindow == window we clicked on (could be a child window).
// We track it to preserve Focus and so that ActiveIdWindow == MovingWindow and ActiveId == MovingWindow->MoveId for consistency. // We track it to preserve Focus and so that generally ActiveIdWindow == MovingWindow and ActiveId == MovingWindow->MoveId for consistency.
KeepAliveID(g.ActiveId); KeepAliveID(g.ActiveId);
IM_ASSERT(g.MovingWindow && g.MovingWindow->RootWindow); IM_ASSERT(g.MovingWindow && g.MovingWindow->RootWindow);
ImGuiWindow* moving_window = g.MovingWindow->RootWindow; ImGuiWindow* moving_window = g.MovingWindow->RootWindow;
@ -3373,10 +3373,6 @@ static void ImGui::UpdateMovingWindow()
if (!g.IO.MouseDown[0]) if (!g.IO.MouseDown[0])
ClearActiveID(); ClearActiveID();
} }
if (g.MovingWindow != NULL)
g.MovingWindow->Viewport->Flags &= ~ImGuiViewportFlags_NoInputs;
g.MovingWindow = NULL;
} }
} }