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

Removed not really necessary HistoryView::Media::dragItem method.

This commit is contained in:
23rd 2023-08-15 10:26:52 +03:00
parent f539912405
commit 9bf5f992a3
6 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
View File

@ -1892,8 +1892,7 @@ void InnerWidget::performDrag() {
// auto pressedMedia = static_cast<HistoryView::Media*>(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()));

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

@ -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<QMimeData> 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());
}
}

15
Telegram/SourceFiles/history/view/history_view_list_widget.cpp
View File

@ -1302,16 +1302,8 @@ auto ListWidget::itemUnderPressSelection() const
: _selected.end();
}
bool ListWidget::requiredToStartDragging(
not_null<Element*> 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<Element*> view) const {
return (_mouseCursorState == CursorState::Date);
}
bool ListWidget::isPressInSelectedText(TextState state) const {
@ -3625,8 +3617,7 @@ std::unique_ptr<QMimeData> 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());
}
}

5
Telegram/SourceFiles/history/view/media/history_view_media.h
View File

@ -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 {

3
Telegram/SourceFiles/history/view/media/history_view_media_unwrapped.h
View File

@ -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;
}

2
Telegram/SourceFiles/info/media/info_media_list_widget.cpp
View File

@ -1815,7 +1815,7 @@ void ListWidget::performDrag() {
// auto pressedMedia = static_cast<HistoryView::Media*>(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;
// }