From 4e4201f0332043945d00c78730d08094705c48ed Mon Sep 17 00:00:00 2001 From: PaddleStroke Date: Mon, 17 Jun 2024 10:18:00 +0200 Subject: [PATCH] Core: Tree: Remove !vp->canDragAndDropObject(obj) that made no sense. And remove the auto switching to 'CopyAction' --- src/Gui/Tree.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index f10b4e700b..dc40ce13ed 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -2010,7 +2010,7 @@ void TreeWidget::dragMoveEvent(QDragMoveEvent* event) try { if (da != Qt::LinkAction && !vp->canDropObjects()) { if (!(event->possibleActions() & Qt::LinkAction) || items.size() != 1) { - TREE_TRACE("cannot drop"); + TREE_TRACE("Cannot drop here"); event->ignore(); return; } @@ -2025,17 +2025,14 @@ void TreeWidget::dragMoveEvent(QDragMoveEvent* event) auto obj = item->object()->getObject(); - if (da == Qt::MoveAction && !vp->canDragAndDropObject(obj)) { - // Check if item can be dragged + if (da == Qt::MoveAction) { + // Check if item can be dragged from his parent auto parentItem = item->getParentItem(); if (parentItem && !(parentItem->object()->canDragObjects() && parentItem->object()->canDragObject(item->object()->getObject()))) { - if (!(event->possibleActions() & Qt::CopyAction)) { - TREE_TRACE("Cannot drag object"); - event->ignore(); - return; - } - event->setDropAction(Qt::CopyAction); + TREE_TRACE("Cannot drag object"); + event->ignore(); + return; } }