kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Core: Tree: add canDragFromParents to reduce code duplicity. + Few small fixes

Browse Source
This commit is contained in:
PaddleStroke
2024-07-01 10:05:26 +02:00
committed by Yorik van Havre
parent 6088fdaa96
commit 47a506f82f
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Gui/Tree.cpp
View File

@@ -2128,17 +2128,7 @@ bool TreeWidget::dropInDocument(QDropEvent* event, TargetItemInfo& targetInfo,
auto obj = item->object()->getObject();
auto parentItem = item->getParentItem();
if (parentItem) {
auto vpp = parentItem->object();
// We querry all the parents recursively.
bool allParentsOK = true;
auto parentItemRecursive = parentItem;
while (parentItemRecursive) {
if (!parentItemRecursive->object()->canDragObjectToTarget(obj, nullptr)) {
allParentsOK = false;
break;
}
parentItemRecursive = parentItemRecursive->getParentItem();
}
bool allParentsOK = canDragFromParents(parentItem, obj, nullptr);
if (!allParentsOK || !parentItem->object()->canDragObjects() || !parentItem->object()->canDragObject(obj)) {
committer.close(true);
@@ -2422,25 +2412,17 @@ bool TreeWidget::dropInObject(QDropEvent* event, TargetItemInfo& targetInfo,
info.dragging = true;
}
else {
auto vpp = parentItem->object();
// We querry all the parents recursively.
bool allParentsOK = true;
while (parentItem) {
Base::Console().Warning("parentItem %s\n", parentItem->getName());
if (!parentItem->object()->canDragObjectToTarget(obj, targetObj)) {
allParentsOK = false;
break;
}
parentItem = parentItem->getParentItem();
}
bool allParentsOK = canDragFromParents(parentItem, obj, targetObj);
if (allParentsOK) {
auto vpp = parentItem->object();
info.dragging = true;
info.parent = vpp->getObject()->getNameInDocument();
info.parentDoc = vpp->getObject()->getDocument()->getName();
}
else {
committer.close(true);
TREE_TRACE("Cannot drag from " << parentItem->getName());
return false;
}
}
@@ -2698,6 +2680,21 @@ bool TreeWidget::dropInObject(QDropEvent* event, TargetItemInfo& targetInfo,
return touched;
}
bool TreeWidget::canDragFromParents(DocumentObjectItem* parentItem, App::DocumentObject* obj, App::DocumentObject* target)
{
// We query all the parents recursively. (for cases like assembly/group/part)
bool allParentsOK = true;
while (parentItem) {
if (!parentItem->object()->canDragObjectToTarget(obj, target)) {
allParentsOK = false;
break;
}
parentItem = parentItem->getParentItem();
}
return allParentsOK;
}
void TreeWidget::dropEvent(QDropEvent* event)
{
//FIXME: This should actually be done inside dropMimeData

1
src/Gui/Tree.h
View File

@@ -155,6 +155,7 @@ private:
using ObjectItemSubname = std::pair<DocumentObjectItem*, std::vector<std::string>>;
bool dropInObject(QDropEvent* event, TargetItemInfo& targetInfo, std::vector<ObjectItemSubname> items);
bool dropInDocument(QDropEvent* event, TargetItemInfo& targetInfo, std::vector<ObjectItemSubname> items);
bool canDragFromParents(DocumentObjectItem* parentItem, App::DocumentObject* obj, App::DocumentObject* target);
void sortDroppedObjects(TargetItemInfo& targetInfo, std::vector<App::DocumentObject*> draggedObjects);
//@}