diff options
| -rw-r--r-- | indra/llui/lluistring.h | 1 | ||||
| -rw-r--r-- | indra/newview/llfloateremojipicker.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/emoji_picker_icon.png | bin | 316 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 11 |
6 files changed, 9 insertions, 10 deletions
diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h index 07e02de6d8..b1089a3903 100644 --- a/indra/llui/lluistring.h +++ b/indra/llui/lluistring.h @@ -61,6 +61,7 @@ public: LLUIString() : mArgs(NULL), mNeedsResult(false), mNeedsWResult(false) {} LLUIString(const std::string& instring, const LLStringUtil::format_map_t& args); LLUIString(const std::string& instring) : mArgs(NULL) { assign(instring); } + LLUIString(const LLWString& instring) : mArgs(NULL) { insert(0, instring); } ~LLUIString() { delete mArgs; } void assign(const std::string& instring); diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp index 808aca4bf4..c3344fc18a 100644 --- a/indra/newview/llfloateremojipicker.cpp +++ b/indra/newview/llfloateremojipicker.cpp @@ -355,10 +355,7 @@ void LLFloaterEmojiPicker::fillGroups() button->setMouseLeaveCallback([this](LLUICtrl* ctrl, const LLSD&) { onGroupButtonMouseLeave(ctrl); }); button->setRect(rect); - - LLUIString text; - text.insert(0, LLWString(1, group.Character)); - button->setLabel(text); + button->setLabel(LLUIString(LLWString(1, group.Character))); if (mGroupButtons.size() == sSelectedGroupIndex) { diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 8ab41b227b..bacfd8ca33 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -254,6 +254,7 @@ BOOL LLFloaterIMSessionTab::postBuild() mTearOffBtn->setCommitCallback(boost::bind(&LLFloaterIMSessionTab::onTearOffClicked, this)); mEmojiBtn = getChild<LLButton>("emoji_panel_btn"); + mEmojiBtn->setLabel(LLUIString(LLWString(1, 128512))); mEmojiBtn->setClickedCallback(boost::bind(&LLFloaterIMSessionTab::onEmojiPanelBtnClicked, this)); mGearBtn = getChild<LLButton>("gear_btn"); diff --git a/indra/newview/skins/default/textures/icons/emoji_picker_icon.png b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png Binary files differdeleted file mode 100644 index 668dcaf193..0000000000 --- a/indra/newview/skins/default/textures/icons/emoji_picker_icon.png +++ /dev/null diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index d8c873e791..8fa257131e 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -206,7 +206,6 @@ with the same filename but different name <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" /> - <texture name="Emoji_Picker_Icon" file_name="icons/emoji_picker_icon.png" preload="true" /> <texture name="ExternalBrowser_Off" file_name="icons/ExternalBrowser_Off.png" preload="false" /> <texture name="Edit_Wrench" file_name="icons/Edit_Wrench.png" preload="false" /> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 1592352d1b..fc54710941 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -300,16 +300,17 @@ right="-30" wrap="true" /> <button + name="emoji_panel_btn" + tool_tip="Shows/hides emoji picker" follows="right|bottom" - bottom="-7" - height="25" + use_font_color="true" + font="EmojiLarge" image_hover_unselected="Toolbar_Middle_Over" - image_overlay="Emoji_Picker_Icon" image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" + bottom="-7" right="-1" - name="emoji_panel_btn" - tool_tip="Shows/hides emoji panel" + height="25" width="25"/> </layout_panel> <layout_panel |
