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

Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer

master
Ansariel 2023-07-29 13:17:19 +02:00
parent f594beab17 264d9c32d9
commit fee03db3cb
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/lluistring.h
View File

@ -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);

5
indra/newview/llfloateremojipicker.cpp
View File

@ -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)
{

1
indra/newview/llfloaterimsessiontab.cpp
View File

@ -256,6 +256,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");

BIN
indra/newview/skins/default/textures/icons/emoji_picker_icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 316 B

1
indra/newview/skins/default/textures/textures.xml
View File

@ -222,7 +222,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="ExternalBrowser_Over" file_name="icons/ExternalBrowser_Over.png" preload="false" />
<texture name="ExternalBrowser_Press" file_name="icons/ExternalBrowser_Press.png" preload="false" />

11
indra/newview/skins/default/xui/en/floater_im_session.xml
View File

@ -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