@ -7669,7 +7669,7 @@ void ImGui::FocusItem()
return ;
}
ImGuiNavMoveFlags move_flags = ImGuiNavMoveFlags_IsTabbing | ImGuiNavMoveFlags_FocusApi | ImGuiNavMoveFlags_NoSelect ;
ImGuiNavMoveFlags move_flags = ImGuiNavMoveFlags_IsTabbing | ImGuiNavMoveFlags_FocusApi | ImGuiNavMoveFlags_NoSetNavHighlight | ImGuiNavMoveFlags_NoSe lect ;
ImGuiScrollFlags scroll_flags = window - > Appearing ? ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_AlwaysCenterY : ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_KeepVisibleEdgeY ;
SetNavWindow ( window ) ;
NavMoveRequestSubmit ( ImGuiDir_None , ImGuiDir_Up , move_flags , scroll_flags ) ;
@ -7704,7 +7704,7 @@ void ImGui::SetKeyboardFocusHere(int offset)
SetNavWindow ( window ) ;
ImGuiNavMoveFlags move_flags = ImGuiNavMoveFlags_IsTabbing | ImGuiNavMoveFlags_Activate | ImGuiNavMoveFlags_FocusApi ;
ImGuiNavMoveFlags move_flags = ImGuiNavMoveFlags_IsTabbing | ImGuiNavMoveFlags_Activate | ImGuiNavMoveFlags_FocusApi | ImGuiNavMoveFlags_NoSetNavHighlight ;
ImGuiScrollFlags scroll_flags = window - > Appearing ? ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_AlwaysCenterY : ImGuiScrollFlags_KeepVisibleEdgeX | ImGuiScrollFlags_KeepVisibleEdgeY ;
NavMoveRequestSubmit ( ImGuiDir_None , offset < 0 ? ImGuiDir_Up : ImGuiDir_Down , move_flags , scroll_flags ) ; // FIXME-NAV: Once we refactor tabbing, add LegacyApi flag to not activate non-inputable.
if ( offset = = - 1 )
@ -11727,7 +11727,6 @@ void ImGui::NavUpdateCreateTabbingRequest()
// Initiate tabbing request
// (this is ALWAYS ENABLED, regardless of ImGuiConfigFlags_NavEnableKeyboard flag!)
// Initially this was designed to use counters and modulo arithmetic, but that could not work with unsubmitted items (list clipper). Instead we use a strategy close to other move requests.
// See NavProcessItemForTabbingRequest() for a description of the various forward/backward tabbing cases with and without wrapping.
const bool nav_keyboard_active = ( g . IO . ConfigFlags & ImGuiConfigFlags_NavEnableKeyboard ) ! = 0 ;
if ( nav_keyboard_active )
@ -11835,7 +11834,6 @@ void ImGui::NavMoveRequestApplyResult()
{
g . NavNextActivateId = result - > ID ;
g . NavNextActivateFlags = ImGuiActivateFlags_None ;
g . NavMoveFlags | = ImGuiNavMoveFlags_NoSetNavHighlight ;
if ( g . NavMoveFlags & ImGuiNavMoveFlags_IsTabbing )
g . NavNextActivateFlags | = ImGuiActivateFlags_PreferInput | ImGuiActivateFlags_TryToPreserveState ;
}