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

Let combo box label be default selection via xui

Browse Source
This commit is contained in:
Liru Færs
2019-10-21 16:48:14 -04:00
parent 432bf03f0a
commit d5af2588bc
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llui/llcombobox.cpp
View File

@@ -200,9 +200,14 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
// if we haven't already gotten a value from our control_name and
// if providing user text entry or descriptive label
// don't select an item under the hood
if (combo_box->getControlName().empty() && !combo_box->acceptsTextInput() && combo_box->mLabel.empty())
if (combo_box->getControlName().empty())
{
combo_box->selectFirstItem();
const auto text = combo_box->acceptsTextInput();
std::string label;
if (node->getAttributeString("label", label))
text ? combo_box->setLabel(label) : combo_box->mList->selectItemByLabel(label, FALSE);
else if (!text && combo_box->mLabel.empty())
combo_box->selectFirstItem();
}
return combo_box;