diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp index e45f961c9..2b49f8c1c 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp @@ -1892,8 +1892,7 @@ void InnerWidget::performDrag() { // auto pressedMedia = static_cast(nullptr); // if (auto pressedItem = Element::Pressed()) { // pressedMedia = pressedItem->media(); - // if (_mouseCursorState == CursorState::Date - // || (pressedMedia && pressedMedia->dragItem())) { + // if (_mouseCursorState == CursorState::Date) { // forwardMimeType = u"application/x-td-forward"_q; // session().data().setMimeForwardIds( // session().data().itemOrItsGroup(pressedItem->data())); diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index eedd0b81c..2f1dabec2 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -1690,8 +1690,7 @@ void HistoryInner::mouseActionStart(const QPoint &screenPos, Qt::MouseButton but _mouseAction = MouseAction::PrepareDrag; // start text drag } else if (!_pressWasInactive) { const auto media = Element::Pressed()->media(); - if ((media && media->dragItem()) - || _mouseCursorState == CursorState::Date) { + if (_mouseCursorState == CursorState::Date) { _mouseAction = MouseAction::PrepareDrag; // start sticker drag or by-date drag } else { if (dragState.afterSymbol) ++_mouseTextSymbol; @@ -1804,8 +1803,7 @@ std::unique_ptr HistoryInner::prepareDrag() { } else if (view->isHiddenByGroup() && pressedHandler) { forwardIds = MessageIdsList(1, _dragStateItem->fullId()); } else if (const auto media = view->media()) { - if (media->dragItemByHandler(pressedHandler) - || media->dragItem()) { + if (media->dragItemByHandler(pressedHandler)) { forwardIds = MessageIdsList(1, _dragStateItem->fullId()); } } diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp index 1e2648125..3de0cb20e 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp @@ -1302,16 +1302,8 @@ auto ListWidget::itemUnderPressSelection() const : _selected.end(); } -bool ListWidget::requiredToStartDragging( - not_null view) const { - if (_mouseCursorState == CursorState::Date) { - return true; - } else if (const auto media = view->media()) { - if (media->dragItem()) { - return true; - } - } - return false; +bool ListWidget::requiredToStartDragging(not_null view) const { + return (_mouseCursorState == CursorState::Date); } bool ListWidget::isPressInSelectedText(TextState state) const { @@ -3625,8 +3617,7 @@ std::unique_ptr ListWidget::prepareDrag() { } } else if (const auto media = pressedView->media()) { if (pressedView->data()->allowsForward() - && (media->dragItemByHandler(pressedHandler) - || media->dragItem())) { + && media->dragItemByHandler(pressedHandler)) { forwardIds = MessageIdsList(1, exactItem->fullId()); } } diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.h b/Telegram/SourceFiles/history/view/media/history_view_media.h index 108dffc83..768107f65 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_media.h +++ b/Telegram/SourceFiles/history/view/media/history_view_media.h @@ -126,11 +126,6 @@ public: [[nodiscard]] virtual bool toggleSelectionByHandlerClick( const ClickHandlerPtr &p) const = 0; - // if we press and drag on this media should we drag the item - [[nodiscard]] virtual bool dragItem() const { - return false; - } - [[nodiscard]] virtual TextSelection adjustSelection( TextSelection selection, TextSelectType type) const { diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h index 1ebe55e71..8b03a801d 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h +++ b/Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h @@ -73,9 +73,6 @@ public: bool toggleSelectionByHandlerClick(const ClickHandlerPtr &p) const override { return true; } - bool dragItem() const override { - return true; - } bool dragItemByHandler(const ClickHandlerPtr &p) const override { return true; } diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp index ae029cf9e..5bc2155cb 100644 --- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp +++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp @@ -1815,7 +1815,7 @@ void ListWidget::performDrag() { // auto pressedMedia = static_cast(nullptr); // if (auto pressedItem = _pressState.layout) { // pressedMedia = pressedItem->getMedia(); - // if (_mouseCursorState == CursorState::Date || (pressedMedia && pressedMedia->dragItem())) { + // if (_mouseCursorState == CursorState::Date) { // session().data().setMimeForwardIds(session().data().itemOrItsGroup(pressedItem)); // forwardMimeType = u"application/x-td-forward"_q; // }