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

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

This commit is contained in:
John Preston 2015-07-13 14:14:19 +03:00
parent 8e2943fe11 5595570dfe
commit 5663841742
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/gui/flattextarea.cpp
View File

@ -654,7 +654,14 @@ void FlatTextarea::onDocumentContentsChange(int position, int charsRemoved, int
} }
if (charsAdded <= 0) return; if (charsAdded <= 0) return;
_insertions.push_back(Insertion(position, charsAdded)); // _insertions.push_back(Insertion(position, charsAdded));
_replacingEmojis = true;
QSizeF s = document()->pageSize();
processDocumentContentsChange(position, charsAdded);
if (document()->pageSize() != s) {
document()->setPageSize(s);
}
_replacingEmojis = false;
} }
void FlatTextarea::onDocumentContentsChanged() { void FlatTextarea::onDocumentContentsChanged() {