diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2024-03-05 14:14:01 +0100 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2024-03-05 15:39:57 +0100 |
| commit | a6e1f22a993fde79d0ecb76d60535fdc454a2acd (patch) | |
| tree | 586de4d5f82bdd45480e35ebfd59b25aeb977d69 | |
| parent | 27dd9ee482f7f69651d44f8c7114a22ff761c013 (diff) | |
jira#71179 Use Emoji font in ScrollList by default
| -rw-r--r-- | indra/llui/llscrolllistcell.h | 2 | ||||
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h index 2588da2331..117489fead 100644 --- a/indra/llui/llscrolllistcell.h +++ b/indra/llui/llscrolllistcell.h @@ -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) diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index f982dc99e8..2a6e33fff6 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1810,7 +1810,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)); @@ -3294,7 +3294,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); } |