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

SL-20391 Show Emoji Completion floater after backspacing a character

master
Alexander Gavriliuk 2023-10-02 15:09:39 +02:00 committed by Guru
parent 988278b8c3
commit c3adae2a5f
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
indra/llui/lltexteditor.cpp
View File

@ -1022,7 +1022,7 @@ S32 LLTextEditor::remove(S32 pos, S32 length, bool group_with_next_op)
// store text segments
getSegmentsInRange(segments_to_remove, pos, pos + length, false);
if(pos <= end_pos)
if (pos <= end_pos)
{
removedChar = execute( new TextCmdRemove( pos, group_with_next_op, end_pos - pos, segments_to_remove ) );
}
@ -1046,11 +1046,12 @@ S32 LLTextEditor::overwriteChar(S32 pos, llwchar wc)
// a pseudo-tab (up to for spaces in a row)
void LLTextEditor::removeCharOrTab()
{
if( !getEnabled() )
if (!getEnabled())
{
return;
}
if( mCursorPos > 0 )
if (mCursorPos > 0)
{
S32 chars_to_remove = 1;
@ -1062,14 +1063,14 @@ void LLTextEditor::removeCharOrTab()
if (offset > 0)
{
chars_to_remove = offset % SPACES_PER_TAB;
if( chars_to_remove == 0 )
if (chars_to_remove == 0)
{
chars_to_remove = SPACES_PER_TAB;
}
for( S32 i = 0; i < chars_to_remove; i++ )
for (S32 i = 0; i < chars_to_remove; i++)
{
if (text[ mCursorPos - i - 1] != ' ')
if (text[mCursorPos - i - 1] != ' ')
{
// Fewer than a full tab's worth of spaces, so
// just delete a single character.
@ -1083,8 +1084,10 @@ void LLTextEditor::removeCharOrTab()
for (S32 i = 0; i < chars_to_remove; i++)
{
setCursorPos(mCursorPos - 1);
remove( mCursorPos, 1, FALSE );
remove(mCursorPos, 1, false);
}
tryToShowEmojiHelper();
}
else
{
@ -1095,7 +1098,7 @@ void LLTextEditor::removeCharOrTab()
// Remove a single character from the text
S32 LLTextEditor::removeChar(S32 pos)
{
return remove( pos, 1, FALSE );
return remove(pos, 1, false);
}
void LLTextEditor::removeChar()
@ -1104,10 +1107,12 @@ void LLTextEditor::removeChar()
{
return;
}
if (mCursorPos > 0)
{
setCursorPos(mCursorPos - 1);
removeChar(mCursorPos);
tryToShowEmojiHelper();
}
else
{
@ -1166,20 +1171,7 @@ void LLTextEditor::addChar(llwchar wc)
}
setCursorPos(mCursorPos + addChar( mCursorPos, wc ));
if (!mReadOnly && mShowEmojiHelper)
{
S32 shortCodePos;
LLWString wtext(getWText());
if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
{
const LLRect cursorRect(getLocalRectFromDocIndex(shortCodePos));
const LLWString wpart(wtext.substr(shortCodePos, mCursorPos - shortCodePos));
const std::string part(wstring_to_utf8str(wpart));
auto cb = [this](llwchar emoji) { handleEmojiCommit(emoji); };
LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, part, cb);
}
}
tryToShowEmojiHelper();
if (!mReadOnly && mAutoreplaceCallback != NULL)
{
@ -1199,6 +1191,23 @@ void LLTextEditor::addChar(llwchar wc)
}
}
void LLTextEditor::tryToShowEmojiHelper()
{
if (mReadOnly || !mShowEmojiHelper)
return;
S32 shortCodePos;
LLWString wtext(getWText());
if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
{
const LLRect cursorRect(getLocalRectFromDocIndex(shortCodePos));
const LLWString wpart(wtext.substr(shortCodePos, mCursorPos - shortCodePos));
const std::string part(wstring_to_utf8str(wpart));
auto cb = [this](llwchar emoji) { handleEmojiCommit(emoji); };
LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, part, cb);
}
}
void LLTextEditor::addLineBreakChar(BOOL group_together)
{
if( !getEnabled() )

1
indra/llui/lltexteditor.h
View File

@ -255,6 +255,7 @@ protected:
S32 insert(S32 pos, const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment);
S32 remove(S32 pos, S32 length, bool group_with_next_op);
void tryToShowEmojiHelper();
void focusLostHelper();
void updateAllowingLanguageInput();
BOOL hasPreeditString() const;