summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloateremojipicker.cpp153
-rw-r--r--indra/newview/llfloateremojipicker.h9
-rw-r--r--indra/newview/skins/default/xui/en/floater_emoji_picker.xml22
3 files changed, 25 insertions, 159 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index e620d507ec..e94fc203f0 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -41,8 +41,6 @@
std::string LLFloaterEmojiPicker::mSelectedCategory;
std::string LLFloaterEmojiPicker::mSearchPattern;
-int LLFloaterEmojiPicker::mSelectedEmojiIndex;
-bool LLFloaterEmojiPicker::mUseGrid = true;
class LLEmojiScrollListItem : public LLScrollListItem
{
@@ -210,9 +208,6 @@ LLFloaterEmojiPicker* LLFloaterEmojiPicker::showInstance(pick_callback_t pick_ca
void LLFloaterEmojiPicker::show(pick_callback_t pick_callback, close_callback_t close_callback)
{
- // Temporary solution to support both layouts
- mUseGrid = !gKeyboard->getKeyDown(KEY_SHIFT);
-
mEmojiPickCallback = pick_callback;
mFloaterCloseCallback = close_callback;
openFloater(mKey);
@@ -251,19 +246,13 @@ BOOL LLFloaterEmojiPicker::postBuild()
mSearch->setFont(LLViewerChat::getChatFont());
mSearch->setText(mSearchPattern);
- mEmojiList = getChild<LLScrollListCtrl>("EmojiList");
- mEmojiList->setCommitCallback([this](LLUICtrl*, const LLSD&) { onEmojiSelect(); });
- mEmojiList->setDoubleClickCallback([this]() { onEmojiPick(); });
- mEmojiList->setVisible(!mUseGrid);
-
mEmojiScroll = getChild<LLScrollContainer>("EmojiGridContainer");
- mEmojiScroll->setVisible(mUseGrid);
mEmojiScroll->setMouseEnterCallback([this](LLUICtrl*, const LLSD&) { onGridMouseEnter(); });
mEmojiScroll->setMouseLeaveCallback([this](LLUICtrl*, const LLSD&) { onGridMouseLeave(); });
mEmojiGrid = getChild<LLScrollingPanelList>("EmojiGrid");
- fillEmojis();
+ fillEmojiGrid();
return TRUE;
}
@@ -272,7 +261,7 @@ void LLFloaterEmojiPicker::dirtyRect()
{
super::dirtyRect();
- if (mUseGrid && mEmojiScroll && mEmojiScroll->getRect().getWidth() != mRecentGridWidth)
+ if (mEmojiScroll && mEmojiScroll->getRect().getWidth() != mRecentGridWidth)
{
fillEmojiGrid();
}
@@ -283,54 +272,9 @@ LLFloaterEmojiPicker::~LLFloaterEmojiPicker()
gFocusMgr.releaseFocusIfNeeded( this );
}
-void LLFloaterEmojiPicker::fillEmojis()
-{
- if (mUseGrid)
- fillEmojiGrid();
- else
- fillEmojiList();
-}
-
-void LLFloaterEmojiPicker::fillEmojiList()
-{
- mEmojiList->clearRows();
-
- const LLEmojiDictionary::emoji2descr_map_t& emoji2Descr = LLEmojiDictionary::instance().getEmoji2Descr();
- for (const LLEmojiDictionary::emoji2descr_item_t& item : emoji2Descr)
- {
- const LLEmojiDescriptor* descr = item.second;
-
- if (!mSelectedCategory.empty() && !matchesCategory(descr))
- continue;
-
- if (!mSearchPattern.empty() && !matchesPattern(descr))
- continue;
-
- LLScrollListItem::Params params;
- // The following line adds default monochrome view of the emoji (is shown as an example)
- //params.columns.add().column("look").value(wstring_to_utf8str(LLWString(1, it.first)));
- params.columns.add().column("name").value(descr->Name);
- mEmojiList->addRow(new LLEmojiScrollListItem(item.first, params), params);
- }
-
- if (mEmojiList->getItemCount())
- {
- if (mSelectedEmojiIndex > 0 && mSelectedEmojiIndex < mEmojiList->getItemCount())
- mEmojiList->selectNthItem(mSelectedEmojiIndex);
- else
- mEmojiList->selectFirstItem();
-
- mEmojiList->scrollToShowSelected();
- }
- else
- {
- onEmojiEmpty();
- }
-}
-
void LLFloaterEmojiPicker::fillEmojiGrid()
{
- mEmojiGrid->clearPanels();
+ mRecentGridWidth = mEmojiScroll->getRect().getWidth();
S32 scrollbarSize = mEmojiScroll->getSize();
if (scrollbarSize < 0)
@@ -339,8 +283,22 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
scrollbarSize = scrollbar_size_control;
}
- mRecentGridWidth = mEmojiScroll->getRect().getWidth();
const S32 clientWidth = mRecentGridWidth - scrollbarSize - mEmojiScroll->getBorderWidth() * 2;
+ const S32 gridPadding = mEmojiGrid->getPadding();
+ const S32 iconSpacing = mEmojiGrid->getSpacing();
+ const S32 rowWidth = clientWidth - gridPadding * 2;
+ const S32 iconSize = 28; // icon width and height
+ const S32 maxIcons = llmax(1, (rowWidth + iconSpacing) / (iconSize + iconSpacing));
+
+ // Optimization: don't rearrange for different widths with the same maxIcons
+ if (maxIcons == mRecentMaxIcons)
+ return;
+ mRecentMaxIcons = maxIcons;
+
+ mHoveredIcon = nullptr;
+ mEmojiGrid->clearPanels();
+ mPreviewEmoji->setLabel(LLUIString());
+
if (mEmojiGrid->getRect().getWidth() != clientWidth)
{
LLRect rect = mEmojiGrid->getRect();
@@ -348,12 +306,6 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
mEmojiGrid->setRect(rect);
}
- const S32 gridPadding = mEmojiGrid->getPadding();
- const S32 iconSpacing = mEmojiGrid->getSpacing();
- const S32 rowWidth = clientWidth - gridPadding * 2;
- const S32 iconSize = 28; // icon width and height
- const S32 maxIcons = llmax(1, (rowWidth + iconSpacing) / (iconSize + iconSpacing));
-
LLPanel::Params row_panel_params;
row_panel_params.rect = LLRect(0, iconSize, rowWidth, 0);
@@ -435,8 +387,6 @@ void LLFloaterEmojiPicker::fillEmojiGrid()
listCategory(mSelectedCategory, item->second, FALSE);
}
}
-
- onEmojiEmpty();
}
bool LLFloaterEmojiPicker::matchesCategory(const LLEmojiDescriptor* descr)
@@ -460,34 +410,24 @@ bool LLFloaterEmojiPicker::matchesPattern(const LLEmojiDescriptor* descr)
void LLFloaterEmojiPicker::onCategoryCommit()
{
mSelectedCategory = mCategory->getSelectedValue().asString();
- mSelectedEmojiIndex = 0;
- fillEmojis();
+ mRecentMaxIcons = 0;
+ fillEmojiGrid();
}
void LLFloaterEmojiPicker::onSearchKeystroke()
{
mSearchPattern = mSearch->getText();
- mSelectedEmojiIndex = 0;
- fillEmojis();
+ mRecentMaxIcons = 0;
+ fillEmojiGrid();
}
void LLFloaterEmojiPicker::onPreviewEmojiClick()
{
if (mEmojiPickCallback)
{
- if (mUseGrid)
+ if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(mHoveredIcon))
{
- if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(mHoveredIcon))
- {
- mEmojiPickCallback(icon->getEmoji());
- }
- }
- else
- {
- if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojiList->getFirstSelected()))
- {
- mEmojiPickCallback(item->getEmoji());
- }
+ mEmojiPickCallback(icon->getEmoji());
}
}
}
@@ -549,38 +489,6 @@ void LLFloaterEmojiPicker::onEmojiMouseClick(LLUICtrl* ctrl, MASK mask)
}
}
-void LLFloaterEmojiPicker::onEmojiSelect()
-{
- if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojiList->getFirstSelected()))
- {
- mSelectedEmojiIndex = mEmojiList->getFirstSelectedIndex();
- LLUIString text;
- text.insert(0, LLWString(1, item->getEmoji()));
- mPreviewEmoji->setLabel(text);
- return;
- }
-
- onEmojiEmpty();
-}
-
-void LLFloaterEmojiPicker::onEmojiEmpty()
-{
- mSelectedEmojiIndex = 0;
- mPreviewEmoji->setLabel(LLUIString());
-}
-
-void LLFloaterEmojiPicker::onEmojiPick()
-{
- if (mEmojiPickCallback)
- {
- if (LLEmojiScrollListItem* item = dynamic_cast<LLEmojiScrollListItem*>(mEmojiList->getFirstSelected()))
- {
- mEmojiPickCallback(item->getEmoji());
- closeFloater();
- }
- }
-}
-
void LLFloaterEmojiPicker::selectGridIcon(LLUICtrl* ctrl)
{
if (LLEmojiGridIcon* icon = dynamic_cast<LLEmojiGridIcon*>(ctrl))
@@ -613,22 +521,9 @@ BOOL LLFloaterEmojiPicker::handleKeyHere(KEY key, MASK mask)
{
switch (key)
{
- case KEY_RETURN:
- if (mCategory->hasFocus())
- break;
- onEmojiPick();
- return TRUE;
case KEY_ESCAPE:
closeFloater();
return TRUE;
- case KEY_UP:
- mEmojiList->selectPrevItem();
- mEmojiList->scrollToShowSelected();
- return TRUE;
- case KEY_DOWN:
- mEmojiList->selectNextItem();
- mEmojiList->scrollToShowSelected();
- return TRUE;
}
}
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index 68c694d89a..b36e09fd5b 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -55,8 +55,6 @@ public:
virtual void closeFloater(bool app_quitting = false) override;
private:
- void fillEmojis();
- void fillEmojiList();
void fillEmojiGrid();
bool matchesCategory(const LLEmojiDescriptor* descr);
@@ -70,9 +68,6 @@ private:
void onEmojiMouseEnter(LLUICtrl* ctrl);
void onEmojiMouseLeave(LLUICtrl* ctrl);
void onEmojiMouseClick(LLUICtrl* ctrl, MASK mask);
- void onEmojiSelect();
- void onEmojiEmpty();
- void onEmojiPick();
void selectGridIcon(LLUICtrl* ctrl);
void unselectGridIcon(LLUICtrl* ctrl);
@@ -81,7 +76,6 @@ private:
class LLComboBox* mCategory { nullptr };
class LLLineEditor* mSearch { nullptr };
- class LLScrollListCtrl* mEmojiList { nullptr };
class LLScrollContainer* mEmojiScroll { nullptr };
class LLScrollingPanelList* mEmojiGrid { nullptr };
class LLButton* mPreviewEmoji { nullptr };
@@ -91,12 +85,11 @@ private:
close_callback_t mFloaterCloseCallback;
S32 mRecentGridWidth { 0 };
+ S32 mRecentMaxIcons { 0 };
LLUICtrl* mHoveredIcon { nullptr };
static std::string mSelectedCategory;
static std::string mSearchPattern;
- static int mSelectedEmojiIndex;
- static bool mUseGrid;
};
#endif
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index 76cd1c6d2a..2e153933c0 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -39,28 +39,6 @@
left="2"
height="29"
width="29" />
- <scroll_list
- name="EmojiList"
- layout="topleft"
- follows="all"
- sort_column="0"
- max_chars="63"
- commit_on_selection_change="true"
- draw_heading="true"
- heading_height="25"
- row_padding="0"
- top="25"
- left="0"
- height="330"
- width="200">
- <columns
- label="@"
- name="look"
- width="16" />
- <columns
- label="Name"
- name="name" />
- </scroll_list>
<scroll_container
name="EmojiGridContainer"
layout="topleft"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 00:46:00 +0000