diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-08-21 21:51:56 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-08-21 21:51:56 +0100 |
commit | 63f82fc44b721b0ec437845d41b5a2055a44be68 (patch) | |
tree | 3d3caee52df32234073c0e2da18b9f7eed7722d3 /indra/llui/lltextbase.cpp | |
parent | 755b396045fd464dd2d7fc10239bf775cc54d074 (diff) | |
parent | e9ead7cc2ee9970b468ef6de0ba57726bb203ef4 (diff) |
merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r-- | indra/llui/lltextbase.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index c570285856..a23741b6dd 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1222,6 +1222,17 @@ void LLTextBase::draw() gl_rect_2d(text_rect, bg_color % alpha, TRUE); } + // Draw highlighted if needed + if( ll::ui::SearchableControl::getHighlighted() ) + { + LLColor4 bg_color = ll::ui::SearchableControl::getHighlightColor(); + LLRect bg_rect = mVisibleTextRect; + if( mScroller ) + bg_rect.intersectWith( text_rect ); + + gl_rect_2d( text_rect, bg_color, TRUE ); + } + bool should_clip = mClip || mScroller != NULL; { LLLocalClipRect clip(text_rect, should_clip); |