diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-18 22:57:56 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-18 22:57:56 -0800 |
| commit | 8adca4583ec95ac063f79990ac092998f24415b8 (patch) | |
| tree | 5019732addb552d4efafb31792a48e364ab8c351 /indra/llui/llfolderviewitem.h | |
| parent | 138d4f5fcd4567c5d77230b6eadc21c246ceed59 (diff) | |
CHUI-600 : WIP : Flash conversation item in different color than select and start flashing only when shown
Diffstat (limited to 'indra/llui/llfolderviewitem.h')
| -rwxr-xr-x | indra/llui/llfolderviewitem.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index d7f5e86aea..ca31931e19 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -128,6 +128,7 @@ protected: static LLUIColor sFgColor; static LLUIColor sFgDisabledColor; static LLUIColor sHighlightBgColor; + static LLUIColor sFlashBgColor; static LLUIColor sFocusOutlineColor; static LLUIColor sMouseOverColor; static LLUIColor sFilterBGColor; @@ -141,6 +142,8 @@ protected: virtual void addFolder(LLFolderViewFolder*) { } virtual bool isHighlightAllowed(); virtual bool isHighlightActive(); + virtual bool isFlashing() { return false; } + virtual void setFlashState(bool) { } static LLFontGL* getLabelFontForStyle(U8 style); @@ -269,7 +272,7 @@ public: // virtual void handleDropped(); virtual void draw(); void drawOpenFolderArrow(const Params& default_params, const LLUIColor& fg_color); - void drawHighlight(const BOOL showContent, const BOOL hasKeyboardFocus, const LLUIColor &bgColor, const LLUIColor &outlineColor, const LLUIColor &mouseOverColor); + void drawHighlight(const BOOL showContent, const BOOL hasKeyboardFocus, const LLUIColor &selectColor, const LLUIColor &flashColor, const LLUIColor &outlineColor, const LLUIColor &mouseOverColor); void drawLabel(const LLFontGL * font, const F32 x, const F32 y, const LLColor4& color, F32 &right_x); virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, |