|
|
@ -6730,14 +6730,13 @@ int ImGui::TypingSelectFindMatch(ImGuiTypingSelectRequest* req, int items_count, |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (req == NULL || req->SelectRequest == false) // Support NULL parameter so both calls can be done from same spot.
|
|
|
|
if (req == NULL || req->SelectRequest == false) // Support NULL parameter so both calls can be done from same spot.
|
|
|
|
return -1; |
|
|
|
return -1; |
|
|
|
ImGuiContext& g = *GImGui; |
|
|
|
|
|
|
|
int idx = -1; |
|
|
|
int idx = -1; |
|
|
|
if (req->SingleCharMode && (req->Flags & ImGuiTypingSelectFlags_AllowSingleCharMode)) |
|
|
|
if (req->SingleCharMode && (req->Flags & ImGuiTypingSelectFlags_AllowSingleCharMode)) |
|
|
|
idx = TypingSelectFindNextSingleCharMatch(req, items_count, get_item_name_func, user_data, nav_item_idx); |
|
|
|
idx = TypingSelectFindNextSingleCharMatch(req, items_count, get_item_name_func, user_data, nav_item_idx); |
|
|
|
else |
|
|
|
else |
|
|
|
idx = TypingSelectFindBestLeadingMatch(req, items_count, get_item_name_func, user_data); |
|
|
|
idx = TypingSelectFindBestLeadingMatch(req, items_count, get_item_name_func, user_data); |
|
|
|
if (idx != -1) |
|
|
|
if (idx != -1) |
|
|
|
g.NavDisableMouseHover = true; |
|
|
|
NavRestoreHighlightAfterMove(); |
|
|
|
return idx; |
|
|
|
return idx; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|