feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add QmlFlowTargetNode::isFlowEditorTarget()

Browse Source 
Change-Id: Ieacd59baa5b99bed4def6001de88c43545d0e309
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2020-04-14 18:16:40 +02:00
committed by Tim Jenssen
parent 8262fdf5f9
commit 6b6b844020
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/designercore/include/qmlitemnode.h
View File

@@ -143,6 +143,7 @@ public:
ModelNode targetTransition() const; ModelNode targetTransition() const;
QmlFlowViewNode flowView() const; QmlFlowViewNode flowView() const;
ModelNode findSourceForDecisionNode() const; ModelNode findSourceForDecisionNode() const;
static bool isFlowEditorTarget(const ModelNode &modelNode);
}; };
class QMLDESIGNERCORE_EXPORT QmlFlowActionAreaNode : public QmlItemNode class QMLDESIGNERCORE_EXPORT QmlFlowActionAreaNode : public QmlItemNode

13
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
View File

@@ -717,10 +717,7 @@ QList<ModelNode> QmlFlowViewNode::transitionsForTarget(const ModelNode &modelNod
bool QmlFlowTargetNode::isValid() const bool QmlFlowTargetNode::isValid() const
{ {
return QmlItemNode(modelNode()).isFlowItem() return isFlowEditorTarget(modelNode());
|| QmlItemNode(modelNode()).isFlowActionArea()
|| QmlVisualNode::isFlowDecision(modelNode())
|| QmlVisualNode::isFlowWildcard(modelNode());
} }
void QmlFlowTargetNode::assignTargetItem(const QmlFlowTargetNode &node) void QmlFlowTargetNode::assignTargetItem(const QmlFlowTargetNode &node)
@@ -797,4 +794,12 @@ ModelNode QmlFlowTargetNode::findSourceForDecisionNode() const
return {}; return {};
} }
bool QmlFlowTargetNode::isFlowEditorTarget(const ModelNode &modelNode)
{
return QmlItemNode(modelNode).isFlowItem()
|| QmlItemNode(modelNode).isFlowActionArea()
|| QmlVisualNode::isFlowDecision(modelNode)
|| QmlVisualNode::isFlowWildcard(modelNode);
}
} //QmlDesigner } //QmlDesigner