From 794027d91eec666e51ddd19dec8468ccc0e204b6 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Sat, 3 Jan 2015 22:14:53 -0500 Subject: [PATCH] In (readonly) combo_boxes and flyout_buttons allow use of the font attribute. --- indra/llui/llcombobox.cpp | 3 +++ indra/llui/llflyoutbutton.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 08ddc3c96..61eb8cae8 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -160,6 +160,9 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory * LLComboBox* combo_box = new LLComboBox("combo_box", rect, label); combo_box->setAllowTextEntry(allow_text_entry, max_chars); + if (LLFontGL* font = selectFont(node)) + combo_box->mButton->setFont(font); + const std::string& contents = node->getValue(); if (contents.find_first_not_of(" \n\t") != contents.npos) diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp index b45cdda3b..1290f6b62 100644 --- a/indra/llui/llflyoutbutton.cpp +++ b/indra/llui/llflyoutbutton.cpp @@ -107,6 +107,9 @@ LLView* LLFlyoutButton::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFacto flyout_button->mListPosition = ABOVE; } + if (LLFontGL* font = selectFont(node)) + flyout_button->mActionButton->setFont(font); + flyout_button->initFromXML(node, parent); for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())