diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2018-05-22 14:59:08 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-08-02 17:48:14 +0000 |
| commit | ea195452e80e4b5a70e8c8cdf96a30581a8dd456 (patch) | |
| tree | e92198b486164f3373364461842bb77ad9bead33 /tests/manual | |
| parent | fe1a259be66835bc937890f3ed62bb2e8496d0f1 (diff) | |
Make pinch handler not activate on dragging
..when dragging (translation) is disabled
In order to do this, we had to integrate QQuickAxis to the PinchHandler
which allows enabling/disabling x and y axis individually.
This allows us to have one item with PinchHandler with translation
disabled (but to only handle rotate and scale) together with a two-finger
drag handler.
Change-Id: I1581c575ffba2e5d007163bec36e5699bdd86cbc
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/pointer/map.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/manual/pointer/map.qml b/tests/manual/pointer/map.qml index d5de9eaa39..c400874d58 100644 --- a/tests/manual/pointer/map.qml +++ b/tests/manual/pointer/map.qml @@ -77,6 +77,8 @@ Item { target: map minimumScale: 0.1 maximumScale: 10 + xAxis.enabled: false + yAxis.enabled: false onActiveChanged: if (!active) reRenderIfNecessary() grabPermissions: PinchHandler.TakeOverForbidden // don't allow takeover if pinch has started } |