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

MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.

meow-7.2.2
maksymsproductengine 2014-05-07 18:42:24 +03:00
parent b36458a98f
commit 8b86130f25
3 changed files with 79 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
indra/llui/lltextbase.cpp
View File

@ -225,7 +225,8 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
mParseHighlights(p.parse_highlights),
mBGVisible(p.bg_visible),
mScroller(NULL),
mStyleDirty(true)
mStyleDirty(true),
mDrawRightmostCursor(false)
{
if(p.allow_scroll)
{
@ -1510,6 +1511,11 @@ void LLTextBase::reflow()
// find and erase line info structs starting at start_index and going to end of document
if (!mLineInfoList.empty())
{
if (mDrawRightmostCursor)
{
start_index--;
}
// find first element whose end comes after start_index
line_list_t::iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), start_index, line_end_compare());
line_start_index = iter->mDocIndexStart;
@ -1698,6 +1704,11 @@ S32 LLTextBase::getLineNumFromDocIndex( S32 doc_index, bool include_wordwrap) co
}
else
{
if (mDrawRightmostCursor)
{
doc_index--;
}
line_list_t::const_iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), doc_index, line_end_compare());
if (include_wordwrap)
{
@ -1726,6 +1737,11 @@ S32 LLTextBase::getLineOffsetFromDocIndex( S32 startpos, bool include_wordwrap)
}
else
{
if (mDrawRightmostCursor)
{
startpos--;
}
line_list_t::const_iterator iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), startpos, line_end_compare());
return startpos - iter->mDocIndexStart;
}
@ -2445,7 +2461,7 @@ S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round,
}
else if (hit_past_end_of_line && segmentp->getEnd() >= line_iter->mDocIndexEnd)
{
if (getLineNumFromDocIndex(line_iter->mDocIndexEnd - 1) == line_iter->mLineNum)
if (getLineNumFromDocIndex(line_iter->mDocIndexEnd - 1) == line_iter->mLineNum && !mDrawRightmostCursor)
{
// if segment wraps to the next line we should step one char back
// to compensate for the space char between words
@ -2478,8 +2494,13 @@ LLRect LLTextBase::getDocRectFromDocIndex(S32 pos) const
// clamp pos to valid values
pos = llclamp(pos, 0, mLineInfoList.back().mDocIndexEnd - 1);
// find line that contains cursor
line_list_t::const_iterator line_iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), pos, line_end_compare());
S32 corrected_pos = pos;
if (mDrawRightmostCursor && pos > 0)
{
corrected_pos--;
}
line_list_t::const_iterator line_iter = std::upper_bound(mLineInfoList.begin(), mLineInfoList.end(), corrected_pos, line_end_compare());
doc_rect.mLeft = line_iter->mRect.mLeft;
doc_rect.mBottom = line_iter->mRect.mBottom;

1
indra/llui/lltextbase.h
View File

@ -606,6 +606,7 @@ protected:
// cursor
S32 mCursorPos; // I-beam is just after the mCursorPos-th character.
bool mDrawRightmostCursor; // When cursor is on the rightmost position on the line
S32 mDesiredXPixel; // X pixel position where the user wants the cursor to be
LLFrameTimer mCursorBlinkTimer; // timer that controls cursor blinking

56
indra/llui/lltexteditor.cpp
View File

@ -1135,8 +1135,14 @@ void LLTextEditor::addChar(llwchar wc)
setCursorPos(new_cursor_pos);
}
}
}
if (mCursorPos > 0)
{
LLRect current_cursor_rect = getDocRectFromDocIndex(mCursorPos);
LLRect prev_cursor_rect = getDocRectFromDocIndex(mCursorPos - 1);
mDrawRightmostCursor = current_cursor_rect.mBottom < prev_cursor_rect.mBottom;
}
}
void LLTextEditor::addLineBreakChar(BOOL group_together)
{
@ -1282,6 +1288,12 @@ BOOL LLTextEditor::handleNavigationKey(const KEY key, const MASK mask)
break;
case KEY_HOME:
if(mDrawRightmostCursor && mCursorPos > 0)
{
mCursorPos--;
mDrawRightmostCursor = false;
}
startOfLine();
break;
@ -1296,6 +1308,14 @@ BOOL LLTextEditor::handleNavigationKey(const KEY key, const MASK mask)
case KEY_END:
endOfLine();
if (!mDrawRightmostCursor)
{
mDrawRightmostCursor = true;
if (mCursorPos + 1 < getLength())
{
setCursorPos(mCursorPos + 1);
}
}
break;
case KEY_LEFT:
@ -1307,7 +1327,18 @@ BOOL LLTextEditor::handleNavigationKey(const KEY key, const MASK mask)
{
if( 0 < mCursorPos )
{
setCursorPos(mCursorPos - 1);
LLRect current_cursor_rect = getDocRectFromDocIndex(mCursorPos);
LLRect next_cursor_rect = getDocRectFromDocIndex(mCursorPos - 1);
if (current_cursor_rect.mBottom < next_cursor_rect.mBottom)
{
mDrawRightmostCursor = true;
}
else
{
mDrawRightmostCursor = false;
setCursorPos(mCursorPos - 1);
}
}
else
{
@ -1325,7 +1356,26 @@ BOOL LLTextEditor::handleNavigationKey(const KEY key, const MASK mask)
{
if( mCursorPos < getLength() )
{
setCursorPos(mCursorPos + 1);
LLRect current_cursor_rect = getDocRectFromDocIndex(mCursorPos);
LLRect next_cursor_rect = getDocRectFromDocIndex(mCursorPos + 1);
if (current_cursor_rect.mBottom > next_cursor_rect.mBottom)
{
if (mDrawRightmostCursor)
{
mDrawRightmostCursor = false;
}
else
{
mDrawRightmostCursor = true;
setCursorPos(mCursorPos + 1);
}
}
else
{
mDrawRightmostCursor = false;
setCursorPos(mCursorPos + 1);
}
}
else
{