mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-22 03:47:00 +00:00
Nav: Fixed pressing Escape while in a child window with _NavFlattened flag. (#7237)
This commit is contained in:
parent
c7edb446ca
commit
763100b385
@ -51,6 +51,7 @@ Other changes:
|
|||||||
the hover highlight to stay even while another item is activated.
|
the hover highlight to stay even while another item is activated.
|
||||||
- Nav: Fixed SetKeyboardFocusHere() not working when current nav focus is in different scope,
|
- Nav: Fixed SetKeyboardFocusHere() not working when current nav focus is in different scope,
|
||||||
regression from 1.90.1 related to code scoping Tab presses to local scope. (#7226) [@bratpilz]
|
regression from 1.90.1 related to code scoping Tab presses to local scope. (#7226) [@bratpilz]
|
||||||
|
- Nav: Fixed pressing Escape while in a child window with _NavFlattened flag. (#7237)
|
||||||
- Debug Tools: Metrics: Fixed debug break in SetShortcutRouting() not handling ImGuiMod_Shortcut redirect.
|
- Debug Tools: Metrics: Fixed debug break in SetShortcutRouting() not handling ImGuiMod_Shortcut redirect.
|
||||||
- Debug Tools: Debug Log: Added "Input Routing" logging.
|
- Debug Tools: Debug Log: Added "Input Routing" logging.
|
||||||
- Backends: Vulkan: Fixed vkAcquireNextImageKHR() validation errors in VulkanSDK 1.3.275 by
|
- Backends: Vulkan: Fixed vkAcquireNextImageKHR() validation errors in VulkanSDK 1.3.275 by
|
||||||
|
@ -12247,15 +12247,14 @@ static void ImGui::NavUpdateCancelRequest()
|
|||||||
NavRestoreLayer(ImGuiNavLayer_Main);
|
NavRestoreLayer(ImGuiNavLayer_Main);
|
||||||
NavRestoreHighlightAfterMove();
|
NavRestoreHighlightAfterMove();
|
||||||
}
|
}
|
||||||
else if (g.NavWindow && g.NavWindow != g.NavWindow->RootWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_Popup) && g.NavWindow->ParentWindow)
|
else if (g.NavWindow && g.NavWindow != g.NavWindow->RootWindow && !(g.NavWindow->RootWindowForNav->Flags & ImGuiWindowFlags_Popup) && g.NavWindow->RootWindowForNav->ParentWindow)
|
||||||
{
|
{
|
||||||
// Exit child window
|
// Exit child window
|
||||||
ImGuiWindow* child_window = g.NavWindow;
|
ImGuiWindow* child_window = g.NavWindow->RootWindowForNav;
|
||||||
ImGuiWindow* parent_window = g.NavWindow->ParentWindow;
|
ImGuiWindow* parent_window = child_window->ParentWindow;
|
||||||
IM_ASSERT(child_window->ChildId != 0);
|
IM_ASSERT(child_window->ChildId != 0);
|
||||||
ImRect child_rect = child_window->Rect();
|
|
||||||
FocusWindow(parent_window);
|
FocusWindow(parent_window);
|
||||||
SetNavID(child_window->ChildId, ImGuiNavLayer_Main, 0, WindowRectAbsToRel(parent_window, child_rect));
|
SetNavID(child_window->ChildId, ImGuiNavLayer_Main, 0, WindowRectAbsToRel(parent_window, child_window->Rect()));
|
||||||
NavRestoreHighlightAfterMove();
|
NavRestoreHighlightAfterMove();
|
||||||
}
|
}
|
||||||
else if (g.OpenPopupStack.Size > 0 && g.OpenPopupStack.back().Window != NULL && !(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
|
else if (g.OpenPopupStack.Size > 0 && g.OpenPopupStack.back().Window != NULL && !(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
|
||||||
|
Loading…
Reference in New Issue
Block a user