diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-09 16:11:41 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-11 07:18:18 +0000 |
| commit | e1c9b374fede4aeff405bbc3b95461ef9951b914 (patch) | |
| tree | 5ac2282314a540f95371b6d71609901d7d8a1bd4 /src/imports/controls/material/MenuItem.qml | |
| parent | 4870918ea3a96e2e3b63c1a81fa4f159493698df (diff) | |
Material: implement ripple effect for CheckDelegate & MenuItem
Move Ripple out of CheckIndicator to CheckBox's indicator, because for
CheckDelegate and MenuItem it's in the background instead. This change
adds ripple effect to CheckDelegate & MenuItem, which means that they
now also have hover effects.
Task-number: QTBUG-50003
Change-Id: Idb458d0e1e0e2985096532400f2e6d02e9afcf6c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/MenuItem.qml')
| -rw-r--r-- | src/imports/controls/material/MenuItem.qml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index d98aef1a..4f221f2c 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -77,7 +77,17 @@ T.MenuItem { background: Rectangle { implicitWidth: 200 implicitHeight: 48 - visible: control.down || control.highlighted - color: control.down ? control.Material.buttonPressColor : control.Material.listHighlightColor + color: control.down ? control.Material.buttonPressColor : control.highlighted ? control.Material.listHighlightColor : "transparent" + + Ripple { + width: parent.width + height: parent.height + + clip: visible + pressed: control.pressed + anchor: control + active: control.down || control.visualFocus || control.hovered + color: control.Material.checkBoxUncheckedRippleColor + } } } |