aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/SwitchDelegate.qml
diff options
context:
space:
mode:
authorMichael Spencer <sonrisesoftware@gmail.com>2016-04-29 10:36:52 -0500
committerMichael Spencer <sonrisesoftware@gmail.com>2016-05-04 19:49:46 +0000
commit251afe3eaac3367c5c659dddc1e8854f833d5112 (patch)
treeb746a7a99b148f44b9da9f7008cbe814c1193438 /src/imports/controls/material/SwitchDelegate.qml
parentaa6af36630b6aa07c8b67dfd4cbdcfecc8362cb1 (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/SwitchDelegate.qml')
-rw-r--r--src/imports/controls/material/SwitchDelegate.qml4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml
index f49efad2..92f66f91 100644
--- a/src/imports/controls/material/SwitchDelegate.qml
+++ b/src/imports/controls/material/SwitchDelegate.qml
@@ -42,6 +42,8 @@ import QtQuick.Controls.Material.impl 2.0
T.SwitchDelegate {
id: control
+ Material.elevation: 1
+
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
@@ -80,7 +82,7 @@ T.SwitchDelegate {
implicitHeight: 48
visible: control.down || control.highlighted
- color: control.down ? control.Material.flatButtonPressColor : control.Material.listHighlightColor
+ color: control.down ? control.Material.buttonPressColor : control.Material.listHighlightColor
}
//! [background]
}