RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow markdown to intersect with previewed links.

This commit is contained in:
John Preston 2019-07-04 11:51:41 +02:00
parent 306b87dd39
commit dd38da7737
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/chat_helpers/message_field.cpp
View File

@ -605,6 +605,12 @@ void MessageLinksParser::parse() {
_list = QStringList();
return;
}
const auto tagCanIntersectWithLink = [](const QString &tag) {
return (tag == Ui::InputField::kTagBold)
|| (tag == Ui::InputField::kTagItalic)
|| (tag == Ui::InputField::kTagUnderline)
|| (tag == Ui::InputField::kTagStrikeOut);
};
auto ranges = QVector<LinkRange>();
@ -620,7 +626,9 @@ void MessageLinksParser::parse() {
++tag;
};
const auto processTagsBefore = [&](int offset) {
while (tag != tagsEnd && tag->offset + tag->length <= offset) {
while (tag != tagsEnd
&& (tag->offset + tag->length <= offset
|| tagCanIntersectWithLink(tag->id))) {
processTag();
}
};
@ -640,9 +648,9 @@ void MessageLinksParser::parse() {
while (markdownTag != markdownTagsEnd
&& (markdownTag->adjustedStart
+ markdownTag->adjustedLength <= from
|| !markdownTag->closed)) {
|| !markdownTag->closed
|| tagCanIntersectWithLink(markdownTag->tag))) {
++markdownTag;
continue;
}
if (markdownTag == markdownTagsEnd
|| markdownTag->adjustedStart >= from + length) {