diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-12-01 16:01:52 +0200 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-12-01 16:01:52 +0200 |
| commit | 77061c1939565cbc977344744c2aac9788e5b250 (patch) | |
| tree | ada0ce8dc3a69e8d381447438b50527f59ef1d63 /indra/newview/llcolorswatch.cpp | |
| parent | 3c4cf5a309612d2a999453b282cad0aab7764083 (diff) | |
STORM-676 ADDITIONAL_FIX Force color swatch to be 100% opaque while it's in a focused floater.
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
| -rw-r--r-- | indra/newview/llcolorswatch.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index 2bb54d3fe6..4a1ba6f1b5 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -195,7 +195,9 @@ BOOL LLColorSwatchCtrl::handleMouseUp(S32 x, S32 y, MASK mask) // assumes GL state is set for 2D void LLColorSwatchCtrl::draw() { - F32 alpha = getCurrentTransparency(); + // If we're in a focused floater, don't apply the floater's alpha to the color swatch (STORM-676). + F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency(); + mBorder->setKeyboardFocusHighlight(hasFocus()); // Draw border LLRect border( 0, getRect().getHeight(), getRect().getWidth(), mLabelHeight ); |