aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-07-20 14:59:49 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-07-20 14:39:18 +0000
commit8291869b51c0afe8763df6f932b4e8fef463371c (patch)
tree87643f2b1ac5ac42db2fa0d78427eb6ce63736f2 /src/imports/controls
parent946b1349ffc6450d2484773583cfbda95e9d7771 (diff)
Material: remove double press effect from delegates
The press effect is visualized by the ripple background, so we don't need to adjust the control background color when pressed. Change-Id: Ic3acea4591d59f3045004b7e85a5b5bb9044c9f2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls')
-rw-r--r--src/imports/controls/material/CheckDelegate.qml2
-rw-r--r--src/imports/controls/material/ItemDelegate.qml2
-rw-r--r--src/imports/controls/material/MenuItem.qml2
-rw-r--r--src/imports/controls/material/RadioDelegate.qml2
-rw-r--r--src/imports/controls/material/SwipeDelegate.qml3
-rw-r--r--src/imports/controls/material/SwitchDelegate.qml2
6 files changed, 6 insertions, 7 deletions
diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml
index 099c851b..0f843be8 100644
--- a/src/imports/controls/material/CheckDelegate.qml
+++ b/src/imports/controls/material/CheckDelegate.qml
@@ -76,7 +76,7 @@ T.CheckDelegate {
background: Rectangle {
implicitHeight: 48
- color: control.down ? control.Material.buttonPressColor : control.highlighted ? control.Material.listHighlightColor : "transparent"
+ color: control.highlighted ? control.Material.listHighlightColor : "transparent"
Ripple {
width: parent.width
diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml
index 79aa60ea..9a0463f0 100644
--- a/src/imports/controls/material/ItemDelegate.qml
+++ b/src/imports/controls/material/ItemDelegate.qml
@@ -68,7 +68,7 @@ T.ItemDelegate {
background: Rectangle {
implicitHeight: 48
- color: control.down ? control.Material.buttonPressColor : control.highlighted ? control.Material.listHighlightColor : "transparent"
+ color: control.highlighted ? control.Material.listHighlightColor : "transparent"
Ripple {
width: parent.width
diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml
index 4f221f2c..e792fae9 100644
--- a/src/imports/controls/material/MenuItem.qml
+++ b/src/imports/controls/material/MenuItem.qml
@@ -77,7 +77,7 @@ T.MenuItem {
background: Rectangle {
implicitWidth: 200
implicitHeight: 48
- color: control.down ? control.Material.buttonPressColor : control.highlighted ? control.Material.listHighlightColor : "transparent"
+ color: control.highlighted ? control.Material.listHighlightColor : "transparent"
Ripple {
width: parent.width
diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml
index 5c943a7f..b8f4fbd5 100644
--- a/src/imports/controls/material/RadioDelegate.qml
+++ b/src/imports/controls/material/RadioDelegate.qml
@@ -76,7 +76,7 @@ T.RadioDelegate {
background: Rectangle {
implicitHeight: 48
- color: control.down ? control.Material.buttonPressColor : control.highlighted ? control.Material.listHighlightColor : "transparent"
+ color: control.highlighted ? control.Material.listHighlightColor : "transparent"
Ripple {
width: parent.width
diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml
index 02a3cd8c..28fc6c2e 100644
--- a/src/imports/controls/material/SwipeDelegate.qml
+++ b/src/imports/controls/material/SwipeDelegate.qml
@@ -84,8 +84,7 @@ T.SwipeDelegate {
width: parent.width
height: parent.height
visible: control.down || control.highlighted || control.visualFocus
- color: control.down ? control.Material.buttonPressColor :
- control.visualFocus || control.hovered ? control.Material.swipeDelegateHoverColor :
+ color: control.visualFocus || control.hovered ? control.Material.swipeDelegateHoverColor :
control.Material.listHighlightColor
}
diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml
index 31cd4660..8db4f567 100644
--- a/src/imports/controls/material/SwitchDelegate.qml
+++ b/src/imports/controls/material/SwitchDelegate.qml
@@ -76,7 +76,7 @@ T.SwitchDelegate {
background: Rectangle {
implicitHeight: 48
- color: control.down ? control.Material.buttonPressColor : control.highlighted ? control.Material.listHighlightColor : "transparent"
+ color: control.highlighted ? control.Material.listHighlightColor : "transparent"
Ripple {
width: parent.width