mirror of
https://github.com/ocornut/imgui.git
synced 2026-02-06 04:20:08 +00:00
Nav: Use Platform_SetWindowFocus when CTRL+Tabbing to another viewport.
This commit is contained in:
parent
7abc368927
commit
5eabf44021
1 changed files with 5 additions and 0 deletions
|
|
@ -8603,6 +8603,7 @@ static void ImGui::NavUpdateWindowing()
|
|||
// Apply final focus
|
||||
if (apply_focus_window && (g.NavWindow == NULL || apply_focus_window != g.NavWindow->RootWindow))
|
||||
{
|
||||
ImGuiViewport* previous_viewport = g.NavWindow ? g.NavWindow->Viewport : NULL;
|
||||
g.NavDisableHighlight = false;
|
||||
g.NavDisableMouseHover = true;
|
||||
apply_focus_window = NavRestoreLastChildNavWindow(apply_focus_window);
|
||||
|
|
@ -8614,6 +8615,10 @@ static void ImGui::NavUpdateWindowing()
|
|||
// If the window only has a menu layer, select it directly
|
||||
if (apply_focus_window->DC.NavLayerActiveMask == (1 << 1))
|
||||
g.NavLayer = 1;
|
||||
|
||||
// Request OS level focus
|
||||
if (apply_focus_window->Viewport != previous_viewport && g.PlatformIO.Platform_SetWindowFocus)
|
||||
g.PlatformIO.Platform_SetWindowFocus(apply_focus_window->Viewport);
|
||||
}
|
||||
if (apply_focus_window)
|
||||
g.NavWindowingTarget = NULL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue