diff options
| author | Kitty Barnett <develop@catznip.com> | 2022-11-08 00:16:58 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2022-11-08 01:05:01 +0100 |
| commit | 81dd143d0d901e8e5234cff01fbda246e4621628 (patch) | |
| tree | 948c765937ce5ebe57bb98115e8d6efa754c60c6 /indra/newview | |
| parent | ec6c4f102f8b23e0c79dd2c1c0ecbad54f019566 (diff) | |
[FIXED] Various minor issues
- Typing :+1: doesn't replace the short code with the thumbs-up emoji
- Moving the mouse over the emoji complete panel highlights the wrong emoji when mScrollPos > 0
- Emoji complete panel is missing attributes
- Crash when attempting to show the tooltip for an emoji text segment
- Emoji autocomplete panel can sometimes show empty (type ':cat', select the heart eyed one, Ctrl-Z and then type 2 which should show the emoji for :cat2 but shows an empty square instead)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelemojicomplete.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/emoji_complete.xml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp index a7058a6724..f890a14e8e 100644 --- a/indra/newview/llpanelemojicomplete.cpp +++ b/indra/newview/llpanelemojicomplete.cpp @@ -146,9 +146,9 @@ void LLPanelEmojiComplete::reshape(S32 width, S32 height, BOOL called_from_paren void LLPanelEmojiComplete::setEmojiHint(const std::string& hint) { llwchar curEmoji = (mCurSelected < mEmojis.size()) ? mEmojis.at(mCurSelected) : 0; - size_t curEmojiIdx = (curEmoji) ? mEmojis.find(curEmoji) : std::string::npos; mEmojis = LLEmojiDictionary::instance().findMatchingEmojis(hint); + size_t curEmojiIdx = (curEmoji) ? mEmojis.find(curEmoji) : std::string::npos; mCurSelected = (std::string::npos != curEmojiIdx) ? curEmojiIdx : 0; if (mAutoSize) @@ -168,7 +168,7 @@ size_t LLPanelEmojiComplete::posToIndex(S32 x, S32 y) const { if (mRenderRect.pointInRect(x, y)) { - return llmin((size_t)x / mEmojiWidth, mEmojis.size() - 1); + return mScrollPos + llmin((size_t)x / mEmojiWidth, mEmojis.size() - 1); } return npos; } diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml index f35105ff7e..370f1d174e 100644 --- a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml +++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <emoji_complete + autosize="false" font="EmojiHuge" hover_image="ListItem_Over" + max_emoji="7" + padding="8" selected_image="ListItem_Select" > </emoji_complete> |