Text, DrawList: Improved handling of long single-line wrapped text. (#7496, #5720)

This commit is contained in:
ocornut 2024-04-15 12:52:45 +02:00
parent fab96a6e59
commit daecfffefb
2 changed files with 4 additions and 0 deletions

View File

@ -43,6 +43,8 @@ Breaking changes:
Other changes: Other changes:
- Text, DrawList: Improved handling of long single-line wrapped text. Faster and
mitigitate issues with reading vertex indexing limits with 16-bit indices.
- Backends: SDL3: Fixed text inputs. Re-enable calling SDL_StartTextInput()/SDL_StopTextInput() - Backends: SDL3: Fixed text inputs. Re-enable calling SDL_StartTextInput()/SDL_StopTextInput()
as SDL3 no longer enables it by default. (#7452, #6306, #6071, #1953) [@Green-Sky] as SDL3 no longer enables it by default. (#7452, #6306, #6071, #1953) [@Green-Sky]

View File

@ -4080,6 +4080,8 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, const ImVec2& pos, Im
{ {
x = start_x; x = start_x;
y += line_height; y += line_height;
if (y > clip_rect.w)
break; // break out of main loop
word_wrap_eol = NULL; word_wrap_eol = NULL;
s = CalcWordWrapNextLineStartA(s, text_end); // Wrapping skips upcoming blanks s = CalcWordWrapNextLineStartA(s, text_end); // Wrapping skips upcoming blanks
continue; continue;