Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Text editor small sync with upstream

Browse Source
This commit is contained in:
Lirusaito
2019-01-18 05:48:02 -05:00
parent 0c8f2f1ea0
commit 526079d76c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llui/lltexteditor.cpp
View File

@@ -3516,12 +3516,14 @@ void LLTextEditor::drawText()
F32 text_y = (F32)(mTextRect.mTop - line_height); F32 text_y = (F32)(mTextRect.mTop - line_height);
while((mTextRect.mBottom <= text_y) && (cur_line < num_lines)) while((mTextRect.mBottom <= text_y) && (cur_line < num_lines))
{ {
S32 next_line = cur_line + 1;
S32 next_start = -1; S32 next_start = -1;
S32 line_end = text_len; S32 line_end = text_len;
if ((cur_line + 1) < num_lines) if (next_line < num_lines)
{ {
next_start = getLineStart(cur_line + 1); next_start = getLineStart(next_line);
line_end = next_start; line_end = next_start;
} }
line_wraps = text[line_end-1] != '\n'; line_wraps = text[line_end-1] != '\n';
@@ -3557,6 +3559,7 @@ void LLTextEditor::drawText()
NULL); // max pixels NULL); // max pixels
} }
// draw a single line of text
S32 seg_start = line_start; S32 seg_start = line_start;
while( seg_start < line_end ) while( seg_start < line_end )
{ {