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

SL-20294 The row of recent emojis displays the recently sent emoji only after clicking the collapsing smiley button

master
Alexander Gavriliuk 2023-09-22 01:19:42 +02:00 committed by Guru
parent 9de22c0eb3
commit c40f63911c
4 changed files with 63 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfloateremojipicker.cpp
View File

@ -771,6 +771,18 @@ void LLFloaterEmojiPicker::onEmojiUsed(llwchar emoji)
sFrequentlyUsed.push_back(std::make_pair(emoji, 1));
}
// static
void LLFloaterEmojiPicker::onRecentlyUsedChanged()
{
if (sSelectedGroupIndex)
return;
if (LLFloaterEmojiPicker* picker = getInstance())
{
picker->fillEmojis();
}
}
// static
void LLFloaterEmojiPicker::loadState()
{

1
indra/newview/llfloateremojipicker.h
View File

@ -56,6 +56,7 @@ public:
static std::list<llwchar>& getRecentlyUsed();
static void onEmojiUsed(llwchar emoji);
static void onRecentlyUsedChanged();
static void loadState();
static void saveState();

80
indra/newview/llfloaterimsessiontab.cpp
View File

@ -456,7 +456,7 @@ void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessio
BOOL show = !self->mEmojiRecentPanel->getVisible();
if (show)
{
self->onEmojiRecentPanelOpening();
self->initEmojiRecentPanel(true);
}
self->mEmojiRecentPanel->setVisible(show);
}
@ -482,27 +482,33 @@ void LLFloaterIMSessionTab::onEmojiPickerToggleBtnClicked(LLFloaterIMSessionTab*
}
}
void LLFloaterIMSessionTab::onEmojiRecentPanelOpening()
void LLFloaterIMSessionTab::initEmojiRecentPanel(bool moveFocus)
{
std::list<llwchar>& recentlyUsed = LLFloaterEmojiPicker::getRecentlyUsed();
if (recentlyUsed.empty())
{
mEmojiRecentEmptyText->setVisible(true);
mEmojiRecentIconsCtrl->setVisible(false);
mEmojiPickerToggleBtn->setFocus(true);
}
else
{
LLWString emojis;
for (llwchar emoji : recentlyUsed)
{
emojis += emoji;
}
mEmojiRecentIconsCtrl->setEmojis(emojis);
mEmojiRecentEmptyText->setVisible(false);
mEmojiRecentIconsCtrl->setVisible(true);
mEmojiRecentIconsCtrl->setFocus(true);
}
std::list<llwchar>& recentlyUsed = LLFloaterEmojiPicker::getRecentlyUsed();
if (recentlyUsed.empty())
{
mEmojiRecentEmptyText->setVisible(true);
mEmojiRecentIconsCtrl->setVisible(false);
if (moveFocus)
{
mEmojiPickerToggleBtn->setFocus(true);
}
}
else
{
LLWString emojis;
for (llwchar emoji : recentlyUsed)
{
emojis += emoji;
}
mEmojiRecentIconsCtrl->setEmojis(emojis);
mEmojiRecentEmptyText->setVisible(false);
mEmojiRecentIconsCtrl->setVisible(true);
if (moveFocus)
{
mEmojiRecentIconsCtrl->setFocus(true);
}
}
}
void LLFloaterIMSessionTab::onRecentEmojiPicked(const LLSD& value)
@ -514,7 +520,7 @@ void LLFloaterIMSessionTab::onRecentEmojiPicked(const LLSD& value)
if (wstr.size())
{
llwchar emoji = wstr[0];
onEmojiPicked(emoji);
mInputEditor->insertEmoji(emoji);
}
}
}
@ -579,16 +585,28 @@ void LLFloaterIMSessionTab::appendMessage(const LLChat& chat, const LLSD& args)
void LLFloaterIMSessionTab::updateUsedEmojis(LLWString text)
{
LLEmojiDictionary* dictionary = LLEmojiDictionary::getInstance();
llassert_always(dictionary);
LLEmojiDictionary* dictionary = LLEmojiDictionary::getInstance();
llassert_always(dictionary);
for (llwchar& c : text)
{
if (dictionary->isEmoji(c))
{
LLFloaterEmojiPicker::onEmojiUsed(c);
}
}
bool emojiSent = false;
for (llwchar& c : text)
{
if (dictionary->isEmoji(c))
{
LLFloaterEmojiPicker::onEmojiUsed(c);
emojiSent = true;
}
}
if (!emojiSent)
return;
LLFloaterEmojiPicker::onRecentlyUsedChanged();
if (mEmojiRecentPanel->getVisible())
{
initEmojiRecentPanel(false);
}
}
static LLTrace::BlockTimerStatHandle FTM_BUILD_CONVERSATION_VIEW_PARTICIPANT("Build Conversation View");

2
indra/newview/llfloaterimsessiontab.h
View File

@ -217,7 +217,7 @@ private:
static void onEmojiRecentPanelToggleBtnClicked(LLFloaterIMSessionTab* self);
static void onEmojiPickerToggleBtnClicked(LLFloaterIMSessionTab* self);
void onEmojiRecentPanelOpening();
void initEmojiRecentPanel(bool moveFocus);
void onRecentEmojiPicked(const LLSD& value);
void onEmojiPicked(llwchar emoji);
void onEmojiPickerClosed();