Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 09:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nav, Docking: Fixed failing to restore NavId when refocusing a child within a docked window.

Browse Source
This commit is contained in:
omar 2020-02-02 22:17:04 +01:00
parent d4fc525614
commit 365b639981
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imgui.cpp
View File

@ -8928,11 +8928,11 @@ void ImGui::NavMoveRequestTryWrapping(ImGuiWindow* window, ImGuiNavMoveFlags mov
// This way we could find the last focused window among our children. It would be much less confusing this way? // This way we could find the last focused window among our children. It would be much less confusing this way?
static void ImGui::NavSaveLastChildNavWindowIntoParent(ImGuiWindow* nav_window) static void ImGui::NavSaveLastChildNavWindowIntoParent(ImGuiWindow* nav_window)
{ {
ImGuiWindow* parent_window = nav_window; ImGuiWindow* parent = nav_window;
while (parent_window && (parent_window->Flags & ImGuiWindowFlags_ChildWindow) != 0 && (parent_window->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0) while (parent && parent->RootWindowDockStop != parent && (parent->Flags & ImGuiWindowFlags_ChildWindow) != 0 && (parent->Flags & (ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu)) == 0)
parent_window = parent_window->ParentWindow; parent = parent->ParentWindow;
if (parent_window && parent_window != nav_window) if (parent && parent != nav_window)
parent_window->NavLastChildNavWindow = nav_window; parent->NavLastChildNavWindow = nav_window;
} }
// Restore the last focused child. // Restore the last focused child.