livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-1711 FIX LLWindowShade doesn't stack multiple notifications 

added configurable shade color to window_shade
master
Richard Linden 2011-12-12 15:50:10 -08:00
parent 2010e20122
commit 35feb03d27
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llwindowshade.cpp
View File

@ -43,6 +43,7 @@ LLWindowShade::Params::Params()
: bg_image("bg_image"),
modal("modal", false),
text_color("text_color"),
shade_color("shade_color"),
can_close("can_close", true)
{
changeDefault(mouse_opaque, false);
@ -90,7 +91,7 @@ void LLWindowShade::initFromParams(const LLWindowShade::Params& params)
panel_p.name = "background_area";
panel_p.mouse_opaque = false;
panel_p.background_visible = false;
panel_p.bg_alpha_color = LLColor4(0.f, 0.f, 0.f, 0.2f);
panel_p.bg_alpha_color = params.shade_color;
LLLayoutPanel* dummy_panel = LLUICtrlFactory::create<LLLayoutPanel>(panel_p);
stackp->addChild(dummy_panel);

3
indra/llui/llwindowshade.h
View File

@ -37,7 +37,8 @@ public:
struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
{
Optional<LLUIImage*> bg_image;
Optional<LLUIColor> text_color;
Optional<LLUIColor> text_color,
shade_color;
Optional<bool> modal,
can_close;

2
indra/newview/skins/default/xui/en/widgets/window_shade.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<window_shade shade_color="0 0 0 0.5"/>