diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-19 16:49:59 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-20 09:12:34 +0000 |
| commit | 1d8bf6d1f4ef0aa84ca7e4c1233bedeee0f606f9 (patch) | |
| tree | e938ea624142692f5d20889316f608622924ec9f /src/imports/controls/material/qquickmaterialripple_p.h | |
| parent | 2466612283d06f2fc8365e82f492ca1da55f68d1 (diff) | |
Material: rewrite the ripple animation
Use animated nodes instead of using the private animator API.
Task-number: QTBUG-55652
Task-number: QTBUG-56601
Change-Id: I69d9e6afbc2cb0af6a537553fc39f9871cdd8e97
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialripple_p.h')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialripple_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/imports/controls/material/qquickmaterialripple_p.h b/src/imports/controls/material/qquickmaterialripple_p.h index a1cfed94..5b86fb2a 100644 --- a/src/imports/controls/material/qquickmaterialripple_p.h +++ b/src/imports/controls/material/qquickmaterialripple_p.h @@ -52,9 +52,6 @@ QT_BEGIN_NAMESPACE -class QQuickOpacityAnimator; -class QQuickMaterialRippleAnimator; - class QQuickMaterialRipple : public QQuickItem { Q_OBJECT @@ -91,6 +88,8 @@ public: QQuickItem *anchor() const; void setAnchor(QQuickItem *anchor); + qreal diameter() const; + protected: void itemChange(ItemChange change, const ItemChangeData &data) override; QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; @@ -103,13 +102,12 @@ protected: private: bool m_active; bool m_pressed; + int m_waves; int m_enterDelay; Trigger m_trigger; qreal m_clipRadius; QColor m_color; QQuickItem *m_anchor; - QQuickOpacityAnimator *m_opacityAnimator; - QVector<QQuickMaterialRippleAnimator *> m_rippleAnimators; }; QT_END_NAMESPACE |