diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2008-07-15 00:41:08 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2008-07-15 00:41:08 +0000 |
| commit | ae464867e6714816cd5bdaeecdd1d3c0a0817e58 (patch) | |
| tree | 02830da2f640dab402a7e7222b4f0aa6eca930b2 /indra/llui | |
| parent | 40d2bb564d35809d7735d2ec06ba988db7327020 (diff) | |
svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 2655918169..666e807a8d 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1622,6 +1622,23 @@ void LLLineEditor::draw() } } + //draw label if no text is provided + //but we should draw it in a different color + //to give indication that it is not text you typed in + if (0 == mText.length() && mReadOnly) + { + mGLFont->render(mLabel.getWString(), 0, + mMinHPixels, (F32)text_bottom, + label_color, + LLFontGL::LEFT, + LLFontGL::BOTTOM, + LLFontGL::NORMAL, + S32_MAX, + mMaxHPixels - llround(rendered_pixels_right), + &rendered_pixels_right, FALSE); + } + + // Draw children (border) //mBorder->setVisible(TRUE); mBorder->setKeyboardFocusHighlight( TRUE ); @@ -1634,10 +1651,11 @@ void LLLineEditor::draw() // draw label if no text provided if (0 == mText.length()) { - mGLFont->render(mLabel.getWString(), 0, + mGLFont->render(mLabel.getWString(), 0, mMinHPixels, (F32)text_bottom, label_color, - LLFontGL::LEFT, LLFontGL::BOTTOM, + LLFontGL::LEFT, + LLFontGL::BOTTOM, LLFontGL::NORMAL, S32_MAX, mMaxHPixels - llround(rendered_pixels_right), |