livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-845 : Make changeLine() a bit more resistant to unforseen line count values (i.e. 0) and a bit more general

meow-7.2.2
Merov Linden 2013-04-24 17:26:09 -07:00
parent a01233b684
commit 5cf1c9bfe1
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/llui/lltextbase.cpp
View File

@ -2606,21 +2606,18 @@ void LLTextBase::setCursorAtLocalPos( S32 local_x, S32 local_y, bool round, bool
void LLTextBase::changeLine( S32 delta )
{
S32 line = getLineNumFromDocIndex(mCursorPos);
S32 max_line_nb = getLineCount() - 1;
max_line_nb = (max_line_nb < 0 ? 0 : max_line_nb);
S32 new_line = llclamp(line + delta, 0, max_line_nb);
S32 new_line = line;
if( (delta < 0) && (line > 0 ) )
{
new_line = line - 1;
}
else if( (delta > 0) && (line < (getLineCount() - 1)) )
{
new_line = line + 1;
}
LLRect visible_region = getVisibleDocumentRect();
S32 new_cursor_pos = getDocIndexFromLocalCoord(mDesiredXPixel, mLineInfoList[new_line].mRect.mBottom + mVisibleTextRect.mBottom - visible_region.mBottom, TRUE);
setCursorPos(new_cursor_pos, true);
if (new_line != line)
{
LLRect visible_region = getVisibleDocumentRect();
S32 new_cursor_pos = getDocIndexFromLocalCoord(mDesiredXPixel,
mLineInfoList[new_line].mRect.mBottom + mVisibleTextRect.mBottom - visible_region.mBottom, TRUE);
setCursorPos(new_cursor_pos, true);
}
}
bool LLTextBase::scrolledToStart()