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

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

This commit is contained in:
John Preston 2016-04-09 15:13:55 +04:00
parent 80b0667ff9 73a5a2a28f
commit 3003d24cbd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/gui/text.cpp
View File

@ -690,7 +690,7 @@ public:
} else { } else {
int32 i = 0, l = preparsed.size(); int32 i = 0, l = preparsed.size();
entities.reserve(l); entities.reserve(l);
const QChar *p = text.constData(), s = text.size(); const QChar s = text.size();
for (; i < l; ++i) { for (; i < l; ++i) {
EntityInTextType t = preparsed.at(i).type; EntityInTextType t = preparsed.at(i).type;
if ((t == EntityInTextMention && !parseMentions) || if ((t == EntityInTextMention && !parseMentions) ||
@ -2301,7 +2301,7 @@ public:
// neutrals go to R // neutrals go to R
eor = current - 1; eor = current - 1;
eAppendItems(analysis, sor, eor, control, dir); eAppendItems(analysis, sor, eor, control, dir);
dir = QChar::DirON; status.eor = QChar::DirEN; status.eor = QChar::DirEN;
dir = QChar::DirAN; dir = QChar::DirAN;
} }
else if(status.eor == QChar::DirL || else if(status.eor == QChar::DirL ||
@ -2311,11 +2311,11 @@ public:
// numbers on both sides, neutrals get right to left direction // numbers on both sides, neutrals get right to left direction
if(dir != QChar::DirL) { if(dir != QChar::DirL) {
eAppendItems(analysis, sor, eor, control, dir); eAppendItems(analysis, sor, eor, control, dir);
dir = QChar::DirON; status.eor = QChar::DirON; status.eor = QChar::DirON;
eor = current - 1; eor = current - 1;
dir = QChar::DirR; dir = QChar::DirR;
eAppendItems(analysis, sor, eor, control, dir); eAppendItems(analysis, sor, eor, control, dir);
dir = QChar::DirON; status.eor = QChar::DirON; status.eor = QChar::DirON;
dir = QChar::DirAN; dir = QChar::DirAN;
} else { } else {
eor = current; status.eor = dirCurrent; eor = current; status.eor = dirCurrent;