MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix replace media button non-disappearance.

Browse Source
This commit is contained in:
John Preston 2023-04-11 19:18:54 +04:00
parent a02ded6fd8
commit 22ca4e25d9
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
View File

@ -1910,22 +1910,29 @@ void ComposeControls::applyCloudDraft() {
void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) { void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
Expects(_history != nullptr); Expects(_history != nullptr);
InvokeQueued(_autocomplete.get(), [=] { updateStickersByEmoji(); });
const auto guard = gsl::finally([&] {
updateSendButtonType();
updateControlsVisibility();
updateControlsGeometry(_wrap->size());
});
const auto editDraft = _history->draft(draftKey(DraftType::Edit)); const auto editDraft = _history->draft(draftKey(DraftType::Edit));
const auto draft = editDraft const auto draft = editDraft
? editDraft ? editDraft
: _history->draft(draftKey(DraftType::Normal)); : _history->draft(draftKey(DraftType::Normal));
const auto editingId = (draft == editDraft)
? FullMsgId{ _history->peer->id, draft ? draft->msgId : 0 }
: FullMsgId();
InvokeQueued(_autocomplete.get(), [=] { updateStickersByEmoji(); });
const auto guard = gsl::finally([&] {
updateSendButtonType();
updateReplaceMediaButton(editingId);
updateControlsVisibility();
updateControlsGeometry(_wrap->size());
});
if (!draft) { if (!draft) {
clearFieldText(0, fieldHistoryAction); clearFieldText(0, fieldHistoryAction);
_field->setFocus(); _field->setFocus();
_header->editMessage({}); _header->editMessage({});
_header->replyToMessage({}); _header->replyToMessage({});
_canReplaceMedia = false;
_photoEditMedia = nullptr;
return; return;
} }
@ -1939,15 +1946,11 @@ void ComposeControls::applyDraft(FieldHistoryAction fieldHistoryAction) {
} }
if (draft == editDraft) { if (draft == editDraft) {
_header->editMessage({ _history->peer->id, draft->msgId }); _header->editMessage(editingId);
_header->replyToMessage({}); _header->replyToMessage({});
} else { } else {
_canReplaceMedia = false; _canReplaceMedia = false;
_photoEditMedia = nullptr; _photoEditMedia = nullptr;
if (updateReplaceMediaButton(FullMsgId())) {
updateControlsVisibility();
updateControlsGeometry(_wrap->size());
}
_header->replyToMessage({ _history->peer->id, draft->msgId }); _header->replyToMessage({ _history->peer->id, draft->msgId });
if (_header->replyingToMessage()) { if (_header->replyingToMessage()) {
cancelForward(); cancelForward();