Merge lp:~mzanetti/unity8/rounded-bfb into lp:unity8

[Michael Zanetti]

Make the launcher BFB rounded on one end

 * 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?

n/a

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

fixing bug reported by design

[Andrea Cimitan (cimi)]

review: Needs Fixing

[lp:~mzanetti/unity8/rounded-bfb]

1437. By Michael Zanetti on 2014-11-17

drop borderSource from shape

[Michael Zanetti (mzanetti)]

fixed. thanks

[Andrea Cimitan (cimi)]

review: Needs Fixing

[Michael Zanetti (mzanetti)]

fixed/commented

[lp:~mzanetti/unity8/rounded-bfb]

1438. By Michael Zanetti on 2014-11-17

drop unneeded clipping

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1436
http://jenkins.qa.ubuntu.com/job/unity8-ci/4918/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/236
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15883

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1438
http://jenkins.qa.ubuntu.com/job/unity8-ci/4924/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/89
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/249
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/249/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15916

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

Please change to topMargin: -units.gu(2), since the first of the bezier curves used for the ubuntushape starts before 1gu from the edge (just tested locally)

review: Needs Fixing

[lp:~mzanetti/unity8/rounded-bfb]

1439. By Michael Zanetti on 2014-11-18

increase margins to prevent rounding at the top (bottom on phone)

[Michael Zanetti (mzanetti)]

> Please change to topMargin: -units.gu(2), since the first of the bezier curves
> used for the ubuntushape starts before 1gu from the edge (just tested locally)

Now I get what you mean... Fixed. Good catch!

[Andrea Cimitan (cimi)]

 * 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.
Autopilot
 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1439
http://jenkins.qa.ubuntu.com/job/unity8-ci/4927/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/92
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/256
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/256/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15944

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/rounded-bfb]

1440. By Michael Zanetti on 2014-11-20

merge with launcher-snap-after-drag

1441. By Michael Zanetti on 2014-11-20

merge prereq

Unmerged revisions

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2014-11-10 10:10:34 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-11-20 09:41:51 +0000
@@ -50,12 +50,19 @@
             fill: parent
         }
 
-        Rectangle {
+        Item {
             objectName: "buttonShowDashHome"
             width: parent.width
             height: units.gu(7)
-            color: UbuntuColors.orange
-            z: 1
+
+            UbuntuShape {
+                anchors {
+                    fill: parent
+                    topMargin: -units.gu(2)
+                }
+                borderSource: "none"
+                color: UbuntuColors.orange
+            }
 
             Image {
                 objectName: "dashItem"
@@ -137,6 +144,20 @@
                     property bool draggingTransitionRunning: false
                     property int scheduledMoveTo: -1
 
+                    UbuntuNumberAnimation {
+                        id: snapToBottomAnimation
+                        target: launcherListView
+                        property: "contentY"
+                        to: launcherListView.originY
+                    }
+
+                    UbuntuNumberAnimation {
+                        id: snapToTopAnimation
+                        target: launcherListView
+                        property: "contentY"
+                        to: launcherListView.contentHeight - launcherListView.height + launcherListView.originY
+                    }
+
                     displaced: Transition {
                         NumberAnimation { properties: "x,y"; duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
                     }
@@ -342,10 +363,9 @@
                             progressiveScrollingTimer.stop();
                             launcherListView.interactive = true;
                             if (droppedIndex >= launcherListView.count - 2 && postDragging) {
-                                launcherListView.flick(0, -launcherListView.clickFlickSpeed);
-                            }
-                            if (droppedIndex == 0 && postDragging) {
-                                launcherListView.flick(0, launcherListView.clickFlickSpeed);
+                                snapToBottomAnimation.start();
+                            } else if (droppedIndex < 2 && postDragging) {
+                                snapToTopAnimation.start();
                             }
                         }