|
|
|
@ -10891,8 +10891,8 @@ void ImGui::ClosePopupToLevel(int remaining, bool restore_focus_to_window_under_ |
|
|
|
|
if (restore_focus_to_window_under_popup && prev_popup.Window) |
|
|
|
|
{ |
|
|
|
|
ImGuiWindow* popup_window = prev_popup.Window; |
|
|
|
|
ImGuiWindow* focus_window = (popup_window && popup_window->Flags & ImGuiWindowFlags_ChildMenu) ? popup_window->ParentWindow : prev_popup.RestoreNavWindow; |
|
|
|
|
if (focus_window && !focus_window->WasActive && popup_window) |
|
|
|
|
ImGuiWindow* focus_window = (popup_window->Flags & ImGuiWindowFlags_ChildMenu) ? popup_window->ParentWindow : prev_popup.RestoreNavWindow; |
|
|
|
|
if (focus_window && !focus_window->WasActive) |
|
|
|
|
FocusTopMostWindowUnderOne(popup_window, NULL, NULL, ImGuiFocusRequestFlags_RestoreFocusedChild); // Fallback
|
|
|
|
|
else |
|
|
|
|
FocusWindow(focus_window, (g.NavLayer == ImGuiNavLayer_Main) ? ImGuiFocusRequestFlags_RestoreFocusedChild : ImGuiFocusRequestFlags_None); |
|
|
|
|