@ -7557,7 +7557,7 @@ void ImGui::FocusItem()
return ;
}
ImGuiNavMoveFlags move_flags = ImGuiNavMoveFlags_Tabbing | ImGuiNavMoveFlags_FocusApi ; // No activation/selection
ImGuiNavMoveFlags move_flags = ImGuiNavMoveFlags_Tabbing | ImGuiNavMoveFlags_FocusApi | ImGuiNavMoveFlags_NoSelect ;
ImGuiScrollFlags scroll_flags = window - > Appearing ? ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_AlwaysCenterY : ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_KeepVisibleEdgeY ;
SetNavWindow ( window ) ;
NavMoveRequestSubmit ( ImGuiDir_None , ImGuiDir_Up , move_flags , scroll_flags ) ;
@ -11605,8 +11605,8 @@ void ImGui::NavMoveRequestApplyResult()
if ( result = = NULL )
{
if ( g . NavMoveFlags & ImGuiNavMoveFlags_Tabbing )
g . NavMoveFlags | = ImGuiNavMoveFlags_Dont SetNavHighlight ;
if ( g . NavId ! = 0 & & ( g . NavMoveFlags & ImGuiNavMoveFlags_Dont SetNavHighlight ) = = 0 )
g . NavMoveFlags | = ImGuiNavMoveFlags_No SetNavHighlight ;
if ( g . NavId ! = 0 & & ( g . NavMoveFlags & ImGuiNavMoveFlags_No SetNavHighlight ) = = 0 )
NavRestoreHighlightAfterMove ( ) ;
NavClearPreferredPosForAxis ( axis ) ; // On a failed move, clear preferred pos for this axis.
IMGUI_DEBUG_LOG_NAV ( " [nav] NavMoveSubmitted but not led to a result! \n " ) ;
@ -11645,7 +11645,7 @@ void ImGui::NavMoveRequestApplyResult()
}
if ( g . ActiveId ! = result - > ID )
ClearActiveID ( ) ;
if ( g . NavId ! = result - > ID & & ( g . NavMoveFlags & ImGuiNavMoveFlags_Activate ) ! = 0 )
if ( g . NavId ! = result - > ID & & ( g . NavMoveFlags & ImGuiNavMoveFlags_NoSelect ) = = 0 )
{
// Don't set NavJustMovedToId if just landed on the same spot (which may happen with ImGuiNavMoveFlags_AllowCurrentNavId)
g . NavJustMovedToId = result - > ID ;
@ -11675,13 +11675,13 @@ void ImGui::NavMoveRequestApplyResult()
{
g . NavNextActivateId = result - > ID ;
g . NavNextActivateFlags = ImGuiActivateFlags_None ;
g . NavMoveFlags | = ImGuiNavMoveFlags_Dont SetNavHighlight ;
g . NavMoveFlags | = ImGuiNavMoveFlags_No SetNavHighlight ;
if ( g . NavMoveFlags & ImGuiNavMoveFlags_Tabbing )
g . NavNextActivateFlags | = ImGuiActivateFlags_PreferInput | ImGuiActivateFlags_TryToPreserveState ;
}
// Enable nav highlight
if ( ( g . NavMoveFlags & ImGuiNavMoveFlags_Dont SetNavHighlight ) = = 0 )
if ( ( g . NavMoveFlags & ImGuiNavMoveFlags_No SetNavHighlight ) = = 0 )
NavRestoreHighlightAfterMove ( ) ;
}