From d91b093be64350c73beb645e97abe57a38725678 Mon Sep 17 00:00:00 2001 From: omar Date: Fri, 6 Oct 2017 14:56:25 -0700 Subject: [PATCH] Nav: Minor tweaks in NavProcessItem() used by ItemAdd() --- imgui.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 207993c47..997417465 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -2191,22 +2191,22 @@ static void NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, const ImGu } // Scoring for navigation - bool new_best = false; -#if IMGUI_DEBUG_NAV - // [DEBUG] Score items at all times - if (!g.NavMoveRequest) - g.NavMoveDir = g.NavMoveDirLast; if (g.NavId != id) - new_best = NavScoreItem(nav_bb) && g.NavMoveRequest; -#else - if (g.NavMoveRequest && g.NavId != id) - new_best = NavScoreItem(nav_bb); -#endif - if (new_best) { - g.NavMoveResultId = id; - g.NavMoveResultParentId = window->IDStack.back(); - g.NavMoveResultRectRel = nav_bb_rel; +#if IMGUI_DEBUG_NAV + // [DEBUG] Score all items in NavWindow at all times + if (!g.NavMoveRequest) + g.NavMoveDir = g.NavMoveDirLast; + bool new_best = NavScoreItem(nav_bb) && g.NavMoveRequest; +#else + bool new_best = g.NavMoveRequest && NavScoreItem(nav_bb); +#endif + if (new_best) + { + g.NavMoveResultId = id; + g.NavMoveResultParentId = window->IDStack.back(); + g.NavMoveResultRectRel = nav_bb_rel; + } } // Update window-relative bounding box of navigated item