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

Fix copying photo while it is done uploading.

Browse Source 
Fixes #26669.
This commit is contained in:
John Preston 2023-08-17 11:40:04 +02:00
parent fc47aa0da9
commit 5dcca4482a
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/history/history_inner_widget.cpp
View File

@ -2399,11 +2399,16 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
}, &st::menuIconForward); }, &st::menuIconForward);
} }
if (item->canDelete()) { if (item->canDelete()) {
_menu->addAction(Ui::DeleteMessageContextAction( const auto callback = [=] { deleteItem(itemId); };
_menu->menu(), if (item->isUploading()) {
[=] { deleteItem(itemId); }, _menu->addAction(tr::lng_context_cancel_upload(tr::now), callback, &st::menuIconCancel);
item->ttlDestroyAt(), } else {
[=] { _menu = nullptr; })); _menu->addAction(Ui::DeleteMessageContextAction(
_menu->menu(),
callback,
item->ttlDestroyAt(),
[=] { _menu = nullptr; }));
}
} }
if (!blockSender && item->suggestReport()) { if (!blockSender && item->suggestReport()) {
_menu->addAction(tr::lng_context_report_msg(tr::now), [=] { _menu->addAction(tr::lng_context_report_msg(tr::now), [=] {
@ -2744,9 +2749,12 @@ void HistoryInner::copyContextImage(
FullMsgId itemId) { FullMsgId itemId) {
const auto item = session().data().message(itemId); const auto item = session().data().message(itemId);
const auto media = photo->activeMediaView(); const auto media = photo->activeMediaView();
const auto restricted = item
? showCopyMediaRestriction(item)
: IsServerMsgId(itemId.msg);
if (photo->isNull() || !media || !media->loaded()) { if (photo->isNull() || !media || !media->loaded()) {
return; return;
} else if (!showCopyMediaRestriction(item)) { } else if (!restricted) {
media->setToClipboard(); media->setToClipboard();
} }
} }