diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-07-13 21:18:22 +0200 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2023-07-13 22:13:31 +0200 |
| commit | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (patch) | |
| tree | 52bd2189940592af109c81734c0ab452193ee79c /indra/llrender | |
| parent | 8b718cbc2edc1f18bfa0cc0a76899fcade149813 (diff) | |
SL-20001 EmojiPicker - make the preview to be a panel instead of a button
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 12 | ||||
| -rw-r--r-- | indra/llrender/llfontgl.h | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 001b7fd7b8..c95890981f 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -193,7 +193,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons if (-1 == max_chars) { - length = (S32)wstr.length() - begin_offset; + max_chars = length = (S32)wstr.length() - begin_offset; } else { @@ -254,7 +254,6 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons const S32 LAST_CHARACTER = LLFontFreetype::LAST_CHAR_FULL; - BOOL draw_ellipses = FALSE; if (use_ellipses) { @@ -1024,7 +1023,7 @@ LLFontGL::VAlign LLFontGL::vAlignFromName(const std::string& name) return gl_vfont_align; } - //static +//static LLFontGL* LLFontGL::getFontEmoji() { static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Large", 0)); @@ -1032,6 +1031,13 @@ LLFontGL* LLFontGL::getFontEmoji() } //static +LLFontGL* LLFontGL::getFontEmojiHuge() +{ + static LLFontGL* fontp = getFont(LLFontDescriptor("Emoji", "Huge", 0)); + return fontp;; +} + +//static LLFontGL* LLFontGL::getFontMonospace() { static LLFontGL* fontp = getFont(LLFontDescriptor("Monospace","Monospace",0)); diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index 915c2439a3..356cfaf404 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -195,6 +195,7 @@ public: static void setFontDisplay(BOOL flag) { sDisplayFont = flag; } static LLFontGL* getFontEmoji(); + static LLFontGL* getFontEmojiHuge(); static LLFontGL* getFontMonospace(); static LLFontGL* getFontSansSerifSmall(); static LLFontGL* getFontSansSerif(); |