From 6b6b844020e93af947ee871683a970ef3830aeb4 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 14 Apr 2020 18:16:40 +0200 Subject: [PATCH] QmlDesigner: Add QmlFlowTargetNode::isFlowEditorTarget() Change-Id: Ieacd59baa5b99bed4def6001de88c43545d0e309 Reviewed-by: Tim Jenssen --- .../qmldesigner/designercore/include/qmlitemnode.h | 1 + .../qmldesigner/designercore/model/qmlitemnode.cpp | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h index 48e563358d2..c9fa5ea3b8b 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h @@ -143,6 +143,7 @@ public: ModelNode targetTransition() const; QmlFlowViewNode flowView() const; ModelNode findSourceForDecisionNode() const; + static bool isFlowEditorTarget(const ModelNode &modelNode); }; class QMLDESIGNERCORE_EXPORT QmlFlowActionAreaNode : public QmlItemNode diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 6943ba4a5a7..65f719a5ac9 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -717,10 +717,7 @@ QList QmlFlowViewNode::transitionsForTarget(const ModelNode &modelNod bool QmlFlowTargetNode::isValid() const { - return QmlItemNode(modelNode()).isFlowItem() - || QmlItemNode(modelNode()).isFlowActionArea() - || QmlVisualNode::isFlowDecision(modelNode()) - || QmlVisualNode::isFlowWildcard(modelNode()); + return isFlowEditorTarget(modelNode()); } void QmlFlowTargetNode::assignTargetItem(const QmlFlowTargetNode &node) @@ -797,4 +794,12 @@ ModelNode QmlFlowTargetNode::findSourceForDecisionNode() const return {}; } +bool QmlFlowTargetNode::isFlowEditorTarget(const ModelNode &modelNode) +{ + return QmlItemNode(modelNode).isFlowItem() + || QmlItemNode(modelNode).isFlowActionArea() + || QmlVisualNode::isFlowDecision(modelNode) + || QmlVisualNode::isFlowWildcard(modelNode); +} + } //QmlDesigner