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 2016-07-27 16:50:29 +03:00
parent 0228941fdb 088e282764
commit 4b9b9e2e13
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/historywidget.cpp
View File

@ -1481,10 +1481,6 @@ void HistoryInner::keyPressEvent(QKeyEvent *e) {
if (!_selected.isEmpty() && selectedForDelete == selectedForForward) {
_widget->onDeleteSelected();
}
} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
if (_selected.isEmpty()) {
_widget->onListEnterPressed();
}
} else {
e->ignore();
}
@ -7216,6 +7212,8 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
}
_scroll.keyPressEvent(e);
}
} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
onListEnterPressed();
} else {
e->ignore();
}