Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add LLTextEditor::setLinkColor for when links need to be another color!

Browse Source 
This fixes blue on blue in notices for the classic skin,
while it does affect other skins, it's not very noticeable.
Actually this change kinda makes links match skins better overall...
This commit is contained in:
Lirusaito
2019-01-19 06:18:44 -05:00
parent e284efa648
commit 74af7dc80e
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/lltexteditor.cpp
View File

@@ -274,6 +274,7 @@ LLTextEditor::LLTextEditor(
mWriteableBgColor(LLUI::sColorsGroup->getColor("TextBgWriteableColor")),
mReadOnlyBgColor(LLUI::sColorsGroup->getColor("TextBgReadOnlyColor")),
mFocusBgColor(LLUI::sColorsGroup->getColor("TextBgFocusColor")),
mLinkColor(nullptr),
mReadOnly(parse_html),
mWordWrap(FALSE),
mShowLineNumbers(FALSE),
@@ -378,6 +379,11 @@ LLTextEditor::LLTextEditor(
LLTextEditor::~LLTextEditor()
{
gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit()
if (mLinkColor)
{
delete mLinkColor;
mLinkColor = nullptr;
}
// Scrollbar is deleted by LLView
@@ -4187,7 +4193,7 @@ void LLTextEditor::appendTextImpl(const std::string &new_text, const LLStyleSP s
LLUrlMatch match;
LLStyleSP link_style(new LLStyle);
if (style) *link_style = *style;
link_style->setColor(LLUI::sConfigGroup->getColor4("HTMLLinkColor"));
link_style->setColor(mLinkColor ? *mLinkColor : LLUI::sConfigGroup->getColor4("HTMLLinkColor"));
auto append_substr = [&](const size_t& pos, const size_t& count)
{
appendAndHighlightText(text.substr(pos, count), part, style);