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

Merge branch 'master' of https://github.com/LightDrake/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2013-07-16 09:50:58 -04:00
parent 824bec5d69 a9d23a049c
commit f9304faaec
50 changed files with 2413 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llui/llcombobox.cpp
View File

@@ -87,10 +87,6 @@ LLComboBox::LLComboBox(const std::string& name, const LLRect& rect, const std::s
mButton->setFont(LLFontGL::getFontSansSerifSmall());
mButton->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
mButton->setHAlign( LLFontGL::LEFT );
if(mAllowTextEntry)
{
mButton->setRightHPad(2);
}
addChild(mButton);
@@ -914,6 +910,11 @@ BOOL LLComboBox::handleUnicodeCharHere(llwchar uni_char)
void LLComboBox::setAllowTextEntry(BOOL allow, S32 max_chars, BOOL set_tentative)
{
mAllowTextEntry = allow;
if(allow)
mButton->setRightHPad(2);
else
mButton->setRightHPad(LLBUTTON_H_PAD);
mTextEntryTentative = set_tentative;
mMaxChars = max_chars;