summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorseth_productengine <none@none>2011-04-20 01:17:41 +0300
committerseth_productengine <none@none>2011-04-20 01:17:41 +0300
commit2147889a2e6acbcf233692d17a0b638a0e8eaec7 (patch)
treee86381139abdf8054eb002ad2209e8c79038448f /indra
parentb8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff)
STORM-320 FIXED navigation with arrow keys through the text with enabled word-wrapping.
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/lltextbase.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 82269282ef..fd7bb699f8 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2022,11 +2022,10 @@ S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round,
pos = segment_line_start + offset;
break;
}
- else if (hit_past_end_of_line && segmentp->getEnd() > line_iter->mDocIndexEnd - 1)
+ else if (hit_past_end_of_line && segmentp->getEnd() >= line_iter->mDocIndexEnd)
{
// segment wraps to next line, so just set doc pos to the end of the line
- // segment wraps to next line, so just set doc pos to start of next line (represented by mDocIndexEnd)
- pos = llmin(getLength(), line_iter->mDocIndexEnd);
+ pos = llclamp(line_iter->mDocIndexEnd - 1, 0, getLength());
break;
}
start_x += text_width;