aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/SpinBox.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/SpinBox.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/SpinBox.qml')
-rw-r--r--src/imports/controls/material/SpinBox.qml12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index 828ac9cb..64176b69 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -118,9 +118,9 @@ T.SpinBox {
width: height
padding: control.spacing
radius: 3
- color: Qt.tint(Qt.tint(control.Material.raisedButtonColor,
- control.activeFocus ? control.Material.raisedButtonHoverColor : "transparent"),
- control.up.pressed ? control.Material.raisedButtonPressColor: "transparent")
+ color: Qt.tint(Qt.tint(control.Material.buttonColor,
+ control.activeFocus ? control.Material.buttonHoverColor : "transparent"),
+ control.up.pressed ? control.Material.buttonPressColor: "transparent")
Rectangle {
x: (parent.width - width) / 2
@@ -148,9 +148,9 @@ T.SpinBox {
width: height
padding: control.spacing
radius: 3
- color: Qt.tint(Qt.tint(control.Material.raisedButtonColor,
- control.activeFocus ? control.Material.raisedButtonHoverColor : "transparent"),
- control.down.pressed ? control.Material.raisedButtonPressColor : "transparent")
+ color: Qt.tint(Qt.tint(control.Material.buttonColor,
+ control.activeFocus ? control.Material.buttonHoverColor : "transparent"),
+ control.down.pressed ? control.Material.buttonPressColor : "transparent")
Rectangle {
x: (parent.width - width) / 2