diff options
| author | angela <angela@lindenlab.com> | 2009-11-17 10:04:41 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-17 10:04:41 +0800 |
| commit | 28aa749db58b3a4095ca7e59811900767cd897b0 (patch) | |
| tree | 82337af6ace682a5f5f5a7646f5dfd0dc44fa56a /indra/llui/llstyle.cpp | |
| parent | 27a555e443c98ce1a41ef21e6111bdfe903894e8 (diff) | |
| parent | bce2cab144214b5a90a702e62f1e7c98e93fefc3 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui/llstyle.cpp')
| -rw-r--r-- | indra/llui/llstyle.cpp | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp index 71511f69a4..92c0b7c1b4 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -44,7 +44,10 @@ LLStyle::Params::Params() color("color", LLColor4::black), font("font", LLFontGL::getFontMonospace()), image("image"), - link_href("href") + link_href("href"), + italic("italic", false ), + bold("bold", false), + underline("bold", false) {} @@ -55,7 +58,10 @@ LLStyle::LLStyle(const LLStyle::Params& p) mFont(p.font()), mLink(p.link_href), mDropShadow(p.drop_shadow), - mImagep(p.image()) + mImagep(p.image()), + mItalic(p.italic()), + mBold(p.bold), + mUnderline(p.underline) {} void LLStyle::setFont(const LLFontGL* font) @@ -69,6 +75,25 @@ const LLFontGL* LLStyle::getFont() const return mFont; } +const S32 LLStyle::getFontStyle() const +{ + S32 ret = 0; + if (mBold) + { + ret |= LLFontGL::BOLD; + } + if (mItalic) + { + ret |= LLFontGL::ITALIC; + } + if (mUnderline) + { + ret |= LLFontGL::UNDERLINE; + } + return ret; +} + + void LLStyle::setLinkHREF(const std::string& href) { mLink = href; |