livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-15346 Small adjustment

master
Andrey Kleshchev 2021-06-05 10:12:34 +03:00
parent 681298dd72
commit 7c179b8e7d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llui/lllineeditor.cpp
View File

@ -180,7 +180,7 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
{
// Initial value often is descriptive, like "Type some ID here"
// and can be longer than size limitation, ignore size
setText(p.initial_value.getValue().asString(), true);
setText(p.initial_value.getValue().asString(), false);
}
// Initialize current history line iterator
@ -398,10 +398,10 @@ void LLLineEditor::updateTextPadding()
void LLLineEditor::setText(const LLStringExplicit &new_text)
{
setText(new_text, false);
setText(new_text, true);
}
void LLLineEditor::setText(const LLStringExplicit &new_text, bool ignore_size_limit)
void LLLineEditor::setText(const LLStringExplicit &new_text, bool use_size_limit)
{
// If new text is identical, don't copy and don't move insertion point
if (mText.getString() == new_text)
@ -420,13 +420,13 @@ void LLLineEditor::setText(const LLStringExplicit &new_text, bool ignore_size_li
all_selected = all_selected || (len == 0 && hasFocus() && mSelectAllonFocusReceived);
std::string truncated_utf8 = new_text;
if (!ignore_size_limit && truncated_utf8.size() > (U32)mMaxLengthBytes)
if (use_size_limit && truncated_utf8.size() > (U32)mMaxLengthBytes)
{
truncated_utf8 = utf8str_truncate(new_text, mMaxLengthBytes);
}
mText.assign(truncated_utf8);
if (!ignore_size_limit && mMaxLengthChars)
if (use_size_limit && mMaxLengthChars)
{
mText.assign(utf8str_symbol_truncate(truncated_utf8, mMaxLengthChars));
}

2
indra/llui/lllineeditor.h
View File

@ -317,7 +317,7 @@ private:
virtual S32 getPreeditFontSize() const;
virtual LLWString getPreeditString() const { return getWText(); }
void setText(const LLStringExplicit &new_text, bool ignore_size_limit);
void setText(const LLStringExplicit &new_text, bool use_size_limit);
void setContextMenu(LLContextMenu* new_context_menu);