From cb0bb91108b628e1134f1f655eaca9d305961cda Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 23 Oct 2022 17:51:22 +0200
Subject: [PATCH] Mini emoji helper shows as a small slice when there are no
matching emojis
---
indra/newview/llpanelemojicomplete.cpp | 4 ++++
indra/newview/llpanelemojicomplete.h | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 61b08ad48dc..a7058a67248 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 361a2dc9b7e..138cc465baf 100644
--- a/indra/newview/llpanelemojicomplete.h
+++ b/indra/newview/llpanelemojicomplete.h
@@ -59,7 +59,8 @@ class LLPanelEmojiComplete : public LLUICtrl
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);
--
GitLab