Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/touchPoints into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Don't use a separate argument to distinguish touch events

If it's touch, it has our overloaded methods

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1794
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2693/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1419
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1419/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1415

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2693/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/2/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/2/console

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/17/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/17/console

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/56/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/139/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/56/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/54/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/140/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/54/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

The upcoming CI test results are a result of experimenting only, please ignore.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/111/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/261/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/111/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/115/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/262/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/115/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/113/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/265/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/113/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/114/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/267/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/114/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/115/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/268/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/115/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

(CI experimentation done, all ok)

[Tim Peeters (tpeeters)]

Changes look good.

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/631/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2386/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/631/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/412/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2387/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/412/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1794
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/386/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2389/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/386/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/1.3/InputHandler.qml'
--- src/Ubuntu/Components/1.3/InputHandler.qml	2015-11-20 15:18:50 +0000
+++ src/Ubuntu/Components/1.3/InputHandler.qml	2016-01-04 09:55:56 +0000
@@ -147,7 +147,7 @@
         return p;
     }
     // focuses the input if not yet focused, and shows the context menu
-    function openContextMenu(mouse, noAutoselect, fromTouch) {
+    function openContextMenu(mouse, noAutoselect) {
         var pos = mousePosition(mouse);
         if (!main.focus || !mouseInSelection(mouse)) {
             activateInput();
@@ -157,7 +157,7 @@
             }
         }
         // open context menu at the cursor position
-        inputHandler.pressAndHold(input.cursorPosition, fromTouch);
+        inputHandler.pressAndHold(input.cursorPosition, mouse.touch);
         // if opened with left press (touch falls into this criteria as well), we need to set state to inactive
         // so the mouse moves won't result in selected text loss/change
         if (mouse.button === Qt.LeftButton) {
@@ -341,8 +341,8 @@
     }
 
     // touch and mous handling
-    function handlePressed(event, touch) {
-        if (touch) {
+    function handlePressed(event) {
+        if (event.touch) {
             // we do not have longTap or double tap, therefore we need to generate those
             event.touch();
         } else {
@@ -352,8 +352,8 @@
         // remember pressed position as we need it when entering into selection state
         pressedPosition = mousePosition(event);
     }
-    function handleReleased(event, touch) {
-        if (touch) {
+    function handleReleased(event) {
+        if (event.touch) {
             event.untouch();
         }
         if ((!main.focus && !main.activeFocusOnPress) || suppressReleaseEvent === true) {
@@ -362,7 +362,7 @@
         }
 
         activateInput();
-        if (state === "" || touch) {
+        if (state === "" || event.touch) {
             input.cursorPosition = mousePosition(event);
         }
         moveStarts = moveEnds = -1;
@@ -370,21 +370,21 @@
         // check if we get right-click from the frame or the area that has no text
         if (event.button === Qt.RightButton) {
             // open the popover
-            inputHandler.pressAndHold(input.cursorPosition, touch);
+            inputHandler.pressAndHold(input.cursorPosition, event.touch);
         } else {
             inputHandler.tap(input.cursorPosition);
         }
     }
-    function handleMove(event, touch ) {
+    function handleMove(event) {
         // leave if not focus, not the left button or not in select state
-        if (!input.activeFocus || (!touch && event.button !== Qt.LeftButton) || !main.selectByMouse) {
+        if (!input.activeFocus || (!event.touch && event.button !== Qt.LeftButton) || !main.selectByMouse) {
             return;
         }
         selectText(event);
     }
-    function handleDblClick(event, touch) {
+    function handleDblClick(event) {
         if (main.selectByMouse) {
-            openContextMenu(event, false, touch);
+            openContextMenu(event, false);
             // turn selection state temporarily so the selection is not cleared on release
             state = "selection";
             suppressReleaseEvent = true;
@@ -393,17 +393,17 @@
 
     // Mouse handling
     Mouse.forwardTo: [main]
-    Mouse.onPressed: handlePressed(mouse, false)
-    Mouse.onReleased: handleReleased(mouse, false)
-    Mouse.onPositionChanged: handleMove(mouse, false)
-    Mouse.onDoubleClicked: handleDblClick(mouse, false)
+    Mouse.onPressed: handlePressed(mouse)
+    Mouse.onReleased: handleReleased(mouse)
+    Mouse.onPositionChanged: handleMove(mouse)
+    Mouse.onDoubleClicked: handleDblClick(mouse)
 
     // right button handling
     MouseArea {
         anchors.fill: parent
         acceptedButtons: Qt.RightButton
         // trigger pressAndHold
-        onReleased: openContextMenu(mouse, true, false)
+        onReleased: openContextMenu(mouse, true)
         cursorShape: Qt.IBeamCursor
     }
     Keys.onMenuPressed: inputHandler.pressAndHold(input.cursorPosition, false);
@@ -442,7 +442,7 @@
             if (touchPoint.startY - touchPoint.y < -units.gu(2))
                 return;
 
-            openContextMenu(touchPoint, false, true);
+            openContextMenu(touchPoint, false);
             suppressReleaseEvent = true;
         }
     }
@@ -456,8 +456,8 @@
             tapCount = running;
         }
     }
-    onPressed: handlePressed(touchPoints[0], true)
-    onReleased: handleReleased(touchPoints[0], true)
+    onPressed: handlePressed(touchPoints[0])
+    onReleased: handleReleased(touchPoints[0])
 
     property Item cursorPositionCursor: null
     property Item selectionStartCursor: null