diff options
| author | Kitty Barnett <develop@catznip.com> | 2022-10-23 17:51:22 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2022-10-23 16:29:20 +0200 |
| commit | cb0bb91108b628e1134f1f655eaca9d305961cda (patch) | |
| tree | 5dead06f32803b23b8935ada7ae0fff9b7ae4073 /indra/newview | |
| parent | 58cdcd5dd23778c6fad9fa0da31b670ceff8eeeb (diff) | |
Mini emoji helper shows as a small slice when there are no matching emojis
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelemojicomplete.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llpanelemojicomplete.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp index 61b08ad48d..a7058a6724 100644 --- a/indra/newview/llpanelemojicomplete.cpp +++ b/indra/newview/llpanelemojicomplete.cpp @@ -260,6 +260,10 @@ BOOL LLFloaterEmojiComplete::handleKey(KEY key, MASK mask, BOOL called_from_pare void LLFloaterEmojiComplete::onOpen(const LLSD& key) { mEmojiCtrl->setEmojiHint(key["hint"].asString()); + if (0 == mEmojiCtrl->getEmojiCount()) + { + LLEmojiHelper::instance().hideHelper(); + } } BOOL LLFloaterEmojiComplete::postBuild() diff --git a/indra/newview/llpanelemojicomplete.h b/indra/newview/llpanelemojicomplete.h index 361a2dc9b7..138cc465ba 100644 --- a/indra/newview/llpanelemojicomplete.h +++ b/indra/newview/llpanelemojicomplete.h @@ -59,7 +59,8 @@ public: void reshape(S32 width, S32 height, BOOL called_from_parent) override; public: - void setEmojiHint(const std::string& hint); + size_t getEmojiCount() const { return mEmojis.size(); } + void setEmojiHint(const std::string& hint); protected: size_t posToIndex(S32 x, S32 y) const; void select(size_t emoji_idx); |