Merge lp:~lukas-kde/unity8/relaxedThreeFingerDrag into lp:unity8

[Lukáš Tinkl]

More relaxed 3-finger drag controls

More relaxed 3-finger drag controls

We allow 1..max fingers being used for the drag operation, as long as it's underway. With the last finger lifted, the drag is ended. See the attached BR for more details.

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

* If you changed the UI, has there been a design review?

N/A

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2498
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1651/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1651/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Good catch on operator=.

Looks like CI was taking a vacation there. I've restarted it.

As for the actual 3-finger change, it does work for me. In the sense that I can continue the drag motion with less fingers.

But it doesn't feel right. Lifting some fingers makes the window jump around (looks like it is "rebasing" on the remaining finger). And putting the fingers back also makes it jump around.

Easy to do accidentally and looks jarring. Can we smooth that out somehow? Prevent rebasing the drag focus?

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2498
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1655/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2196/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2224
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2130
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2130
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2130
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2121/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2121
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2121/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2121/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2121
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2121/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2121
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2121/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2121
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2121/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2121/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2121/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2121
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2121/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1655/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

2498. By Lukáš Tinkl on 2016-06-28

reduce diff

2497. By Lukáš Tinkl on 2016-06-28

WIP: more relaxed drag handling

2496. By Lukáš Tinkl on 2016-06-28

fix operator== and operator!=

2495. By Launchpad Translations on behalf of unity-team on 2016-06-28

Launchpad automatic translations update.

=== modified file 'plugins/Ubuntu/Gestures/TouchGestureArea.h'
--- plugins/Ubuntu/Gestures/TouchGestureArea.h	2016-06-01 20:16:51 +0000
+++ plugins/Ubuntu/Gestures/TouchGestureArea.h	2016-06-28 14:42:16 +0000
@@ -75,7 +75,7 @@
         return *this;
     }
 
-    bool operator=(const GestureTouchPoint& rhs) const {
+    bool operator==(const GestureTouchPoint& rhs) const {
         if (&rhs == this) return true;
         return m_id == rhs.m_id &&
                 m_pressed == rhs.m_pressed &&
@@ -83,7 +83,7 @@
                 m_y == rhs.m_y &&
                 m_dragging == rhs.m_dragging;
     }
-    bool operator!=(const GestureTouchPoint& rhs) const { return !operator=(rhs); }
+    bool operator!=(const GestureTouchPoint& rhs) const { return !operator==(rhs); }
 
     void setPos(const QPointF &pos);
 

=== modified file 'qml/Stages/WindowControlsOverlay.qml'
--- qml/Stages/WindowControlsOverlay.qml	2016-05-26 11:17:55 +0000
+++ qml/Stages/WindowControlsOverlay.qml	2016-06-28 14:42:16 +0000
@@ -34,9 +34,9 @@
         id: gestureArea
         anchors.fill: parent
 
-        // NB: for testing set to 2, not to clash with unity7 touch overlay controls
-        minimumTouchPoints: 3
-        maximumTouchPoints: minimumTouchPoints
+        // NB: for testing set maximumTouchPoints to 2, not to clash with unity7 touch overlay controls
+        minimumTouchPoints: priv.dragging ? 1 : maximumTouchPoints
+        maximumTouchPoints: 3
 
         readonly property bool recognizedPress: status == TouchGestureArea.Recognized &&
                                                 touchPoints.length >= minimumTouchPoints &&