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/CheckBox.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/CheckBox.qml')
| -rw-r--r-- | src/imports/controls/material/CheckBox.qml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index 688310fb..90794f31 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -58,6 +58,18 @@ T.CheckBox { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control + + Ripple { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 28; height: 28 + + z: -1 + anchor: control + pressed: control.pressed + active: control.down || control.visualFocus || control.hovered + color: control.checked ? control.Material.checkBoxCheckedRippleColor : control.Material.checkBoxUncheckedRippleColor + } } contentItem: Text { |