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/llrender | |
| parent | 25251c3ba81629f3234fc94c0368cd6300732b09 (diff) | |
triage#86 Use Emoji font in LineEditor by default
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 16 | ||||
| -rw-r--r-- | indra/llrender/llfontgl.h | 6 |
2 files changed, 19 insertions, 3 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 53661b6a63..5ae691f6fd 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -1030,7 +1030,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;; diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index f6ec416c8b..1ab38b3306 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -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(); |