mirrors/imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

InputText: more tidying up of selection search loop.

Browse Source
This commit is contained in:
ocornut 2024-09-16 14:42:58 +02:00
parent aef07aea27
commit 7ac50bf77d
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
imgui_widgets.cpp
View File

@ -5099,19 +5099,11 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
ImVec2 cursor_offset, select_start_offset; ImVec2 cursor_offset, select_start_offset;
{ {
// Find lines numbers straddling 'cursor' (slot 0) and 'select_start' (slot 1) positions. // Find lines numbers straddling cursor and selection min position
int searches_result_line_no[2] = { -1000, -1000 }; int cursor_line_no = render_cursor ? -1 : -1000;
const char* searches_input_ptr[2] = { NULL, NULL }; int selmin_line_no = render_selection ? -1 : -1000;
if (render_cursor) const char* cursor_ptr = render_cursor ? text_begin + state->Stb->cursor : NULL;
{ const char* selmin_ptr = render_selection ? text_begin + ImMin(state->Stb->select_start, state->Stb->select_end) : NULL;
searches_input_ptr[0] = text_begin + state->Stb->cursor;
searches_result_line_no[0] = -1;
}
if (render_selection)
{
searches_input_ptr[1] = text_begin + ImMin(state->Stb->select_start, state->Stb->select_end);
searches_result_line_no[1] = -1;
}
// Count lines and find line number for cursor and selection ends // Count lines and find line number for cursor and selection ends
int line_count = 1; int line_count = 1;
@ -5119,23 +5111,23 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
{ {
for (const char* s = text_begin; (s = (const char*)memchr(s, '\n', (size_t)(text_end - s))) != NULL; s++) for (const char* s = text_begin; (s = (const char*)memchr(s, '\n', (size_t)(text_end - s))) != NULL; s++)
{ {
if (searches_result_line_no[0] == -1 && s >= searches_input_ptr[0]) { searches_result_line_no[0] = line_count; } if (cursor_line_no == -1 && s >= cursor_ptr) { cursor_line_no = line_count; }
if (searches_result_line_no[1] == -1 && s >= searches_input_ptr[1]) { searches_result_line_no[1] = line_count; } if (selmin_line_no == -1 && s >= selmin_ptr) { selmin_line_no = line_count; }
line_count++; line_count++;
} }
} }
if (searches_result_line_no[0] == -1) if (cursor_line_no == -1)
searches_result_line_no[0] = line_count; cursor_line_no = line_count;
if (searches_result_line_no[1] == -1) if (selmin_line_no == -1)
searches_result_line_no[1] = line_count; selmin_line_no = line_count;
// Calculate 2d position by finding the beginning of the line and measuring distance // Calculate 2d position by finding the beginning of the line and measuring distance
cursor_offset.x = InputTextCalcTextSize(&g, ImStrbol(searches_input_ptr[0], text_begin), searches_input_ptr[0]).x; cursor_offset.x = InputTextCalcTextSize(&g, ImStrbol(cursor_ptr, text_begin), cursor_ptr).x;
cursor_offset.y = searches_result_line_no[0] * g.FontSize; cursor_offset.y = cursor_line_no * g.FontSize;
if (searches_result_line_no[1] >= 0) if (selmin_line_no >= 0)
{ {
select_start_offset.x = InputTextCalcTextSize(&g, ImStrbol(searches_input_ptr[1], text_begin), searches_input_ptr[1]).x; select_start_offset.x = InputTextCalcTextSize(&g, ImStrbol(selmin_ptr, text_begin), selmin_ptr).x;
select_start_offset.y = searches_result_line_no[1] * g.FontSize; select_start_offset.y = selmin_line_no * g.FontSize;
} }
// Store text height (note that we haven't calculated text width at all, see GitHub issues #383, #1224) // Store text height (note that we haven't calculated text width at all, see GitHub issues #383, #1224)