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

SL-20387 Show Emoji Completion floater at the beginning of the shortcode

master
Alexander Gavriliuk 2023-10-02 14:08:31 +02:00 committed by Guru
parent 317041be0d
commit f36f50462e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llemojihelper.cpp
View File

@ -37,7 +37,7 @@
//
constexpr char DEFAULT_EMOJI_HELPER_FLOATER[] = "emoji_complete";
constexpr S32 HELPER_FLOATER_OFFSET_X = 20;
constexpr S32 HELPER_FLOATER_OFFSET_X = 0;
constexpr S32 HELPER_FLOATER_OFFSET_Y = 0;
// ============================================================================
@ -113,6 +113,7 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
rct.setLeftTopAndSize(floater_x - HELPER_FLOATER_OFFSET_X, floater_y - HELPER_FLOATER_OFFSET_Y + rct.getHeight(), rct.getWidth(), rct.getHeight());
pHelperFloater->setRect(rct);
pHelperFloater->openFloater(LLSD().with("hint", short_code));
gFloaterView->adjustToFitScreen(pHelperFloater, FALSE);
}
void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p)

11
indra/llui/lltexteditor.cpp
View File

@ -1169,12 +1169,15 @@ void LLTextEditor::addChar(llwchar wc)
if (!mReadOnly && mShowEmojiHelper)
{
LLWString wtext(getWText()); S32 shortCodePos;
S32 shortCodePos;
LLWString wtext(getWText());
if (LLEmojiHelper::isCursorInEmojiCode(wtext, mCursorPos, &shortCodePos))
{
const LLRect cursorRect = getLocalRectFromDocIndex(mCursorPos - 1);
const LLWString shortCode = wtext.substr(shortCodePos, mCursorPos - shortCodePos);
LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, wstring_to_utf8str(shortCode), std::bind(&LLTextEditor::handleEmojiCommit, this, std::placeholders::_1));
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);
}
}