diff options
| author | Callum Linden <113564339+callumlinden@users.noreply.github.com> | 2023-04-20 07:19:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-20 07:19:26 -0700 |
| commit | a7eef57c1f3f8cd0850bd33b99f150d0e20d3e88 (patch) | |
| tree | 09aeef796ca232ad1856d918c14eba34b3b4165c /indra/newview/llfloaterimsessiontab.cpp | |
| parent | dc5ef88e314d201f8f15be33d3517f45c4af2878 (diff) | |
| parent | 97b0ba2a6d2596da867043077e32065653d44f6e (diff) | |
Merge pull request #183 from secondlife/SL-19575a
SL-19575 LLFloaterEmojiPicker - Add filter by category
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 3d9751dd35..0571a0d855 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -434,10 +434,12 @@ void LLFloaterIMSessionTab::onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self) { if (!picker->isShown()) { - picker->show(boost::bind(&LLFloaterIMSessionTab::onEmojiSelected, self, _1)); + picker->show( + boost::bind(&LLFloaterIMSessionTab::onEmojiPicked, self, _1), + boost::bind(&LLFloaterIMSessionTab::onEmojiPickerClosed, self)); if (LLFloater* root_floater = gFloaterView->getParentFloater(self)) { - root_floater->addDependentFloater(picker); + root_floater->addDependentFloater(picker, TRUE, TRUE); } } else @@ -447,11 +449,16 @@ void LLFloaterIMSessionTab::onEmojiPanelBtnClicked(LLFloaterIMSessionTab* self) } } -void LLFloaterIMSessionTab::onEmojiSelected(llwchar emoji) +void LLFloaterIMSessionTab::onEmojiPicked(llwchar emoji) { mInputEditor->insertEmoji(emoji); } +void LLFloaterIMSessionTab::onEmojiPickerClosed() +{ + mInputEditor->setFocus(TRUE); +} + std::string LLFloaterIMSessionTab::appendTime() { time_t utc_time; |