diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-07 13:11:19 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-09 05:11:42 +0000 |
commit | 7c284809df7e8f1a2adbee1d768a07d13f0403cc (patch) | |
tree | 0ace03d4996ef2d3167f94cf36f7f5df6135b4d4 /src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp | |
parent | cbfa64fd84cab95d909371a5e44146928e403c05 (diff) |
Material: implement the ripple effect
Consequently, the controls that were previously using the old
Ripple type have now gained hover effects (when hoverEnabled: true).
The rest of the Material style controls will be adjusted to use the
ripple effect in follow up commits.
Task-number: QTBUG-50003
Change-Id: I436f3794411fe75de9ccbe3ecda71029130db613
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp')
-rw-r--r-- | src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp index 30c10bc1..8214d5ac 100644 --- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp @@ -40,6 +40,7 @@ #include "qquickmaterialtheme_p.h" #include "qquickmaterialprogressring_p.h" #include "qquickmaterialprogressstrip_p.h" +#include "qquickmaterialripple_p.h" #include <QtQuickControls2/private/qquickstyleselector_p.h> #include <QtQuickControls2/private/qquickpaddedrectangle_p.h> @@ -89,6 +90,7 @@ void QtQuickControls2MaterialStylePlugin::initializeEngine(QQmlEngine *engine, c qmlRegisterType<QQuickMaterialProgressRing>(import, 2, 1, "ProgressRing"); qmlRegisterType<QQuickMaterialProgressStrip>(import, 2, 1, "ProgressStrip"); qmlRegisterType<QQuickMaterialRingAnimator>(import, 2, 1, "RingAnimator"); + qmlRegisterType<QQuickMaterialRipple>(import, 2, 1, "Ripple"); qmlRegisterType<QQuickMaterialStripAnimator>(import, 2, 1, "StripAnimator"); qmlRegisterType(typeUrl(QStringLiteral("BoxShadow.qml")), import, 2, 1, "BoxShadow"); qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 1, "CheckIndicator"); |