diff options
Diffstat (limited to 'indra/llui/lltextutil.cpp')
-rw-r--r-- | indra/llui/lltextutil.cpp | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/indra/llui/lltextutil.cpp b/indra/llui/lltextutil.cpp index 78049319bc..8ffce1b8b4 100644 --- a/indra/llui/lltextutil.cpp +++ b/indra/llui/lltextutil.cpp @@ -1,25 +1,25 @@ -/** +/** * @file lltextutil.cpp * @brief Misc text-related auxiliary methods * * $LicenseInfo:firstyear=2009&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -30,30 +30,30 @@ #include "lltextbox.h" #include "llurlmatch.h" -boost::function<bool(LLUrlMatch*,LLTextBase*)> LLTextUtil::TextHelpers::iconCallbackCreationFunction = 0; +boost::function<bool(LLUrlMatch*,LLTextBase*)> LLTextUtil::TextHelpers::iconCallbackCreationFunction = 0; void LLTextUtil::textboxSetHighlightedVal(LLTextBox *txtbox, const LLStyle::Params& normal_style, const std::string& text, const std::string& hl) { - static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", LLColor4::green); + static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", LLColor4::green); - std::string text_uc = text; - LLStringUtil::toUpper(text_uc); + std::string text_uc = text; + LLStringUtil::toUpper(text_uc); - size_t hl_begin = 0, hl_len = hl.size(); + size_t hl_begin = 0, hl_len = hl.size(); - if (hl_len == 0 || (hl_begin = text_uc.find(hl)) == std::string::npos) - { - txtbox->setText(text, normal_style); - return; - } + if (hl_len == 0 || (hl_begin = text_uc.find(hl)) == std::string::npos) + { + txtbox->setText(text, normal_style); + return; + } - LLStyle::Params hl_style = normal_style; - hl_style.color = sFilterTextColor; + LLStyle::Params hl_style = normal_style; + hl_style.color = sFilterTextColor; - txtbox->setText(LLStringUtil::null); // clear text - txtbox->appendText(text.substr(0, hl_begin), false, normal_style); - txtbox->appendText(text.substr(hl_begin, hl_len), false, hl_style); - txtbox->appendText(text.substr(hl_begin + hl_len), false, normal_style); + txtbox->setText(LLStringUtil::null); // clear text + txtbox->appendText(text.substr(0, hl_begin), false, normal_style); + txtbox->appendText(text.substr(hl_begin, hl_len), false, hl_style); + txtbox->appendText(text.substr(hl_begin + hl_len), false, normal_style); } void LLTextUtil::textboxSetGreyedVal(LLTextBox *txtbox, const LLStyle::Params& normal_style, const std::string& text, const std::string& greyed) @@ -78,34 +78,34 @@ void LLTextUtil::textboxSetGreyedVal(LLTextBox *txtbox, const LLStyle::Params& n bool LLTextUtil::processUrlMatch(LLUrlMatch* match,LLTextBase* text_base, bool is_content_trusted) { - if (match == 0 || text_base == 0) - return false; - - if(match->getID() != LLUUID::null && TextHelpers::iconCallbackCreationFunction) - { - bool segment_created = TextHelpers::iconCallbackCreationFunction(match,text_base); - if(segment_created) - return true; - } - - // output an optional icon before the Url - if (is_content_trusted && !match->getIcon().empty() ) - { - LLUIImagePtr image = LLUI::getUIImage(match->getIcon()); - if (image) - { - LLStyle::Params icon; - icon.image = image; - // Text will be replaced during rendering with the icon, - // but string cannot be empty or the segment won't be - // added (or drawn). - text_base->appendImageSegment(icon); - - return true; - } - } - - return false; + if (match == 0 || text_base == 0) + return false; + + if(match->getID() != LLUUID::null && TextHelpers::iconCallbackCreationFunction) + { + bool segment_created = TextHelpers::iconCallbackCreationFunction(match,text_base); + if(segment_created) + return true; + } + + // output an optional icon before the Url + if (is_content_trusted && !match->getIcon().empty() ) + { + LLUIImagePtr image = LLUI::getUIImage(match->getIcon()); + if (image) + { + LLStyle::Params icon; + icon.image = image; + // Text will be replaced during rendering with the icon, + // but string cannot be empty or the segment won't be + // added (or drawn). + text_base->appendImageSegment(icon); + + return true; + } + } + + return false; } // EOF |