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

Fixed textentry combobox arrow positioning issues.

Browse Source
This commit is contained in:
Shyotl
2013-07-10 02:15:47 -05:00
parent f9b174c1c2
commit 8f3c1af82d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llui/llcombobox.cpp
View File

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