diff options
| author | angela <angela@lindenlab.com> | 2009-11-17 16:33:49 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-17 16:33:49 +0800 |
| commit | 0098bf40ea73078e2164ae55a8fa2f9049d0d4e9 (patch) | |
| tree | 32cac232a7bacf814be61026598605d7a683c629 /indra/newview/llexpandabletextbox.cpp | |
| parent | 28aa749db58b3a4095ca7e59811900767cd897b0 (diff) | |
undo the changes for LLStyle params; add sizeFromFont in LLFontGL ; use font.style, font.name and font.size params for font creating
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 27df6be730..bd6936f05c 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -80,7 +80,7 @@ public: draw_rect.mRight, draw_rect.mTop, mStyle->getColor(), LLFontGL::RIGHT, LLFontGL::TOP, - mStyle->getFontStyle(), + 0, mStyle->getShadowType(), end - start, draw_rect.getWidth(), &right_x, @@ -164,7 +164,8 @@ void LLExpandableTextBox::LLTextBoxEx::showExpandText() S32 last_line = visible_lines.second - 1; LLStyle::Params expander_style = getDefaultStyle(); - expander_style.underline = true; + expander_style.font.name(LLFontGL::nameFromFont(expander_style.font)); + expander_style.font.style = "UNDERLINE"; expander_style.color = LLUIColorTable::instance().getColor("HTMLLinkColor"); LLExpanderSegment* expanderp = new LLExpanderSegment(new LLStyle(expander_style), getLineStart(last_line), getLength() + 1, mExpanderLabel, *this); insertSegment(expanderp); |