Skip to content
Snippets Groups Projects
Commit cf2afdc5 authored by Kitty Barnett's avatar Kitty Barnett
Browse files

Add emoji as its own font to promote character reuse

parent bab70f6f
No related branches found
No related tags found
No related merge requests found
...@@ -1005,6 +1005,13 @@ LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name) ...@@ -1005,6 +1005,13 @@ LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name)
return gl_vfont_align; return gl_vfont_align;
} }
//static
LLFontGL* LLFontGL::getFontEmoji()
{
static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Large", 0));
return fontp;;
}
//static //static
LLFontGL* LLFontGL::getFontMonospace() LLFontGL* LLFontGL::getFontMonospace()
{ {
......
...@@ -191,6 +191,7 @@ class LLFontGL ...@@ -191,6 +191,7 @@ class LLFontGL
static void setFontDisplay(BOOL flag) { sDisplayFont = flag; } static void setFontDisplay(BOOL flag) { sDisplayFont = flag; }
static LLFontGL* getFontEmoji();
static LLFontGL* getFontMonospace(); static LLFontGL* getFontMonospace();
static LLFontGL* getFontSansSerifSmall(); static LLFontGL* getFontSansSerifSmall();
static LLFontGL* getFontSansSerif(); static LLFontGL* getFontSansSerif();
......
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
<file>DejaVuSans-BoldOblique.ttf</file> <file>DejaVuSans-BoldOblique.ttf</file>
</font> </font>
<font name="Emoji"
comment="Name of emoji font">
<file>Twemoji.ttf</file>
</font>
<font name="Monospace" <font name="Monospace"
comment="Name of monospace font"> comment="Name of monospace font">
<file>DejaVuSansMono.ttf</file> <file>DejaVuSansMono.ttf</file>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment