diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
| commit | 65cb4b6d20b52ffebdc93e0e19f99520f6364dde (patch) | |
| tree | d2b6ff74ce2d40f5de91b95fe7b5e21701d6e181 /indra/llui/lltextbase.cpp | |
| parent | f14888b6166f91533e778e94701b74a9639ebefd (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merge 6.2.2
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); |