Merge pull request #138 from Hecklezz/revert/highlighted_text_font_color
[Revert] Set the font color of search highlighted text There was a side effect where the chat text was being inadvertently effected. Properly fixing this is non-trivial and likely the reason LL didn't implement it themselves.master
commit
db6516b478
|
|
@ -1530,19 +1530,7 @@ void LLTextBase::draw()
|
|||
bg_rect.intersectWith( text_rect );
|
||||
|
||||
gl_rect_2d( text_rect, bg_color, true );
|
||||
|
||||
// <FS> Additionally set the font color of highlighted text instead of using LabelTextColor
|
||||
const LLColor4& font_color = ll::ui::SearchableControl::getHighlightFontColor();
|
||||
setColor(font_color);
|
||||
// </FS>
|
||||
}
|
||||
// <FS> Set the font color back to LabelTextColor if not highlighted
|
||||
else
|
||||
{
|
||||
const LLColor4& font_color = LLUIColorTable::instance().getColor("LabelTextColor");
|
||||
setColor(font_color);
|
||||
}
|
||||
// </FS>
|
||||
|
||||
bool should_clip = mClip || mScroller != NULL;
|
||||
// <FS:Zi> Fix text bleeding at top edge of scrolling text editors
|
||||
|
|
|
|||
Loading…
Reference in New Issue