diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-05 10:12:34 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-07 21:19:47 +0300 |
| commit | 7c179b8e7d0b7a0f4a9412ad4525a050a1f95bbe (patch) | |
| tree | 8661ee76b660a823f9f0d19f05115c5d4af18a94 /indra | |
| parent | 681298dd726b2d00910fe71646147fadd1aba980 (diff) | |
SL-15346 Small adjustment
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 10 | ||||
| -rw-r--r-- | indra/llui/lllineeditor.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index a88a191847..33037b5001 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -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)); } diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index 088578a821..f8abd5eacf 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -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); |