Merge lp:~mterry/unity8/tutorial-launcher-gap into lp:unity8

[Michael Terry]

Make sure the tutorial doesn't let the user drag the launcher past the edge of the screen.

This was because the bouncing animation on the left added a bit of extra offset to the launcher. So I just made sure that offset doesn't go past the screen edge as the user drags the launcher out.

And added a test.

Make sure the tutorial doesn't let the user drag the launcher past the edge of the screen.

This was because the bouncing animation on the left added a bit of extra offset to the launcher. So I just made sure that offset doesn't go past the screen edge as the user drags the launcher out.

And added a test.

== Checklist ==

 * 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

 * Did you make sure that your branch does not contain spurious tags?
 Yes

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1779
http://jenkins.qa.ubuntu.com/job/unity8-ci/5722/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2813
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/887
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/888
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2811
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2811/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20498

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5722/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Could you please update the copyright year of qml/Tutorial/TutorialLeft.qml and tests/qmltests/Tutorial/tst_Tutorial.qml?

[Daniel d'Andrada (dandrader)]

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

* Did CI run pass? If not, please explain why.
Only the usual autopilot failures

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[Michael Terry (mterry)]

Updated copyrights

[Michael Zanetti (mzanetti)]

This introduces a bug: http://i.imgur.com/BNbcjvc.jpg

If you drag the launcher in the tutorial while it is bouncing, it won't return to be fully hidden any more afterwards.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1780
http://jenkins.qa.ubuntu.com/job/unity8-ci/5813/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/105/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/105/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5813/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

> This introduces a bug: http://i.imgur.com/BNbcjvc.jpg
>
> If you drag the launcher in the tutorial while it is bouncing, it won't return
> to be fully hidden any more afterwards.

Got a fix for this in lp:~dandrader/unity8/tutorial-launcher-gap

Now I just have to investigate two failures (unrelated to the fix) in "make testTutorial".

[Daniel d'Andrada (dandrader)]

Superseded by https://code.launchpad.net/~dandrader/unity8/tutorial-launcher-gap/+merge/262208

review: Disapprove

Unmerged revisions

=== modified file 'qml/Tutorial/TutorialLeft.qml'
--- qml/Tutorial/TutorialLeft.qml	2015-01-09 17:58:05 +0000
+++ qml/Tutorial/TutorialLeft.qml	2015-05-14 20:42:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,24 +46,33 @@
 
     SequentialAnimation {
         id: teaseAnimation
+        objectName: "teaseAnimation"
         paused: running && root.paused
         running: !slider.active && root.launcher.visibleWidth === 0 && root.shown
         loops: Animation.Infinite
+        property real bounce: 0
+        readonly property real maxBounce: units.gu(2)
 
         UbuntuNumberAnimation {
-            target: root.launcher
-            property: "x"
-            to: units.gu(2)
+            target: teaseAnimation
+            property: "bounce"
+            to: teaseAnimation.maxBounce
             duration: UbuntuAnimation.SleepyDuration
         }
         UbuntuNumberAnimation {
-            target: root.launcher
-            property: "x"
+            target: teaseAnimation
+            property: "bounce"
             to: 0
             duration: UbuntuAnimation.SleepyDuration
         }
     }
 
+    Binding {
+        target: root.launcher
+        property: "x"
+        value: Math.min(root.launcher.panelWidth - root.launcher.visibleWidth, teaseAnimation.bounce)
+    }
+
     Timer {
         id: finishTimer
         interval: 1

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-05-05 14:46:11 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-05-14 20:42:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013,2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -325,6 +325,36 @@
             tryCompare(left, "shown", true); // and we should still be on left
         }
 
+        function test_launcherNoDragGap() {
+            // See bug 1454882, where if you dragged the launcher while it was
+            // visible, you could pull it further than the edge of the screen.
+
+            var left = goToPage("tutorialLeft");
+            var launcher = findChild(shell, "launcher");
+            var teaseAnimation = findInvisibleChild(left, "teaseAnimation");
+
+            // Wait for launcher to be really out there
+            tryCompareFunction(function() {return launcher.x > teaseAnimation.maxBounce/2}, true);
+            verify(teaseAnimation.running);
+
+            // Start a drag, make sure animation stops
+            touchFlick(shell, 0, halfHeight, units.gu(3), halfHeight, true, false);
+            verify(!teaseAnimation.running);
+            verify(launcher.visibleWidth > 0);
+            verify(launcher.x > 0);
+            compare(launcher.x, teaseAnimation.bounce);
+
+            // Continue drag, make sure we don't create a gap on the left hand side
+            touchFlick(shell, units.gu(3), halfHeight, shell.width, halfHeight, false, false);
+            verify(!teaseAnimation.running);
+            compare(launcher.visibleWidth, launcher.panelWidth);
+            compare(launcher.x, 0);
+
+            // Finish and make sure we continue animation
+            touchFlick(shell, shell.width, halfHeight, shell.width, halfHeight, false, true);
+            tryCompare(teaseAnimation, "running", true);
+        }
+
         function test_spread() {
             // Unfortunately, most of what we want to test of the spread is
             // "did it render correctly?" but that's hard to test.  So instead,