diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-19 16:09:57 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-19 17:26:30 +0000 |
| commit | 3a0ff40bfac794ec16a8386fc1474f1d315a7db3 (patch) | |
| tree | c8d102eca32db80feba71f42389457dbfcb33974 /src/imports/controls/material | |
| parent | fdbbee122c05b570f9be0393fa9b39fb89849a0f (diff) | |
Material: improve Button's ripple effect
Trigger ripples on press for flat buttons, on release for raised
buttons. Use highlighted (colored) ripple for highlighted (colored)
buttons, not for checked (not colored) buttons.
Change-Id: Ic7a6de070e568792d39cc20af35229517b7fd69e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/Button.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index dd4d614e..b36b38fd 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -107,11 +107,11 @@ T.Button { clipRadius: 2 width: parent.width height: parent.height - trigger: Ripple.Release + trigger: control.flat ? Ripple.Press : Ripple.Release pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered - color: control.checked ? control.Material.checkBoxCheckedRippleColor : control.Material.checkBoxUncheckedRippleColor + color: control.highlighted && !control.flat ? control.Material.checkBoxCheckedRippleColor : control.Material.checkBoxUncheckedRippleColor } } } |