From da0570d1ddf6c786b4bfdd0a1172b36ecc66f2a2 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Tue, 29 Nov 2016 13:04:10 +0100
Subject: Dial: add missing wheel handling

[ChangeLog][Controls][Dial] Added support for wheel handling when
wheelEnabled is set to true.

Change-Id: If0bc2f0ea9d7cde7726739cdfdbd795c908981f0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 tests/auto/controls/data/tst_dial.qml | 47 +++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'tests/auto/controls/data')

diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml
index e6446d3e..d0129755 100644
--- a/tests/auto/controls/data/tst_dial.qml
+++ b/tests/auto/controls/data/tst_dial.qml
@@ -356,4 +356,51 @@ TestCase {
         fuzzyCompare(dial.value, data.values[2], fuzz);
         fuzzyCompare(dial.position, data.positions[2], fuzz);
     }
+
+    function test_wheel_data() {
+        return [
+            { tag: "horizontal", orientation: Qt.Horizontal, dx: 120, dy: 0 },
+            { tag: "vertical", orientation: Qt.Vertical, dx: 0, dy: 120 }
+        ]
+    }
+
+    function test_wheel(data) {
+        var control = dialComponent.createObject(testCase, {wheelEnabled: true, orientation: data.orientation})
+        verify(control)
+
+        compare(control.value, 0.0)
+
+        mouseWheel(control, control.width / 2, control.height / 2, data.dx, data.dy)
+        compare(control.value, 0.1)
+        compare(control.position, 0.1)
+
+        control.stepSize = 0.2
+
+        mouseWheel(control, control.width / 2, control.height / 2, data.dx, data.dy)
+        compare(control.value, 0.3)
+        compare(control.position, 0.3)
+
+        control.stepSize = 10.0
+
+        mouseWheel(control, control.width / 2, control.height / 2, -data.dx, -data.dy)
+        compare(control.value, 0.0)
+        compare(control.position, 0.0)
+
+        control.to = 10.0
+        control.stepSize = 5.0
+
+        mouseWheel(control, control.width / 2, control.height / 2, data.dx, data.dy)
+        compare(control.value, 5.0)
+        compare(control.position, 0.5)
+
+        mouseWheel(control, control.width / 2, control.height / 2, 0.5 * data.dx, 0.5 * data.dy)
+        compare(control.value, 7.5)
+        compare(control.position, 0.75)
+
+        mouseWheel(control, control.width / 2, control.height / 2, -data.dx, -data.dy)
+        compare(control.value, 2.5)
+        compare(control.position, 0.25)
+
+        control.destroy()
+    }
 }
-- 
cgit v1.2.3


From 838fd79152957f457a47cd30970961a27f086848 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Tue, 29 Nov 2016 10:28:33 +0100
Subject: SwipeDelegate: fix animations when releasing from a drag

9812a9c changed the order in which the pressed and position
state is set. Before, when releasing after swiping, it would be:

set pressed to false => set position

After 9812a9c, it became:

set position => set pressed to false

The original order is necessary to ensure that animations can rely
on being enabled *before* position changes, as their enabled
expression typically looks something like this:

    enabled: !control.down

This patch duplicates the contents of
QQuickAbstractButton::mouseUngrabEvent() for now, with a TODO
comment to ensure that it's moved into a private helper that we can
call later on.

Task-number: QTBUG-57350
Change-Id: I31af7a665fb2d0e37548df31560ed7bbb0c3cadb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 tests/auto/controls/data/tst_swipedelegate.qml | 50 ++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'tests/auto/controls/data')

diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index 0404fd86..6d017dc8 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -1073,4 +1073,54 @@ TestCase {
         mouseRelease(control, control.width + 10, control.height / 2, Qt.LeftButton);
         verify(mouseSignalSequenceSpy.success);
     }
+
+
+    Component {
+        id: animationSwipeDelegateComponent
+
+        SwipeDelegate {
+            id: control
+            text: "SwipeDelegate"
+            width: 150
+            swipe.left: greenLeftComponent
+            swipe.right: redRightComponent
+
+            property alias behavior: xBehavior
+            property alias animation: numberAnimation
+
+            background: Rectangle {
+                color: control.down ? "#ccc" : "#fff"
+
+                Behavior on x {
+                    id: xBehavior
+                    enabled: !control.down
+
+                    NumberAnimation {
+                        id: numberAnimation
+                        easing.type: Easing.InOutCubic
+                        duration: 400
+                    }
+                }
+            }
+        }
+    }
+
+    function test_animations() {
+        // Test that animations are run when releasing from a drag.
+        var control = animationSwipeDelegateComponent.createObject(testCase);
+        verify(control);
+
+        mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
+        mouseMove(control, control.width - 1, control.height / 2, Qt.LeftButton);
+        verify(control.down);
+        verify(!control.behavior.enabled);
+        verify(!control.animation.running);
+
+        mouseRelease(control, control.width - 1, control.height / 2, Qt.LeftButton);
+        verify(!control.down);
+        verify(control.behavior.enabled);
+        verify(control.animation.running);
+
+        control.destroy();
+    }
 }
-- 
cgit v1.2.3