|
@@ -5119,14 +5119,12 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
|
|
|
// In multi-line mode, we never exit the loop until all lines are counted, so add one extra to the searches_remaining counter.
|
|
|
searches_remaining += is_multiline ? 1 : 0;
|
|
|
int line_count = 0;
|
|
|
- //for (const ImWchar* s = text_begin; (s = (const ImWchar*)wcschr((const wchar_t*)s, (wchar_t)'\n')) != NULL; s++) // FIXME-OPT: Could use this when wchar_t are 16-bit
|
|
|
- for (const char* s = text_begin; *s != 0; s++)
|
|
|
- if (*s == '\n')
|
|
|
- {
|
|
|
- line_count++;
|
|
|
- if (searches_result_line_no[0] == -1 && s >= searches_input_ptr[0]) { searches_result_line_no[0] = line_count; if (--searches_remaining <= 0) break; }
|
|
|
- if (searches_result_line_no[1] == -1 && s >= searches_input_ptr[1]) { searches_result_line_no[1] = line_count; if (--searches_remaining <= 0) break; }
|
|
|
- }
|
|
|
+ for (const char* s = text_begin; (s = strchr(s, '\n')) != NULL; s++) // FIXME-OPT: memchr() would be faster?
|
|
|
+ {
|
|
|
+ line_count++;
|
|
|
+ if (searches_result_line_no[0] == -1 && s >= searches_input_ptr[0]) { searches_result_line_no[0] = line_count; if (--searches_remaining <= 0) break; }
|
|
|
+ if (searches_result_line_no[1] == -1 && s >= searches_input_ptr[1]) { searches_result_line_no[1] = line_count; if (--searches_remaining <= 0) break; }
|
|
|
+ }
|
|
|
line_count++;
|
|
|
if (searches_result_line_no[0] == -1)
|
|
|
searches_result_line_no[0] = line_count;
|
|
@@ -5199,11 +5197,8 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
|
|
|
break;
|
|
|
if (rect_pos.y < clip_rect.y)
|
|
|
{
|
|
|
- //p = (const ImWchar*)wmemchr((const wchar_t*)p, '\n', text_selected_end - p); // FIXME-OPT: Could use this when wchar_t are 16-bit
|
|
|
- //p = p ? p + 1 : text_selected_end;
|
|
|
- while (p < text_selected_end)
|
|
|
- if (*p++ == '\n')
|
|
|
- break;
|
|
|
+ p = (const char*)memchr((void*)p, '\n', text_selected_end - p);
|
|
|
+ p = p ? p + 1 : text_selected_end;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -5213,13 +5208,14 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
|
|
|
rect.ClipWith(clip_rect);
|
|
|
if (rect.Overlaps(clip_rect))
|
|
|
draw_window->DrawList->AddRectFilled(rect.Min, rect.Max, bg_color);
|
|
|
+ rect_pos.x = draw_pos.x - draw_scroll.x;
|
|
|
}
|
|
|
- rect_pos.x = draw_pos.x - draw_scroll.x;
|
|
|
rect_pos.y += g.FontSize;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// We test for 'buf_display_max_length' as a way to avoid some pathological cases (e.g. single-line 1 MB string) which would make ImDrawList crash.
|
|
|
+ // FIXME-OPT: Multiline could submit a smaller amount of contents to AddText() since we already iterated through it.
|
|
|
if (is_multiline || (buf_display_end - buf_display) < buf_display_max_length)
|
|
|
{
|
|
|
ImU32 col = GetColorU32(is_displaying_hint ? ImGuiCol_TextDisabled : ImGuiCol_Text);
|