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

Don't clear undo history when applying draft 

Signed-off-by: Viktor Oreshkin <imselfish@stek29.rocks>
This commit is contained in:
Viktor Oreshkin 2017-06-20 23:01:10 +03:00 committed by John Preston
parent 60c84bbf51
commit 68ddabea5c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/historywidget.cpp
View File

@ -1715,10 +1715,10 @@ void HistoryWidget::fastShowAtEnd(History *h) {
} }
} }
void HistoryWidget::applyDraft(bool parseLinks) { void HistoryWidget::applyDraft(bool parseLinks, Ui::FlatTextarea::UndoHistoryAction undoHistoryAction) {
auto draft = _history ? _history->draft() : nullptr; auto draft = _history ? _history->draft() : nullptr;
if (!draft || !canWriteMessage()) { if (!draft || !canWriteMessage()) {
clearFieldText(); clearFieldText(0, undoHistoryAction);
_field->setFocus(); _field->setFocus();
_replyEditMsg = nullptr; _replyEditMsg = nullptr;
_editMsgId = _replyToId = 0; _editMsgId = _replyToId = 0;
@ -1726,7 +1726,7 @@ void HistoryWidget::applyDraft(bool parseLinks) {
} }
_textUpdateEvents = 0; _textUpdateEvents = 0;
setFieldText(draft->textWithTags); setFieldText(draft->textWithTags, 0, undoHistoryAction);
_field->setFocus(); _field->setFocus();
draft->cursor.applyTo(_field); draft->cursor.applyTo(_field);
_textUpdateEvents = TextUpdateEvent::SaveDraft | TextUpdateEvent::SendTyping; _textUpdateEvents = TextUpdateEvent::SaveDraft | TextUpdateEvent::SendTyping;
@ -1753,7 +1753,7 @@ void HistoryWidget::applyDraft(bool parseLinks) {
void HistoryWidget::applyCloudDraft(History *history) { void HistoryWidget::applyCloudDraft(History *history) {
if (_history == history && !_editMsgId) { if (_history == history && !_editMsgId) {
applyDraft(); applyDraft(true, Ui::FlatTextarea::AddToUndoHistory);
updateControlsVisibility(); updateControlsVisibility();
updateControlsGeometry(); updateControlsGeometry();

2
Telegram/SourceFiles/historywidget.h
View File

@ -301,7 +301,7 @@ public:
DragState getDragState(const QMimeData *d); DragState getDragState(const QMimeData *d);
void fastShowAtEnd(History *h); void fastShowAtEnd(History *h);
void applyDraft(bool parseLinks = true); void applyDraft(bool parseLinks = true, Ui::FlatTextarea::UndoHistoryAction undoHistoryAction = Ui::FlatTextarea::ClearUndoHistory);
void showHistory(const PeerId &peer, MsgId showAtMsgId, bool reload = false); void showHistory(const PeerId &peer, MsgId showAtMsgId, bool reload = false);
void clearDelayedShowAt(); void clearDelayedShowAt();
void clearAllLoadRequests(); void clearAllLoadRequests();