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

Fix: cancel empty reply by Escape.

This commit is contained in:
John Preston 2018-03-11 23:58:14 +03:00
parent bda39cc6f6
commit c76e4b6b3c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6127,7 +6127,9 @@ void HistoryWidget::onCancel() {
} }
} else if (!_fieldAutocomplete->isHidden()) { } else if (!_fieldAutocomplete->isHidden()) {
_fieldAutocomplete->hideAnimated(); _fieldAutocomplete->hideAnimated();
} else { } else if (_replyToId && _field->getTextWithTags().text.isEmpty()) {
cancelReply();
} else {
controller()->showBackFromStack(); controller()->showBackFromStack();
emit cancelled(); emit cancelled();
} }
@ -6229,8 +6231,6 @@ void HistoryWidget::confirmDeleteSelected() {
void HistoryWidget::onListEscapePressed() { void HistoryWidget::onListEscapePressed() {
if (_nonEmptySelection && _list) { if (_nonEmptySelection && _list) {
clearSelected(); clearSelected();
} else if (_replyToId && _field->getTextWithTags().text.isEmpty()) {
cancelReply();
} else { } else {
onCancel(); onCancel();
} }