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

Add reply shortcut

This commit is contained in:
Matthew Tran 2017-12-19 16:58:17 -06:00 committed by John Preston
parent 26e023058c
commit 74b126f309
2 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Telegram/SourceFiles/history/history_item.h
View File

@ -577,6 +577,31 @@ public:
setAttachToNext(attachToNext);
}
HistoryItem *previousItem() const {
if (_block && _indexInBlock >= 0) {
if (_indexInBlock > 0) {
return _block->items.at(_indexInBlock - 1);
}
if (auto previous = _block->previousBlock()) {
Assert(!previous->items.empty());
return previous->items.back();
}
}
return nullptr;
}
HistoryItem *nextItem() const {
if (_block && _indexInBlock >= 0) {
if (_indexInBlock + 1 < _block->items.size()) {
return _block->items.at(_indexInBlock + 1);
}
if (auto next = _block->nextBlock()) {
Assert(!next->items.empty());
return next->items.front();
}
}
return nullptr;
}
~HistoryItem();
protected:
@ -608,31 +633,6 @@ protected:
int _indexInBlock = -1;
MTPDmessage::Flags _flags = 0;
HistoryItem *previousItem() const {
if (_block && _indexInBlock >= 0) {
if (_indexInBlock > 0) {
return _block->items.at(_indexInBlock - 1);
}
if (auto previous = _block->previousBlock()) {
Assert(!previous->items.empty());
return previous->items.back();
}
}
return nullptr;
}
HistoryItem *nextItem() const {
if (_block && _indexInBlock >= 0) {
if (_indexInBlock + 1 < _block->items.size()) {
return _block->items.at(_indexInBlock + 1);
}
if (auto next = _block->nextBlock()) {
Assert(!next->items.empty());
return next->items.front();
}
}
return nullptr;
}
// This should be called only from previousItemChanged()
// to add required bits to the Composer mask
// after that always use Has<HistoryMessageDate>().

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

@ -5046,6 +5046,19 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
} else if (e->key() == Qt::Key_Down) {
if (!(e->modifiers() & (Qt::ShiftModifier | Qt::MetaModifier | Qt::ControlModifier))) {
_scroll->keyPressEvent(e);
} else if ((e->modifiers() & (Qt::ShiftModifier | Qt::MetaModifier | Qt::ControlModifier)) == Qt::ControlModifier) {
if (_history && _history->lastMsg && !_editMsgId) {
if (_replyToId) {
HistoryItem *item = App::histItemById(_history->channelId(), _replyToId)->nextItem();
if (item) App::contextItem(item);
else { cancelReply(); return; }
} else {
return;
}
Ui::showPeerHistory(_peer, App::contextItem()->id);
onReplyToMessage();
return;
}
}
} else if (e->key() == Qt::Key_Up) {
if (!(e->modifiers() & (Qt::ShiftModifier | Qt::MetaModifier | Qt::ControlModifier))) {
@ -5057,6 +5070,20 @@ void HistoryWidget::keyPressEvent(QKeyEvent *e) {
}
}
_scroll->keyPressEvent(e);
} else if ((e->modifiers() & (Qt::ShiftModifier | Qt::MetaModifier | Qt::ControlModifier)) == Qt::ControlModifier) {
if (_history && _history->lastMsg && !_editMsgId) {
if (_replyToId) {
HistoryItem *item = App::histItemById(_history->channelId(), _replyToId);
App::contextItem(item->previousItem());
} else {
App::contextItem(_history->lastMsg);
}
if (App::contextItem()) {
Ui::showPeerHistory(_peer, App::contextItem()->id);
onReplyToMessage();
}
return;
}
}
} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
onListEnterPressed();