diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2024-02-28 23:19:46 +0100 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2024-03-05 15:37:49 +0100 |
| commit | 27dd9ee482f7f69651d44f8c7114a22ff761c013 (patch) | |
| tree | fd4689db73b8917fc82f9b42da15094d7976ef6c /indra/newview | |
| parent | 25251c3ba81629f3234fc94c0368cd6300732b09 (diff) | |
triage#86 Use Emoji font in LineEditor by default
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloateremojipicker.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/line_editor.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp index 1578caa39c..79d118bc8a 100644 --- a/indra/newview/llfloateremojipicker.cpp +++ b/indra/newview/llfloateremojipicker.cpp @@ -138,7 +138,7 @@ public: F32 x = getRect().getWidth() / 2; F32 y = getRect().getHeight() / 2; - LLFontGL::getFontEmoji()->render( + LLFontGL::getFontEmojiLarge()->render( mText, // wstr 0, // begin_offset x, // x @@ -229,7 +229,7 @@ protected: { F32 x0 = x; F32 x1 = max_pixels; - LLFontGL* font = LLFontGL::getFontEmoji(); + LLFontGL* font = LLFontGL::getFontEmojiLarge(); if (mBegin) { std::string text = mTitle.substr(0, mBegin); @@ -423,7 +423,7 @@ void LLFloaterEmojiPicker::fillGroups() mGroupButtons.clear(); LLButton::Params params; - params.font = LLFontGL::getFontEmoji(); + params.font = LLFontGL::getFontEmojiLarge(); LLRect rect; rect.mTop = mGroups->getRect().getHeight(); diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index f39e086196..229718adb3 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -15,5 +15,5 @@ preedit_bg_color="White" mouse_opaque="true" name="line_editor" - font="SansSerifSmall"> + font="EmojiSmall"> </line_editor> |