mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-15 01:17:00 +00:00
Nav: Minor tweaks in NavProcessItem() used by ItemAdd()
This commit is contained in:
parent
c3105919ba
commit
d91b093be6
28
imgui.cpp
28
imgui.cpp
@ -2191,22 +2191,22 @@ static void NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, const ImGu
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Scoring for navigation
|
// 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)
|
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;
|
#if IMGUI_DEBUG_NAV
|
||||||
g.NavMoveResultParentId = window->IDStack.back();
|
// [DEBUG] Score all items in NavWindow at all times
|
||||||
g.NavMoveResultRectRel = nav_bb_rel;
|
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
|
// Update window-relative bounding box of navigated item
|
||||||
|
Loading…
Reference in New Issue
Block a user