diff options
author | Michael Spencer <sonrisesoftware@gmail.com> | 2016-04-29 10:36:52 -0500 |
---|---|---|
committer | Michael Spencer <sonrisesoftware@gmail.com> | 2016-05-04 19:49:46 +0000 |
commit | 251afe3eaac3367c5c659dddc1e8854f833d5112 (patch) | |
tree | b746a7a99b148f44b9da9f7008cbe814c1193438 /src/imports/controls/material/ToolBar.qml | |
parent | aa6af36630b6aa07c8b67dfd4cbdcfecc8362cb1 (diff) |
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 <krnekit@gmail.com>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/material/ToolBar.qml')
-rw-r--r-- | src/imports/controls/material/ToolBar.qml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index b87451a0..1cd67bd0 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -37,10 +37,13 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.ToolBar { id: control + Material.elevation: 4 + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) @@ -55,6 +58,12 @@ T.ToolBar { background: Rectangle { implicitHeight: 48 color: control.Material.primaryColor + + layer.enabled: control.Material.elevation > 0 + layer.effect: ElevationEffect { + elevation: control.Material.elevation + fullWidth: true + } } //! [background] } |