diff options
Diffstat (limited to 'src/plugins/qmldesigner/components/formeditor/formeditoritem.h')
| -rw-r--r-- | src/plugins/qmldesigner/components/formeditor/formeditoritem.h | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.h b/src/plugins/qmldesigner/components/formeditor/formeditoritem.h index d725afd0b0..61ade49916 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.h @@ -1,5 +1,4 @@ - -/**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ @@ -53,7 +52,7 @@ class QMLDESIGNERCORE_EXPORT FormEditorItem : public QGraphicsItem public: ~FormEditorItem() override; - void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool isContainer() const; QmlItemNode qmlItemNode() const; @@ -158,7 +157,7 @@ public: QPointF instancePosition() const override; protected: - FormEditorFlowItem(const QmlItemNode &qmlItemNode, FormEditorScene* scene) + FormEditorFlowItem(const QmlItemNode &qmlItemNode, FormEditorScene *scene) : FormEditorItem(qmlItemNode, scene) {} }; @@ -167,12 +166,15 @@ class FormEditorFlowActionItem : public FormEditorItem { friend class QmlDesigner::FormEditorScene; public: - void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + void setDataModelPosition(const QPointF &position) override; + void setDataModelPositionInBaseState(const QPointF &position) override; + void updateGeometry() override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; QTransform instanceSceneTransform() const override; QTransform instanceSceneContentItemTransform() const override; protected: - FormEditorFlowActionItem(const QmlItemNode &qmlItemNode, FormEditorScene* scene) + FormEditorFlowActionItem(const QmlItemNode &qmlItemNode, FormEditorScene *scene) : FormEditorItem(qmlItemNode, scene) {} }; @@ -186,11 +188,11 @@ public: void setDataModelPositionInBaseState(const QPointF &position) override; void updateGeometry() override; QPointF instancePosition() const override; - void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool flowHitTest(const QPointF &point) const override; protected: - FormEditorTransitionItem(const QmlItemNode &qmlItemNode, FormEditorScene* scene) + FormEditorTransitionItem(const QmlItemNode &qmlItemNode, FormEditorScene *scene) : FormEditorItem(qmlItemNode, scene) {} private: @@ -203,13 +205,21 @@ class FormEditorFlowDecisionItem : FormEditorFlowItem public: void updateGeometry() override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; bool flowHitTest(const QPointF &point) const override; protected: - FormEditorFlowDecisionItem(const QmlItemNode &qmlItemNode, FormEditorScene* scene) - : FormEditorFlowItem(qmlItemNode, scene) + enum IconType { + DecisionIcon, + WildcardIcon + }; + + FormEditorFlowDecisionItem(const QmlItemNode &qmlItemNode, + FormEditorScene *scene, + IconType iconType = DecisionIcon) + : FormEditorFlowItem(qmlItemNode, scene), m_iconType(iconType) {} + IconType m_iconType; }; class FormEditorFlowWildcardItem : FormEditorFlowDecisionItem @@ -217,12 +227,13 @@ class FormEditorFlowWildcardItem : FormEditorFlowDecisionItem friend class QmlDesigner::FormEditorScene; public: - void paint(QPainter *painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; protected: - FormEditorFlowWildcardItem(const QmlItemNode &qmlItemNode, FormEditorScene* scene) - : FormEditorFlowDecisionItem(qmlItemNode, scene) - {} + FormEditorFlowWildcardItem(const QmlItemNode &qmlItemNode, FormEditorScene *scene) + : FormEditorFlowDecisionItem(qmlItemNode, scene, WildcardIcon) + { + } }; inline int FormEditorItem::type() const |