From 8aaa72c1035940eb290de9ba16513b2dafe5248c Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 29 Sep 2016 16:42:56 +0200 Subject: Material: switch back to triggering ripples on press There is something wrong with the ripple effect's speed calculation when it's triggered on release. The ripple is supposed to grow slowly on press, and fast on release. But when triggered on release, it grows clearly too slow. We also got a bug report complaining about the trigger on release behavior. Ripples are triggered on press on Android 5, which is the Android version with the most market share. The proposal is to fix the ripple effect speed calculation when triggered on release later, and switch to trigger on release when later versions of Android have passed Android 5's market share. Task-number: QTBUG-55520 Change-Id: I67994e0df3c318af24f0d1f843bb2d0c26c4d656 Reviewed-by: Mitch Curtis --- src/imports/controls/material/Button.qml | 1 - src/imports/controls/material/CheckDelegate.qml | 1 - src/imports/controls/material/ComboBox.qml | 1 - src/imports/controls/material/ItemDelegate.qml | 1 - src/imports/controls/material/RadioDelegate.qml | 1 - src/imports/controls/material/SwipeDelegate.qml | 1 - src/imports/controls/material/SwitchDelegate.qml | 1 - src/imports/controls/material/TabButton.qml | 1 - src/imports/controls/material/ToolButton.qml | 1 - 9 files changed, 9 deletions(-) (limited to 'src/imports/controls') diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 9ed5263c..57cd44e6 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -112,7 +112,6 @@ T.Button { clipRadius: 2 width: parent.width height: parent.height - trigger: control.flat ? Ripple.Press : Ripple.Release pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index 9fff50d2..99b24f09 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -85,7 +85,6 @@ T.CheckDelegate { height: parent.height clip: visible - trigger: Ripple.Release pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index a48c6884..87ab1b2d 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -110,7 +110,6 @@ T.ComboBox { clipRadius: control.flat ? 0 : 2 width: parent.width height: parent.height - trigger: Ripple.Press pressed: control.pressed anchor: control active: control.pressed || control.visualFocus || control.hovered diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index b9db276d..647c3147 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -77,7 +77,6 @@ T.ItemDelegate { height: parent.height clip: visible - trigger: Ripple.Release pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index 1d056aa8..d1fa5e0e 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -85,7 +85,6 @@ T.RadioDelegate { height: parent.height clip: visible - trigger: Ripple.Release pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index bc9b49c2..329322e2 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -94,7 +94,6 @@ T.SwipeDelegate { height: parent.height clip: visible - trigger: Ripple.Release pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index b88dbe01..2134cfd1 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -85,7 +85,6 @@ T.SwitchDelegate { height: parent.height clip: visible - trigger: Ripple.Release pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index 9e6e8333..cac0f19a 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -65,7 +65,6 @@ T.TabButton { implicitHeight: 48 clip: true - trigger: Ripple.Release pressed: control.pressed anchor: control active: control.down || control.visualFocus || control.hovered diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index df4b23f8..6105d1e7 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -73,7 +73,6 @@ T.ToolButton { clip: !square width: square ? parent.height / 2 : parent.width height: square ? parent.height / 2 : parent.height - trigger: square ? Ripple.Press : Ripple.Release pressed: control.pressed anchor: control active: control.enabled && (control.down || control.visualFocus || control.hovered) -- cgit v1.2.3