aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-07-09 16:26:37 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-07-14 13:16:14 +0000
commit16a142977dd328689f2de4eb35c52340aceea204 (patch)
treeff9ec07efea75cfce87613552593ad1eda996665 /src/imports/controls/material
parent5c121fa1a398d475b7b734b112b8886901d3ba0f (diff)
Material: implement ripple effect for ComboBox
Task-number: QTBUG-50003 Change-Id: I1346b1ae312eb182720b4fd9a89fb02f579be94b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material')
-rw-r--r--src/imports/controls/material/ComboBox.qml10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index 5dcea814..377a555b 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -101,12 +101,14 @@ T.ComboBox {
elevation: control.Material.elevation
}
- Rectangle {
+ Ripple {
+ clipRadius: 2
width: parent.width
height: parent.height
- radius: parent.radius
- visible: control.visualFocus
- color: control.Material.checkBoxUncheckedRippleColor
+ pressed: control.pressed
+ anchor: control
+ active: control.pressed || control.visualFocus || control.hovered
+ color: control.checked ? control.Material.checkBoxCheckedRippleColor : control.Material.checkBoxUncheckedRippleColor
}
}