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

Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer

master
Ansariel 2024-03-05 21:27:49 +01:00
parent 5c93f37775 a6e1f22a99
commit 80c3fe0101
10 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llrender/llfontgl.cpp
View File

@ -1090,7 +1090,21 @@ LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name)
}
//static
LLFontGL* LLFontGL::getFontEmoji()
LLFontGL* LLFontGL::getFontEmojiSmall()
{
static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Small", 0));
return fontp;;
}
//static
LLFontGL* LLFontGL::getFontEmojiMedium()
{
static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Medium", 0));
return fontp;;
}
//static
LLFontGL* LLFontGL::getFontEmojiLarge()
{
static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Large", 0));
return fontp;;

6
indra/llrender/llfontgl.h
View File

@ -193,8 +193,10 @@ public:
static LLFontGL::VAlign vAlignFromName(const std::string& name);
static void setFontDisplay(BOOL flag) { sDisplayFont = flag; }
static LLFontGL* getFontEmoji();
static LLFontGL* getFontEmojiSmall();
static LLFontGL* getFontEmojiMedium();
static LLFontGL* getFontEmojiLarge();
static LLFontGL* getFontEmojiHuge();
static LLFontGL* getFontMonospace();
static LLFontGL* getFontSansSerifSmall();

2
indra/llui/lllineeditor.cpp
View File

@ -96,7 +96,7 @@ LLLineEditor::Params::Params()
commit_on_focus_lost("commit_on_focus_lost", true),
ignore_tab("ignore_tab", true),
is_password("is_password", false),
allow_emoji("allow_emoji"),
allow_emoji("allow_emoji", true),
cursor_color("cursor_color"),
use_bg_color("use_bg_color", false),
bg_color("bg_color"),

2
indra/llui/llscrolllistcell.h
View File

@ -81,7 +81,7 @@ public:
alt_value("alt_value", ""),
label("label"),
tool_tip("tool_tip", ""),
font("font", LLFontGL::getFontSansSerifSmall()),
font("font", LLFontGL::getFontEmojiSmall()),
font_color("font_color", LLColor4::black),
color("color", LLColor4::white),
font_halign("halign", LLFontGL::LEFT)

4
indra/llui/llscrolllistctrl.cpp
View File

@ -2018,7 +2018,7 @@ BOOL LLScrollListCtrl::handleToolTip(S32 x, S32 y, MASK mask)
// display tooltip exactly over original cell, in same font
LLToolTipMgr::instance().show(LLToolTip::Params()
.message(hit_cell->getToolTip())
.font(LLFontGL::getFontSansSerifSmall())
.font(LLFontGL::getFontEmojiSmall())
.pos(LLCoordGL(sticky_rect.mLeft - 5, sticky_rect.mTop + 6))
.delay_time(0.2f)
.sticky_rect(sticky_rect));
@ -3763,7 +3763,7 @@ LLScrollListItem* LLScrollListCtrl::addSimpleElement(const std::string& value, E
item_params.value(entry_id);
item_params.columns.add()
.value(value)
.font(LLFontGL::getFontSansSerifSmall());
.font(LLFontGL::getFontEmojiSmall());
return addRow(item_params, pos);
}

2
indra/llui/lltextbase.cpp
View File

@ -1064,7 +1064,7 @@ S32 LLTextBase::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextBase::s
if (!emoji_style)
{
emoji_style = new LLStyle(getStyleParams());
emoji_style->setFont(LLFontGL::getFontEmoji());
emoji_style->setFont(LLFontGL::getFontEmojiLarge());
}
S32 new_seg_start = pos + text_kitty;

2
indra/llui/lltexteditor.cpp
View File

@ -736,7 +736,7 @@ void LLTextEditor::insertEmoji(llwchar emoji)
{
LL_INFOS() << "LLTextEditor::insertEmoji(" << wchar_utf8_preview(emoji) << ")" << LL_ENDL;
auto styleParams = LLStyle::Params();
styleParams.font = LLFontGL::getFontEmoji();
styleParams.font = LLFontGL::getFontEmojiLarge();
auto segment = new LLEmojiTextSegment(new LLStyle(styleParams), mCursorPos, mCursorPos + 1, *this);
insert(mCursorPos, LLWString(1, emoji), false, segment);
setCursorPos(mCursorPos + 1);

2
indra/llui/lluictrl.cpp
View File

@ -80,7 +80,7 @@ LLUICtrl::Params::Params()
mouseenter_callback("mouseenter_callback"),
mouseleave_callback("mouseleave_callback"),
control_name("control_name"),
font("font", LLFontGL::getFontSansSerif()),
font("font", LLFontGL::getFontEmojiMedium()),
font_halign("halign"),
font_valign("valign"),
length("length"), // ignore LLXMLNode cruft

6
indra/newview/llfloateremojipicker.cpp
View File

@ -140,7 +140,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
@ -231,7 +231,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);
@ -425,7 +425,7 @@ void LLFloaterEmojiPicker::fillGroups()
mGroupButtons.clear();
LLButton::Params params;
params.font = LLFontGL::getFontEmoji();
params.font = LLFontGL::getFontEmojiLarge();
LLRect rect;
rect.mTop = mGroups->getRect().getHeight();

2
indra/newview/skins/default/xui/en/widgets/line_editor.xml
View File

@ -15,5 +15,5 @@
preedit_bg_color="White"
mouse_opaque="true"
name="line_editor"
font="SansSerifSmall">
font="EmojiSmall">
</line_editor>