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

Commit immediately if the user already typed a full shortcode

master
Kitty Barnett 2022-11-02 19:05:24 +01:00
parent d1dbefc09b
commit c40d3351d5
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/llui/llemojidictionary.cpp
View File

@ -175,17 +175,26 @@ LLWString LLEmojiDictionary::findMatchingEmojis(const std::string& needle) const
return result;
}
std::string LLEmojiDictionary::getNameFromEmoji(llwchar ch)
const LLEmojiDescriptor* LLEmojiDictionary::getDescriptorFromShortCode(const std::string& short_code) const
{
const auto it = mShortCode2Descr.find(short_code);
return (mShortCode2Descr.end() != it) ? &it->second : nullptr;
}
std::string LLEmojiDictionary::getNameFromEmoji(llwchar ch) const
{
const auto it = mEmoji2Descr.find(ch);
return (mEmoji2Descr.end() != it) ? it->second->Name : LLStringUtil::null;
return (mEmoji2Descr.end() != it) ? it->second.Name : LLStringUtil::null;
}
void LLEmojiDictionary::addEmoji(LLEmojiDescriptor&& descr)
{
mEmojis.push_back(descr);
const LLEmojiDescriptor& back = mEmojis.back();
mEmoji2Descr.insert(std::make_pair(descr.Character, &back));
mEmoji2Descr.insert(std::make_pair(descr.Character, mEmojis.back()));
for (const std::string& shortCode : descr.ShortCodes)
{
mShortCode2Descr.insert(std::make_pair(shortCode, mEmojis.back()));
}
}
// ============================================================================

6
indra/llui/llemojidictionary.h
View File

@ -58,14 +58,16 @@ class LLEmojiDictionary : public LLParamSingleton<LLEmojiDictionary>, public LLI
public:
static void initClass();
LLWString findMatchingEmojis(const std::string& needle) const;
std::string getNameFromEmoji(llwchar ch);
const LLEmojiDescriptor* getDescriptorFromShortCode(const std::string& short_code) const;
std::string getNameFromEmoji(llwchar ch) const;
private:
void addEmoji(LLEmojiDescriptor&& descr);
private:
std::list<LLEmojiDescriptor> mEmojis;
std::map<llwchar, const LLEmojiDescriptor*> mEmoji2Descr;
std::map<llwchar, const LLEmojiDescriptor&> mEmoji2Descr;
std::map<std::string, const LLEmojiDescriptor&> mShortCode2Descr;
};
// ============================================================================

8
indra/llui/llemojihelper.cpp
View File

@ -83,6 +83,14 @@ bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S
void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, const std::string& short_code, std::function<void(LLWString)> cb)
{
// Commit immediately if the user already typed a full shortcode
if (const auto* emojiDescrp = LLEmojiDictionary::instance().getDescriptorFromShortCode(short_code))
{
cb(LLWString(1, emojiDescrp->Character));
hideHelper();
return;
}
if (mHelperHandle.isDead())
{
LLFloater* pHelperFloater = LLFloaterReg::getInstance(DEFAULT_EMOJI_HELPER_FLOATER);

1
indra/llui/lltextbase.cpp
View File

@ -29,6 +29,7 @@
#include "lltextbase.h"
#include "llemojihelper.h"
#include "lllocalcliprect.h"
#include "llmenugl.h"
#include "llscrollcontainer.h"