mirror of
https://github.com/ocornut/imgui.git
synced 2024-11-17 04:17:17 +01:00
Nav, Docking: Fixed failing to restore NavId when refocusing due to missing nav window.
This commit is contained in:
parent
365b639981
commit
3bde375078
@ -6746,7 +6746,7 @@ void ImGui::FocusTopMostWindowUnderOne(ImGuiWindow* under_this_window, ImGuiWind
|
|||||||
{
|
{
|
||||||
// We may later decide to test for different NoXXXInputs based on the active navigation input (mouse vs nav) but that may feel more confusing to the user.
|
// We may later decide to test for different NoXXXInputs based on the active navigation input (mouse vs nav) but that may feel more confusing to the user.
|
||||||
ImGuiWindow* window = g.WindowsFocusOrder[i];
|
ImGuiWindow* window = g.WindowsFocusOrder[i];
|
||||||
if (window != ignore_window && window->WasActive && !(window->Flags & ImGuiWindowFlags_ChildWindow))
|
if (window != ignore_window && window->WasActive && window->RootWindowDockStop == window)
|
||||||
if ((window->Flags & (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs)) != (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs))
|
if ((window->Flags & (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs)) != (ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs))
|
||||||
{
|
{
|
||||||
// FIXME-DOCK: This is failing (lagging by one frame) for docked windows.
|
// FIXME-DOCK: This is failing (lagging by one frame) for docked windows.
|
||||||
|
Loading…
Reference in New Issue
Block a user