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

fixed emoji replaces in the beginning of the input fields

This commit is contained in:
John Preston 2015-11-03 12:15:49 -05:00
parent 6feef57b84
commit 16afb72166
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/gui/flatinput.cpp
View File

@ -917,7 +917,7 @@ QVariant InputArea::InputAreaInner::loadResource(int type, const QUrl &name) {
}
void InputArea::processDocumentContentsChange(int position, int charsAdded) {
int32 emojiPosition = 0, emojiLen = 0;
int32 emojiPosition = -1, emojiLen = 0;
const EmojiData *emoji = 0;
static QString regular = qsl("Open Sans"), semibold = qsl("Open Sans Semibold");
@ -982,11 +982,11 @@ void InputArea::processDocumentContentsChange(int position, int charsAdded) {
++fp;
}
}
if (emojiPosition) break;
if (emojiPosition >= 0) break;
}
if (emojiPosition) break;
if (emojiPosition >= 0) break;
}
if (emojiPosition) {
if (emojiPosition >= 0) {
if (emoji) {
if (!_inner.document()->pageSize().isNull()) {
_inner.document()->setPageSize(QSizeF(0, 0));
@ -999,7 +999,7 @@ void InputArea::processDocumentContentsChange(int position, int charsAdded) {
position = emojiPosition + 1;
emoji = 0;
emojiPosition = 0;
emojiPosition = -1;
} else {
break;
}
@ -1611,7 +1611,7 @@ QVariant InputField::InputFieldInner::loadResource(int type, const QUrl &name) {
}
void InputField::processDocumentContentsChange(int position, int charsAdded) {
int32 emojiPosition = 0, emojiLen = 0;
int32 emojiPosition = -1, emojiLen = 0;
const EmojiData *emoji = 0;
static QString regular = qsl("Open Sans"), semibold = qsl("Open Sans Semibold"), space(' ');
@ -1689,9 +1689,9 @@ void InputField::processDocumentContentsChange(int position, int charsAdded) {
++fp;
}
}
if (emojiPosition) break;
if (emojiPosition >= 0) break;
}
if (emojiPosition) break;
if (emojiPosition >= 0) break;
if (b.next() != doc->end()) {
emojiPosition = b.next().position() - 1;
@ -1702,7 +1702,7 @@ void InputField::processDocumentContentsChange(int position, int charsAdded) {
break;
}
}
if (emojiPosition) {
if (emojiPosition >= 0) {
if (emoji) {
if (!_inner.document()->pageSize().isNull()) {
_inner.document()->setPageSize(QSizeF(0, 0));
@ -1715,7 +1715,7 @@ void InputField::processDocumentContentsChange(int position, int charsAdded) {
position = emojiPosition + 1;
emoji = 0;
emojiPosition = 0;
emojiPosition = -1;
} else {
break;
}

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

@ -619,7 +619,7 @@ void FlatTextarea::checkContentHeight() {
}
void FlatTextarea::processDocumentContentsChange(int position, int charsAdded) {
int32 emojiPosition = 0, emojiLen = 0;
int32 emojiPosition = -1, emojiLen = 0;
const EmojiData *emoji = 0;
static QString regular = qsl("Open Sans"), semibold = qsl("Open Sans Semibold");
@ -681,11 +681,11 @@ void FlatTextarea::processDocumentContentsChange(int position, int charsAdded) {
++fp;
}
}
if (emojiPosition) break;
if (emojiPosition >= 0) break;
}
if (emojiPosition) break;
if (emojiPosition >= 0) break;
}
if (emojiPosition) {
if (emojiPosition >= 0) {
if (emoji) {
if (!document()->pageSize().isNull()) {
document()->setPageSize(QSizeF(0, 0));
@ -698,7 +698,7 @@ void FlatTextarea::processDocumentContentsChange(int position, int charsAdded) {
position = emojiPosition + 1;
emoji = 0;
emojiPosition = 0;
emojiPosition = -1;
} else {
break;
}