Viewport, Docking: Fixed incorrectly setting the ImGuiViewportFlags_NoInputs flag, affecting split docking node. (#2109)

docking
omar 6 years ago
parent 5f8c9ae0ef
commit 745fda081e

@ -5213,7 +5213,9 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
{ {
// Late create viewport, based on the assumption that with our calculations, the DPI will be known ahead (same as the DPI of the selection done in UpdateSelectWindowViewport) // Late create viewport, based on the assumption that with our calculations, the DPI will be known ahead (same as the DPI of the selection done in UpdateSelectWindowViewport)
//ImGuiViewport* old_viewport = window->Viewport; //ImGuiViewport* old_viewport = window->Viewport;
ImGuiViewportFlags viewport_flags = ImGuiViewportFlags_NoFocusOnAppearing | ((window->Flags & ImGuiWindowFlags_NoInputs) ? ImGuiViewportFlags_NoInputs : 0); ImGuiViewportFlags viewport_flags = ImGuiViewportFlags_NoFocusOnAppearing;
if ((window->Flags & ImGuiWindowFlags_NoMouseInputs) && (window->Flags & ImGuiWindowFlags_NoNavInputs))
viewport_flags |= ImGuiViewportFlags_NoInputs;
window->Viewport = AddUpdateViewport(window, window->ID, window->Pos, window->Size, viewport_flags); window->Viewport = AddUpdateViewport(window, window->ID, window->Pos, window->Size, viewport_flags);
// FIXME-DPI // FIXME-DPI

Loading…
Cancel
Save