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

Fix field autocomplete in empty chat.

This commit is contained in:
John Preston 2018-06-26 21:15:29 +01:00
parent 35c759c6bc
commit 44c6050bf2
3 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
View File

@ -57,7 +57,10 @@ void FieldAutocomplete::paintEvent(QPaintEvent *e) {
p.fillRect(rect(), st::mentionBg); p.fillRect(rect(), st::mentionBg);
} }
void FieldAutocomplete::showFiltered(PeerData *peer, QString query, bool addInlineBots) { void FieldAutocomplete::showFiltered(
not_null<PeerData*> peer,
QString query,
bool addInlineBots) {
_chat = peer->asChat(); _chat = peer->asChat();
_user = peer->asUser(); _user = peer->asUser();
_channel = peer->asChannel(); _channel = peer->asChannel();
@ -105,9 +108,9 @@ void FieldAutocomplete::showStickers(EmojiPtr emoji) {
return; return;
} }
_chat = 0; _chat = nullptr;
_user = 0; _user = nullptr;
_channel = 0; _channel = nullptr;
updateFiltered(resetScroll); updateFiltered(resetScroll);
} }

5
Telegram/SourceFiles/chat_helpers/field_autocomplete.h
View File

@ -32,7 +32,10 @@ public:
FieldAutocomplete(QWidget *parent); FieldAutocomplete(QWidget *parent);
bool clearFilteredBotCommands(); bool clearFilteredBotCommands();
void showFiltered(PeerData *peer, QString query, bool addInlineBots); void showFiltered(
not_null<PeerData*> peer,
QString query,
bool addInlineBots);
void showStickers(EmojiPtr emoji); void showStickers(EmojiPtr emoji);
void setBoundings(QRect boundings); void setBoundings(QRect boundings);

29
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -1034,6 +1034,9 @@ void HistoryWidget::onHashtagOrBotCommandInsert(
} }
void HistoryWidget::updateInlineBotQuery() { void HistoryWidget::updateInlineBotQuery() {
if (!_history) {
return;
}
const auto query = ParseInlineBotQuery(_field); const auto query = ParseInlineBotQuery(_field);
if (_inlineBotUsername != query.username) { if (_inlineBotUsername != query.username) {
_inlineBotUsername = query.username; _inlineBotUsername = query.username;
@ -1131,20 +1134,22 @@ void HistoryWidget::setReportSpamStatus(DBIPeerReportSpamStatus status) {
} }
void HistoryWidget::updateStickersByEmoji() { void HistoryWidget::updateStickersByEmoji() {
int len = 0; if (!_history) {
return;
}
const auto emoji = [&] {
if (!_editMsgId) { if (!_editMsgId) {
auto &text = _field->getTextWithTags().text; const auto &text = _field->getTextWithTags().text;
if (auto emoji = Ui::Emoji::Find(text, &len)) { auto length = 0;
if (text.size() > len) { if (const auto emoji = Ui::Emoji::Find(text, &length)) {
len = 0; if (text.size() <= length) {
} else { return emoji;
}
}
}
return EmojiPtr(nullptr);
}();
_fieldAutocomplete->showStickers(emoji); _fieldAutocomplete->showStickers(emoji);
}
}
}
if (!len) {
_fieldAutocomplete->showStickers(nullptr);
}
} }
void HistoryWidget::onTextChange() { void HistoryWidget::onTextChange() {