Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In (readonly) combo_boxes and flyout_buttons allow use of the font attribute.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-01-03 22:14:53 -05:00
parent 312625036b
commit 794027d91e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llcombobox.cpp
View File

@@ -160,6 +160,9 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
LLComboBox* combo_box = new LLComboBox("combo_box", rect, label); LLComboBox* combo_box = new LLComboBox("combo_box", rect, label);
combo_box->setAllowTextEntry(allow_text_entry, max_chars); combo_box->setAllowTextEntry(allow_text_entry, max_chars);
if (LLFontGL* font = selectFont(node))
combo_box->mButton->setFont(font);
const std::string& contents = node->getValue(); const std::string& contents = node->getValue();
if (contents.find_first_not_of(" \n\t") != contents.npos) if (contents.find_first_not_of(" \n\t") != contents.npos)

3
indra/llui/llflyoutbutton.cpp
View File

@@ -107,6 +107,9 @@ LLView* LLFlyoutButton::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFacto
flyout_button->mListPosition = ABOVE; flyout_button->mListPosition = ABOVE;
} }
if (LLFontGL* font = selectFont(node))
flyout_button->mActionButton->setFont(font);
flyout_button->initFromXML(node, parent); flyout_button->initFromXML(node, parent);
for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling()) for (LLXMLNodePtr child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())