Merge lp:~tpeeters/ubuntu-ui-toolkit/panel-dragThreshold into lp:ubuntu-ui-toolkit

[Tim Peeters]

Add a drag threshold to Panel (and Toolbar) so that unintentional movements while clicking are not detected as a drag to open/close the panel.

Add a drag threshold to Panel (and Toolbar) so that unintentional movements while clicking are not detected as a drag to open/close the panel.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:676
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/463/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/320
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/320/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1894
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1894/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1613

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/463/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

tested on device with gallery-app and phone-app. Everything seems fine except that in gallery-app, when choosing "select" from the toolbar in the Events view, a blank bar appears above the toolbar, as if the contents is cropped (at incorrect height) when toolbar is locked. However, selecting "Select" from the Photos view this issue does not appear. In other views, and in phone-app, no issues were found.

review: Needs Fixing

[Tim Peeters (tpeeters)]

The bug I mentioned above does exist, but is not related to the changes in this branch. It can also be reproduced in trunk, see https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1209133

review: Approve

[lp:~tpeeters/ubuntu-ui-toolkit/panel-dragThreshold]

677. By Tim Peeters on 2013-08-07

merge trunk

678. By Tim Peeters on 2013-08-07

faster movement when switching to moving state

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:678
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/469/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/326
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/326/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1962
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1962/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1674

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/469/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

On tablet, in Gallery App, when the toolbar hint is revealed by tapping on the bottom of the screen, the hint size toolbar stays on the screen no matter if you release your finger or tap somewhere else on the app screen. It can be hidden only by bringing the toolbar in completely and then dismissing it.

[lp:~tpeeters/ubuntu-ui-toolkit/panel-dragThreshold]

679. By Tim Peeters on 2013-08-15

hide/show toolbar after releasing when in hint mode

680. By Tim Peeters on 2013-08-15

merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:680
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/520/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/377
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2286
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1942

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/520/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

The code looks good. Nice one :)

review: Approve

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2013-07-10 15:51:12 +0000
+++ modules/Ubuntu/Components/Panel.qml	2013-08-15 11:00:28 +0000
@@ -273,6 +273,15 @@
                 properties: "position"
                 duration: internal.transitionDuration
             }
+        },
+        Transition {
+            id: transitionToMoving
+            to: "moving"
+            UbuntuNumberAnimation {
+                target: bar
+                properties: "position"
+                duration: Toolkit.UbuntuAnimation.SnapDuration
+            }
         }
     ]
 
@@ -285,7 +294,6 @@
          */
         property real transitionDuration: Toolkit.UbuntuAnimation.FastDuration
 
-
         property string previousState: ""
         property int movingDelta
 
@@ -442,25 +450,34 @@
             if (panel.state == "") panel.state = "hint";
         }
 
+        /*!
+          The minimum amount of movement while pressed before switching to "moving" state.
+          This threshold is needed to avoid detecting unintentional small movements while
+          "clicking" as a drag.
+          */
+        property real dragThreshold: units.gu(1)
+
         onPositionChanged: {
             if (panel.locked) return;
-            if (panel.state == "hint" && mousePosition < initialPosition) {
+            if (panel.state == "hint" && mousePosition < initialPosition - dragThreshold) {
                 panel.state = "moving";
                 pressedItem = null;
-            } else if (panel.state == "spread" && mousePosition > initialPosition) {
+            } else if (panel.state == "spread" && mousePosition > initialPosition + dragThreshold) {
                 panel.state = "moving";
                 pressedItem = null;
             }
         }
 
         onReleased: {
-            if (panel.locked) return;
-            finishMoving();
+            if (panel.state == "moving" || panel.state == "hint") {
+                finishMoving();
+            }
         }
         // Mouse cursor moving out of the window while pressed on desktop
         onCanceled: {
-            if (panel.locked) return;
-            finishMoving();
+            if (panel.state == "moving" || panel.state == "hint") {
+                finishMoving();
+            }
         }
 
         // FIXME: Make all parameters below themable and resolution-independent.