Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-19 14:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nav: Use Platform_SetWindowFocus when CTRL+Tabbing to another viewport.

Browse Source
This commit is contained in:
omar 2018-09-21 11:11:38 +02:00
parent 7abc368927
commit 5eabf44021
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
imgui.cpp
View File

@ -8603,6 +8603,7 @@ static void ImGui::NavUpdateWindowing()
// Apply final focus // Apply final focus
if (apply_focus_window && (g.NavWindow == NULL || apply_focus_window != g.NavWindow->RootWindow)) 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.NavDisableHighlight = false;
g.NavDisableMouseHover = true; g.NavDisableMouseHover = true;
apply_focus_window = NavRestoreLastChildNavWindow(apply_focus_window); 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 the window only has a menu layer, select it directly
if (apply_focus_window->DC.NavLayerActiveMask == (1 << 1)) if (apply_focus_window->DC.NavLayerActiveMask == (1 << 1))
g.NavLayer = 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) if (apply_focus_window)
g.NavWindowingTarget = NULL; g.NavWindowingTarget = NULL;