Skip to content
Snippets Groups Projects
Commit cb0bb911 authored by Kitty Barnett's avatar Kitty Barnett
Browse files

Mini emoji helper shows as a small slice when there are no matching emojis

parent 58cdcd5d
No related branches found
No related tags found
No related merge requests found
...@@ -260,6 +260,10 @@ BOOL LLFloaterEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_pare ...@@ -260,6 +260,10 @@ BOOL LLFloaterEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_pare
void LLFloaterEmojiComplete::onOpen(const LLSD& key) void LLFloaterEmojiComplete::onOpen(const LLSD& key)
{ {
mEmojiCtrl->setEmojiHint(key["hint"].asString()); mEmojiCtrl->setEmojiHint(key["hint"].asString());
if (0 == mEmojiCtrl->getEmojiCount())
{
LLEmojiHelper::instance().hideHelper();
}
} }
BOOL LLFloaterEmojiComplete::postBuild() BOOL LLFloaterEmojiComplete::postBuild()
......
...@@ -59,7 +59,8 @@ class LLPanelEmojiComplete : public LLUICtrl ...@@ -59,7 +59,8 @@ class LLPanelEmojiComplete : public LLUICtrl
void reshape(S32 width, S32 height, BOOL called_from_parent) override; void reshape(S32 width, S32 height, BOOL called_from_parent) override;
public: public:
void setEmojiHint(const std::string& hint); size_t getEmojiCount() const { return mEmojis.size(); }
void setEmojiHint(const std::string& hint);
protected: protected:
size_t posToIndex(S32 x, S32 y) const; size_t posToIndex(S32 x, S32 y) const;
void select(size_t emoji_idx); void select(size_t emoji_idx);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment