From cd1e0d710d74b27ccb259ed89fa69873e1ae7ef3 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 3 Apr 2026 10:35:21 +0700 Subject: [PATCH] Remove legacy context menu in send files box. --- .../SourceFiles/boxes/edit_caption_box.cpp | 18 ----- Telegram/SourceFiles/boxes/send_files_box.cpp | 65 ++----------------- Telegram/SourceFiles/boxes/send_files_box.h | 7 +- .../attach_abstract_single_file_preview.cpp | 8 --- .../attach_abstract_single_file_preview.h | 2 - .../attach_abstract_single_media_preview.cpp | 62 +----------------- .../attach_abstract_single_media_preview.h | 15 +---- .../attach/attach_abstract_single_preview.h | 2 - .../ui/chat/attach/attach_album_preview.cpp | 51 +-------------- .../ui/chat/attach/attach_album_preview.h | 17 +---- .../attach_item_single_media_preview.cpp | 9 +-- .../attach/attach_item_single_media_preview.h | 1 - .../ui/chat/attach/attach_send_files_way.h | 6 -- .../attach/attach_single_media_preview.cpp | 9 +-- .../chat/attach/attach_single_media_preview.h | 4 +- 15 files changed, 16 insertions(+), 260 deletions(-) diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index c71374f467..78d47ba6c2 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -508,21 +508,11 @@ void EditCaptionBox::rebuildPreview() { st::defaultComposeControls, gifPaused, file, - [=](Ui::AttachActionType type) { - return (type != Ui::AttachActionType::EditCover) || _isVideo; - }, Ui::AttachControls::Type::EditOnly); _isPhoto = (media && media->isPhoto()); if (media && !_asFile) { media->setSendWay(currentSendWay()); media->setCanShowHighQualityBadge(file.canUseHighQualityPhoto()); - media->spoileredChanges( - ) | rpl::on_next([=](bool spoilered) { - _mediaEditManager.apply({ .type = spoilered - ? SendMenu::ActionType::SpoilerOn - : SendMenu::ActionType::SpoilerOff - }); - }, media->lifetime()); _content.reset(media); } else { _content.reset(Ui::CreateChild( @@ -552,14 +542,6 @@ void EditCaptionBox::rebuildPreview() { _content->modifyRequests( ) | rpl::start_to_stream(_photoEditorOpens, _content->lifetime()); - _content->editCoverRequests() | rpl::on_next([=] { - setupEditCoverHandler(); - }, _content->lifetime()); - - _content->clearCoverRequests() | rpl::on_next([=] { - setupClearCoverHandler(); - }, _content->lifetime()); - _content->heightValue( ) | rpl::start_to_stream(_contentHeight, _content->lifetime()); diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp index c603a29ee0..b098618f90 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp @@ -381,8 +381,7 @@ SendFilesBox::Block::Block( int till, const Ui::Text::MarkedContext &captionContext, Fn gifPaused, - SendFilesWay way, - Fn actionAllowed) + SendFilesWay way) : _items(items) , _from(from) , _till(till) { @@ -400,10 +399,7 @@ SendFilesBox::Block::Block( st, my, captionContext, - way, - [=](int index, Ui::AttachActionType type) { - return actionAllowed((*_items)[from + index], type); - }); + way); _preview.reset(preview); } else { const auto media = way.sendImagesAsPhotos() @@ -411,10 +407,7 @@ SendFilesBox::Block::Block( parent, st, gifPaused, - first, - [=](Ui::AttachActionType type) { - return actionAllowed((*_items)[from], type); - }) + first) : nullptr; if (media) { _isSingleMedia = true; @@ -494,38 +487,6 @@ rpl::producer SendFilesBox::Block::itemModifyRequest() const { } } -rpl::producer SendFilesBox::Block::itemEditCoverRequest() const { - using namespace rpl::mappers; - - const auto preview = _preview.get(); - const auto from = _from; - if (_isAlbum) { - const auto album = static_cast(preview); - return album->thumbEditCoverRequested() | rpl::map(_1 + from); - } else if (_isSingleMedia) { - const auto media = static_cast(preview); - return media->editCoverRequests() | rpl::map_to(from); - } else { - return rpl::never(); - } -} - -rpl::producer SendFilesBox::Block::itemClearCoverRequest() const { - using namespace rpl::mappers; - - const auto preview = _preview.get(); - const auto from = _from; - if (_isAlbum) { - const auto album = static_cast(preview); - return album->thumbClearCoverRequested() | rpl::map(_1 + from); - } else if (_isSingleMedia) { - const auto media = static_cast(preview); - return media->clearCoverRequests() | rpl::map_to(from); - } else { - return rpl::never(); - } -} - rpl::producer<> SendFilesBox::Block::orderUpdated() const { if (_isAlbum) { const auto album = static_cast(_preview.get()); @@ -1275,15 +1236,7 @@ void SendFilesBox::pushBlock(int from, int till) { till, captionContext, gifPaused, - _sendWay.current(), - [=](const Ui::PreparedFile &file, Ui::AttachActionType type) { - return (type == Ui::AttachActionType::ToggleSpoiler) - ? !hasPrice() - : (type == Ui::AttachActionType::EditCover) - ? (file.isVideoFile() - && (_toPeer->isBroadcast() || _toPeer->isSelf())) - : (file.videoCover != nullptr); - }); + _sendWay.current()); auto &block = _blocks.back(); const auto widget = _inner->add( block.takeWidget(), @@ -1607,16 +1560,6 @@ void SendFilesBox::pushBlock(int from, int till) { openInPhotoEditor(index); }, widget->lifetime()); - block.itemEditCoverRequest( - ) | rpl::on_next([=](int index) { - editCover(index); - }, widget->lifetime()); - - block.itemClearCoverRequest( - ) | rpl::on_next([=](int index) { - clearCover(index); - }, widget->lifetime()); - block.orderUpdated() | rpl::on_next([=]{ if (_priceTag) { _priceTagBg = QImage(); diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h index bdc266f8e9..3f37e872e8 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.h +++ b/Telegram/SourceFiles/boxes/send_files_box.h @@ -158,10 +158,7 @@ private: int till, const Ui::Text::MarkedContext &captionContext, Fn gifPaused, - Ui::SendFilesWay way, - Fn actionAllowed); + Ui::SendFilesWay way); Block(Block &&other) = default; Block &operator=(Block &&other) = default; @@ -172,8 +169,6 @@ private: [[nodiscard]] rpl::producer itemDeleteRequest() const; [[nodiscard]] rpl::producer itemReplaceRequest() const; [[nodiscard]] rpl::producer itemModifyRequest() const; - [[nodiscard]] rpl::producer itemEditCoverRequest() const; - [[nodiscard]] rpl::producer itemClearCoverRequest() const; [[nodiscard]] rpl::producer<> orderUpdated() const; void setSendWay(Ui::SendFilesWay way); diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp index 862b6a4f4f..5cdf08fc80 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.cpp @@ -74,14 +74,6 @@ rpl::producer<> AbstractSingleFilePreview::modifyRequests() const { return rpl::never<>(); } -rpl::producer<> AbstractSingleFilePreview::editCoverRequests() const { - return rpl::never<>(); -} - -rpl::producer<> AbstractSingleFilePreview::clearCoverRequests() const { - return rpl::never<>(); -} - void AbstractSingleFilePreview::setDisplayName(const QString &displayName) { _data.name = displayName; updateTextWidthFor(_data); diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h index aaae3e44a7..bfe05fde32 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h +++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_file_preview.h @@ -31,8 +31,6 @@ public: [[nodiscard]] rpl::producer<> deleteRequests() const override; [[nodiscard]] rpl::producer<> editRequests() const override; [[nodiscard]] rpl::producer<> modifyRequests() const override; - [[nodiscard]] rpl::producer<> editCoverRequests() const override; - [[nodiscard]] rpl::producer<> clearCoverRequests() const override; virtual void setDisplayName(const QString &displayName); virtual void setCaption(const TextWithTags &caption); diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp index f46c551d18..e1629203b2 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.cpp @@ -8,8 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/chat/attach/attach_abstract_single_media_preview.h" #include "editor/photo_editor_common.h" -#include "lang/lang_keys.h" -#include "menu/menu_checked_action.h" #include "ui/chat/attach/attach_controls.h" #include "ui/chat/attach/attach_prepare.h" #include "ui/effects/spoiler_mess.h" @@ -17,12 +15,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/painter.h" #include "ui/power_saving.h" #include "ui/ui_utility.h" -#include "ui/widgets/popup_menu.h" #include "styles/style_boxes.h" #include "styles/style_chat.h" #include "styles/style_chat_helpers.h" #include "styles/style_layers.h" -#include "styles/style_menu_icons.h" namespace Ui { namespace { @@ -34,11 +30,9 @@ constexpr auto kMinPreviewWidth = 20; AbstractSingleMediaPreview::AbstractSingleMediaPreview( QWidget *parent, const style::ComposeControls &st, - AttachControls::Type type, - Fn actionAllowed) + AttachControls::Type type) : AbstractSinglePreview(parent) , _st(st) -, _actionAllowed(std::move(actionAllowed)) , _minThumbH(st::sendBoxAlbumGroupSize.height() + st::sendBoxAlbumGroupSkipTop * 2) , _controls(base::make_unique_q(this, type)) { @@ -58,14 +52,6 @@ rpl::producer<> AbstractSingleMediaPreview::modifyRequests() const { return _photoEditorRequests.events(); } -rpl::producer<> AbstractSingleMediaPreview::editCoverRequests() const { - return _editCoverRequests.events(); -} - -rpl::producer<> AbstractSingleMediaPreview::clearCoverRequests() const { - return _clearCoverRequests.events(); -} - void AbstractSingleMediaPreview::setSendWay(SendFilesWay way) { _sendWay = way; update(); @@ -95,10 +81,6 @@ bool AbstractSingleMediaPreview::canHaveSpoiler() const { return supportsSpoilers(); } -rpl::producer AbstractSingleMediaPreview::spoileredChanges() const { - return _spoileredChanges.events(); -} - QImage AbstractSingleMediaPreview::generatePriceTagBackground() const { return (_previewBlurred.isNull() ? _preview : _previewBlurred).toImage(); } @@ -277,9 +259,7 @@ void AbstractSingleMediaPreview::mouseMoveEvent(QMouseEvent *e) { void AbstractSingleMediaPreview::mouseReleaseEvent(QMouseEvent *e) { if (base::take(_pressed) && isOverPreview(e->pos())) { - if (e->button() == Qt::RightButton) { - showContextMenu(e->globalPos()); - } else if (isPhoto()) { + if (isPhoto()) { _photoEditorRequests.fire({}); } } @@ -292,44 +272,6 @@ void AbstractSingleMediaPreview::applyCursor(style::cursor cursor) { } } -void AbstractSingleMediaPreview::showContextMenu(QPoint position) { - _menu = base::make_unique_q( - this, - _st.tabbed.menu); - - const auto &icons = _st.tabbed.icons; - if (_actionAllowed(AttachActionType::ToggleSpoiler) - && _sendWay.sendImagesAsPhotos() - && supportsSpoilers()) { - const auto spoilered = hasSpoiler(); - ::Menu::AddCheckedAction( - _menu.get(), - tr::lng_context_spoiler_effect(tr::now), - [=] { - setSpoiler(!spoilered); - _spoileredChanges.fire_copy(!spoilered); - }, - &icons.menuSpoiler, - spoilered); - } - if (_actionAllowed(AttachActionType::EditCover)) { - _menu->addAction(tr::lng_context_edit_cover(tr::now), [=] { - _editCoverRequests.fire({}); - }, &st::menuIconEdit); - - if (_actionAllowed(AttachActionType::ClearCover)) { - _menu->addAction(tr::lng_context_clear_cover(tr::now), [=] { - _clearCoverRequests.fire({}); - }, &st::menuIconCancel); - } - } - if (_menu->empty()) { - _menu = nullptr; - } else { - _menu->popup(position); - } -} - int AbstractSingleMediaPreview::previewLeft() const { return _previewLeft; } diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h index 710397d093..e4b223fdc7 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h +++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_media_preview.h @@ -19,15 +19,12 @@ struct ComposeControls; namespace Ui { -class PopupMenu; - class AbstractSingleMediaPreview : public AbstractSinglePreview { public: AbstractSingleMediaPreview( QWidget *parent, const style::ComposeControls &st, - AttachControls::Type type, - Fn actionAllowed); + AttachControls::Type type); ~AbstractSingleMediaPreview(); void setSendWay(SendFilesWay way); @@ -36,8 +33,6 @@ public: [[nodiscard]] rpl::producer<> deleteRequests() const override; [[nodiscard]] rpl::producer<> editRequests() const override; [[nodiscard]] rpl::producer<> modifyRequests() const override; - [[nodiscard]] rpl::producer<> editCoverRequests() const override; - [[nodiscard]] rpl::producer<> clearCoverRequests() const override; [[nodiscard]] bool isPhoto() const; @@ -45,7 +40,6 @@ public: void setCanShowHighQualityBadge(bool value); [[nodiscard]] bool hasSpoiler() const; [[nodiscard]] bool canHaveSpoiler() const; - [[nodiscard]] rpl::producer spoileredChanges() const; [[nodiscard]] QImage generatePriceTagBackground() const; @@ -73,11 +67,9 @@ private: [[nodiscard]] bool isOverPreview(QPoint position) const; void applyCursor(style::cursor cursor); - void showContextMenu(QPoint position); const style::ComposeControls &_st; SendFilesWay _sendWay; - Fn _actionAllowed; bool _animated = false; QPixmap _preview; QPixmap _previewBlurred; @@ -87,20 +79,15 @@ private: int _previewHeight = 0; std::unique_ptr _spoiler; - rpl::event_stream _spoileredChanges; bool _canShowHighQualityBadge = false; const int _minThumbH; const base::unique_qptr _controls; rpl::event_stream<> _photoEditorRequests; - rpl::event_stream<> _editCoverRequests; - rpl::event_stream<> _clearCoverRequests; style::cursor _cursor = style::cur_default; bool _pressed = false; - base::unique_qptr _menu; - rpl::event_stream<> _modifyRequests; }; diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_preview.h index cd8a57c6f2..75442ccecf 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_preview.h +++ b/Telegram/SourceFiles/ui/chat/attach/attach_abstract_single_preview.h @@ -18,8 +18,6 @@ public: [[nodiscard]] virtual rpl::producer<> deleteRequests() const = 0; [[nodiscard]] virtual rpl::producer<> editRequests() const = 0; [[nodiscard]] virtual rpl::producer<> modifyRequests() const = 0; - [[nodiscard]] virtual rpl::producer<> editCoverRequests() const = 0; - [[nodiscard]] virtual rpl::producer<> clearCoverRequests() const = 0; }; diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp index 58ef4b6476..1642dc0848 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.cpp @@ -7,17 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "ui/chat/attach/attach_album_preview.h" -#include "menu/menu_checked_action.h" #include "ui/chat/attach/attach_album_thumbnail.h" #include "ui/chat/attach/attach_prepare.h" #include "ui/effects/spoiler_mess.h" -#include "ui/widgets/popup_menu.h" #include "ui/painter.h" -#include "lang/lang_keys.h" #include "styles/style_chat.h" #include "styles/style_boxes.h" #include "styles/style_layers.h" -#include "styles/style_menu_icons.h" #include @@ -39,13 +35,11 @@ AlbumPreview::AlbumPreview( const style::ComposeControls &st, gsl::span items, const Text::MarkedContext &captionContext, - SendFilesWay way, - Fn actionAllowed) + SendFilesWay way) : RpWidget(parent) , _st(st) , _captionContext(captionContext) , _sendWay(way) -, _actionAllowed(std::move(actionAllowed)) , _dragTimer([=] { switchToDrag(); }) { setMouseTracking(true); prepareThumbs(items); @@ -624,54 +618,13 @@ void AlbumPreview::mouseReleaseEvent(QMouseEvent *e) { } else if (const auto thumb = base::take(_pressedThumb)) { const auto was = _pressedButtonType; const auto now = thumb->buttonTypeFromPoint(e->pos()); - if (e->button() == Qt::RightButton) { - showContextMenu(thumb, e->globalPos()); - } else if (was == now) { + if (e->button() != Qt::RightButton && was == now) { thumbButtonsCallback(thumb, now); } } _pressedButtonType = AttachButtonType::None; } -void AlbumPreview::showContextMenu( - not_null thumb, - QPoint position) { - _menu = base::make_unique_q( - this, - st::popupMenuWithIcons); - - const auto index = orderIndex(thumb); - if (_actionAllowed(index, AttachActionType::ToggleSpoiler) - && _sendWay.sendImagesAsPhotos()) { - const auto spoilered = thumb->hasSpoiler(); - ::Menu::AddCheckedAction( - _menu.get(), - tr::lng_context_spoiler_effect(tr::now), - [=] { - thumb->setSpoiler(!spoilered); - }, - &st::menuIconSpoiler, - spoilered); - } - if (_actionAllowed(index, AttachActionType::EditCover)) { - _menu->addAction(tr::lng_context_edit_cover(tr::now), [=] { - _thumbEditCoverRequested.fire_copy(index); - }, &st::menuIconEdit); - - if (_actionAllowed(index, AttachActionType::ClearCover)) { - _menu->addAction(tr::lng_context_clear_cover(tr::now), [=] { - _thumbClearCoverRequested.fire_copy(index); - }, &st::menuIconCancel); - } - } - - if (_menu->empty()) { - _menu = nullptr; - } else { - _menu->popup(position); - } -} - void AlbumPreview::switchToDrag() { _paintedAbove = _suggestedThumb diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h index a7b26ad73c..e8950c0126 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h +++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_preview.h @@ -21,7 +21,6 @@ namespace Ui { struct PreparedFile; struct GroupMediaLayout; class AlbumThumbnail; -class PopupMenu; class AlbumPreview final : public RpWidget { public: @@ -30,8 +29,7 @@ public: const style::ComposeControls &st, gsl::span items, const Text::MarkedContext &captionContext, - SendFilesWay way, - Fn actionAllowed); + SendFilesWay way); ~AlbumPreview(); void setSendWay(SendFilesWay way); @@ -52,12 +50,6 @@ public: [[nodiscard]] rpl::producer thumbModified() const { return _thumbModified.events(); } - [[nodiscard]] rpl::producer thumbEditCoverRequested() const { - return _thumbEditCoverRequested.events(); - } - [[nodiscard]] rpl::producer thumbClearCoverRequested() const { - return _thumbClearCoverRequested.events(); - } [[nodiscard]] rpl::producer<> orderUpdated() const { return _orderUpdated.events(); } @@ -104,12 +96,9 @@ private: void cancelDrag(); void finishDrag(); - void showContextMenu(not_null thumb, QPoint position); - const style::ComposeControls &_st; const Text::MarkedContext _captionContext; SendFilesWay _sendWay; - Fn _actionAllowed; style::cursor _cursor = style::cur_default; std::vector _order; std::vector _itemsShownDimensions; @@ -132,12 +121,8 @@ private: rpl::event_stream _thumbDeleted; rpl::event_stream _thumbChanged; rpl::event_stream _thumbModified; - rpl::event_stream _thumbEditCoverRequested; - rpl::event_stream _thumbClearCoverRequested; rpl::event_stream<> _orderUpdated; - base::unique_qptr _menu; - mutable Animations::Simple _thumbsHeightAnimation; mutable Animations::Simple _shrinkAnimation; mutable Animations::Simple _finishDragAnimation; diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp index 431265d469..5ba4f68359 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.cpp @@ -36,15 +36,8 @@ ItemSingleMediaPreview::ItemSingleMediaPreview( Fn gifPaused, not_null item, AttachControls::Type type) -: AbstractSingleMediaPreview(parent, st, type, [=](AttachActionType type) { - if (type == AttachActionType::EditCover) { - return _isVideoFile; - } - return true; -}) +: AbstractSingleMediaPreview(parent, st, type) , _gifPaused(std::move(gifPaused)) -, _isVideoFile(item->media()->document() - && item->media()->document()->isVideoFile()) , _fullId(item->fullId()) { const auto media = item->media(); Assert(media != nullptr); diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.h index 080e771859..69c6604a45 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.h +++ b/Telegram/SourceFiles/ui/chat/attach/attach_item_single_media_preview.h @@ -56,7 +56,6 @@ private: void startStreamedPlayer(); const Fn _gifPaused; - const bool _isVideoFile; const FullMsgId _fullId; std::shared_ptr<::Data::PhotoMedia> _photoMedia; diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h index 4049968c59..ba758ae69b 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h +++ b/Telegram/SourceFiles/ui/chat/attach/attach_send_files_way.h @@ -11,12 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Ui { -enum class AttachActionType { - ToggleSpoiler, - EditCover, - ClearCover, -}; - enum class AttachButtonType { Edit, Delete, diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp index 239cde7c0e..4f92ebd02d 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp @@ -19,7 +19,6 @@ SingleMediaPreview *SingleMediaPreview::Create( const style::ComposeControls &st, Fn gifPaused, const PreparedFile &file, - Fn actionAllowed, AttachControls::Type type) { auto preview = QImage(); auto animated = false; @@ -54,8 +53,7 @@ SingleMediaPreview *SingleMediaPreview::Create( Core::IsMimeSticker(file.information->filemime), file.spoiler, animationPreview ? file.path : QString(), - type, - std::move(actionAllowed)); + type); result->setCanShowHighQualityBadge(file.canUseHighQualityPhoto()); return result; } @@ -69,9 +67,8 @@ SingleMediaPreview::SingleMediaPreview( bool sticker, bool spoiler, const QString &animatedPreviewPath, - AttachControls::Type type, - Fn actionAllowed) -: AbstractSingleMediaPreview(parent, st, type, std::move(actionAllowed)) + AttachControls::Type type) +: AbstractSingleMediaPreview(parent, st, type) , _gifPaused(std::move(gifPaused)) , _sticker(sticker) { Expects(!preview.isNull()); diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h index 59305f0e2b..ac5d4f84f4 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h +++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.h @@ -25,7 +25,6 @@ public: const style::ComposeControls &st, Fn gifPaused, const PreparedFile &file, - Fn actionAllowed, AttachControls::Type type = AttachControls::Type::Full); SingleMediaPreview( @@ -37,8 +36,7 @@ public: bool sticker, bool spoiler, const QString &animatedPreviewPath, - AttachControls::Type type, - Fn actionAllowed); + AttachControls::Type type); protected: bool supportsSpoilers() const override;