procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix editing of markup with links.

This commit is contained in:
John Preston 2018-05-27 13:48:04 +03:00
parent becbad32c9
commit dfbe11efdb
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/SourceFiles/ui/text/text.cpp
View File

@ -2991,18 +2991,13 @@ void Text::enumerateText(TextSelection selection, AppendPartCallback appendPartC
uint16 blockFrom = (i == e) ? _text.size() : (*i)->from(); uint16 blockFrom = (i == e) ? _text.size() : (*i)->from();
int32 blockFlags = (i == e) ? 0 : (*i)->flags(); int32 blockFlags = (i == e) ? 0 : (*i)->flags();
bool checkBlockFlags = (blockFrom >= selection.from) && (blockFrom <= selection.to);
if (checkBlockFlags && blockFlags != flags) {
flagsChangeCallback(flags, blockFlags);
flags = blockFlags;
}
if (blockLnkIndex && !_links.at(blockLnkIndex - 1)) { // ignore empty links if (blockLnkIndex && !_links.at(blockLnkIndex - 1)) { // ignore empty links
blockLnkIndex = 0; blockLnkIndex = 0;
} }
if (blockLnkIndex != lnkIndex) { if (blockLnkIndex != lnkIndex) {
if (lnkIndex) { if (lnkIndex) {
auto rangeFrom = qMax(selection.from, lnkFrom); auto rangeFrom = qMax(selection.from, lnkFrom);
auto rangeTo = qMin(blockFrom, selection.to); auto rangeTo = qMin(selection.to, blockFrom);
if (rangeTo > rangeFrom) { // handle click handler if (rangeTo > rangeFrom) { // handle click handler
QStringRef r = _text.midRef(rangeFrom, rangeTo - rangeFrom); QStringRef r = _text.midRef(rangeFrom, rangeTo - rangeFrom);
if (lnkFrom != rangeFrom || blockFrom != rangeTo) { if (lnkFrom != rangeFrom || blockFrom != rangeTo) {
@ -3018,7 +3013,16 @@ void Text::enumerateText(TextSelection selection, AppendPartCallback appendPartC
clickHandlerStartCallback(); clickHandlerStartCallback();
} }
} }
if (i == e || blockFrom >= selection.to) break;
const auto checkBlockFlags = (blockFrom >= selection.from)
&& (blockFrom <= selection.to);
if (checkBlockFlags && blockFlags != flags) {
flagsChangeCallback(flags, blockFlags);
flags = blockFlags;
}
if (i == e || blockFrom >= selection.to) {
break;
}
if ((*i)->type() == TextBlockTSkip) continue; if ((*i)->type() == TextBlockTSkip) continue;