diff options
| author | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
| commit | ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 (patch) | |
| tree | 0ede83511c304110138c01d16da2fff55162ef31 /indra/llui/llstyle.h | |
| parent | b1a280841e1823a19658923a8eefeb67d1d70735 (diff) | |
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/llui/llstyle.h')
| -rw-r--r-- | indra/llui/llstyle.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h index 5e8883afd7..c769964136 100644 --- a/indra/llui/llstyle.h +++ b/indra/llui/llstyle.h @@ -44,12 +44,12 @@ class LLStyle : public LLRefCount public: struct Params : public LLInitParam::Block<Params> { - Optional<bool> visible, - drop_shadow; - Optional<LLUIColor> color; - Optional<const LLFontGL*> font; - Optional<LLUIImage*> image; - Optional<std::string> link_href; + Optional<bool> visible; + Optional<LLFontGL::ShadowType> drop_shadow; + Optional<LLUIColor> color; + Optional<const LLFontGL*> font; + Optional<LLUIImage*> image; + Optional<std::string> link_href; Params(); }; LLStyle(const Params& p = Params()); @@ -60,6 +60,8 @@ public: BOOL isVisible() const; void setVisible(BOOL is_visible); + LLFontGL::ShadowType getShadowType() { return mDropShadow; } + void setFont(const LLFontGL* font); const LLFontGL* getFont() const; @@ -94,7 +96,7 @@ public: BOOL mItalic; BOOL mBold; BOOL mUnderline; - BOOL mDropShadow; + LLFontGL::ShadowType mDropShadow; protected: ~LLStyle() { } |