From 251afe3eaac3367c5c659dddc1e8854f833d5112 Mon Sep 17 00:00:00 2001 From: Michael Spencer Date: Fri, 29 Apr 2016 10:36:52 -0500 Subject: Material: Add proper elevation support - Added an ElevationEffect component based on elevation shadows from Angular Material - Use it on Button, ToolBar, ComboBox, Drawer, Pane, Popup, Menu, and Switch - Add an elevation property to the Material attached object - Update the button colors based on the elevation property Change-Id: I5152e1a56bdcb1016cc4f945a16ef510e0cdece6 Task-number: QTBUG-51276 Reviewed-by: Nikita Krupenko Reviewed-by: J-P Nurmi --- src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp') diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp index 623d93f9..5ee6e767 100644 --- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp @@ -89,7 +89,9 @@ void QtQuickControls2MaterialStylePlugin::initializeEngine(QQmlEngine *engine, c qmlRegisterType(import, 2, 0, "ProgressStrip"); qmlRegisterType(import, 2, 0, "RingAnimator"); qmlRegisterType(import, 2, 0, "StripAnimator"); + qmlRegisterType(typeUrl(QStringLiteral("BoxShadow.qml")), import, 2, 0, "BoxShadow"); qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("ElevationEffect.qml")), import, 2, 0, "ElevationEffect"); qmlRegisterType(typeUrl(QStringLiteral("Ripple.qml")), import, 2, 0, "Ripple"); qmlRegisterType(typeUrl(QStringLiteral("SliderHandle.qml")), import, 2, 0, "SliderHandle"); qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); -- cgit v1.2.3