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

#3952 insert @ name at the cursor position

master
Mnikolenko Productengine 2025-04-23 17:36:50 +03:00
parent 6239647aa3
commit da2234a563
4 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llui/llchatentry.cpp
View File

@ -250,21 +250,3 @@ void LLChatEntry::enableSingleLineMode(bool single_line_mode)
mPrevLinesCount = -1;
setWordWrap(!single_line_mode);
}
LLWString LLChatEntry::getConvertedText() const
{
LLWString text = getWText();
S32 diff = 0;
for (auto segment : mSegments)
{
if (segment && segment->getStyle() && segment->getStyle()->getDrawHighlightBg())
{
S32 seg_length = segment->getEnd() - segment->getStart();
std::string slurl = segment->getStyle()->getLinkHREF();
text.replace(segment->getStart() + diff, seg_length, utf8str_to_wstring(slurl));
diff += (S32)slurl.size() - seg_length;
}
}
return text;
}

2
indra/llui/llchatentry.h
View File

@ -68,8 +68,6 @@ public:
void enableSingleLineMode(bool single_line_mode);
boost::signals2::connection setTextExpandedCallback(const commit_signal_t::slot_type& cb);
LLWString getConvertedText() const;
private:
/**

34
indra/llui/lltexteditor.cpp
View File

@ -722,9 +722,21 @@ void LLTextEditor::handleMentionCommit(std::string name_url)
if (LLChatMentionHelper::instance().isCursorInNameMention(getWText(), mCursorPos, &mention_start_pos))
{
remove(mention_start_pos, mCursorPos - mention_start_pos, true);
setCursorPos(mention_start_pos);
insert(mention_start_pos, utf8str_to_wstring(name_url), false, LLTextSegmentPtr());
appendTextImpl(name_url, LLStyle::Params(), true);
std::string new_text(wstring_to_utf8str(getConvertedText()));
clear();
appendTextImpl(new_text, LLStyle::Params(), true);
segment_set_t::const_iterator it = getSegIterContaining(mention_start_pos);
if (it != mSegments.end())
{
setCursorPos((*it)->getEnd() + 1);
}
else
{
setCursorPos(mention_start_pos);
}
}
}
@ -3129,3 +3141,21 @@ S32 LLTextEditor::spacesPerTab()
{
return SPACES_PER_TAB;
}
LLWString LLTextEditor::getConvertedText() const
{
LLWString text = getWText();
S32 diff = 0;
for (auto segment : mSegments)
{
if (segment && segment->getStyle() && segment->getStyle()->getDrawHighlightBg())
{
S32 seg_length = segment->getEnd() - segment->getStart();
std::string slurl = segment->getStyle()->getLinkHREF();
text.replace(segment->getStart() + diff, seg_length, utf8str_to_wstring(slurl));
diff += (S32)slurl.size() - seg_length;
}
}
return text;
}

2
indra/llui/lltexteditor.h
View File

@ -215,6 +215,8 @@ public:
void setPassDelete(bool b) { mPassDelete = b; }
LLWString getConvertedText() const;
protected:
void showContextMenu(S32 x, S32 y);
void drawPreeditMarker();