Nav: fixing assert using Tab in a window without any tabbable element (#4449)

Amend 1a7526dc
This commit is contained in:
ocornut
2021-11-10 11:42:39 +01:00
parent eb02dcf87f
commit a9ea1ae854
2 changed files with 3 additions and 6 deletions

View File

@ -9685,11 +9685,8 @@ void ImGui::NavMoveRequestApplyResult()
// Tabbing forward wrap
if (g.NavMoveFlags & ImGuiNavMoveFlags_Tabbing)
if (g.NavTabbingCounter == 1 || g.NavTabbingDir == 0)
{
IM_ASSERT(g.NavTabbingResultFirst.ID != 0);
if ((g.NavTabbingCounter == 1 || g.NavTabbingDir == 0) && g.NavTabbingResultFirst.ID)
result = &g.NavTabbingResultFirst;
}
// In a situation when there is no results but NavId != 0, re-enable the Navigation highlight (because g.NavId is not considered as a possible result)
if (result == NULL)