Merge lp:~mzanetti/unity8/launcher-fixes into lp:unity8

[Michael Zanetti]

Launcher fixes for windowed mode

* When rotating the launcher because switching back and forth between staged/windowed mode, it would break the quicklist width
* Quicklist in rotated launcher painted the arrow on the wrong end
* snap animation fixed for a larger amount icons in the launcher.

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

n/a

[lp:~mzanetti/unity8/launcher-fixes]

1588. By Michael Zanetti on 2015-02-05

cleanup

[Michał Sawicz (saviq)]

Please describe the changes better in the commit msg :P

[Daniel d'Andrada (dandrader)]

Can't claim I really understand the code, but the changes do fix some issues (seem by manual test).

 * 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.
No results yes.

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1588
http://jenkins.qa.ubuntu.com/job/unity8-ci/5244/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/409
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1190
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17806

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1588
http://jenkins.qa.ubuntu.com/job/unity8-ci/5285/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1291
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1289
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17959

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

review: Approve (continuous-integration)

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2014-12-05 11:28:39 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-02-05 14:11:59 +0000
@@ -149,14 +149,14 @@
                         id: snapToBottomAnimation
                         target: launcherListView
                         property: "contentY"
-                        to: launcherListView.originY
+                        to: launcherListView.originY + launcherListView.topMargin
                     }
 
                     UbuntuNumberAnimation {
                         id: snapToTopAnimation
                         target: launcherListView
                         property: "contentY"
-                        to: launcherListView.contentHeight - launcherListView.height + launcherListView.originY
+                        to: launcherListView.contentHeight - launcherListView.height + launcherListView.originY - launcherListView.topMargin
                     }
 
                     displaced: Transition {
@@ -521,12 +521,12 @@
                 left: parent.left
                 leftMargin: (quickList.item.width - units.gu(1)) / 2 - width / 2
                 verticalCenter: parent.verticalCenter
-                verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1)
+                verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1) * (root.inverted ? 1 : -1)
             }
             height: units.gu(1)
             width: units.gu(2)
             source: "graphics/quicklist_tooltip.png"
-            rotation: quickList.offset > 0 ? 0 : 180
+            rotation: (quickList.offset > 0 ? 0 : 180) + (root.inverted ? 0 : 180)
         }
 
         InverseMouseArea {
@@ -543,7 +543,9 @@
         id: quickList
         objectName: "quickList"
         color: "#f5f5f5"
-        width: units.gu(30)
+        // Because we're setting left/right anchors depending on orientation, it will break the
+        // width setting after rotating twice. This makes sure we also re-apply width on rotation
+        width: root.inverted ? units.gu(30) : units.gu(30)
         height: quickListColumn.height
         visible: quickListShape.visible
         anchors {

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-02-05 14:11:59 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1 as UT
 import Ubuntu.Components 1.1
@@ -74,10 +75,22 @@
         }
     }
 
-    Button {
+    ColumnLayout {
         anchors { bottom: parent.bottom; right: parent.right; margins: units.gu(1) }
-        text: "emit hinting signal"
-        onClicked: LauncherModel.emitHint()
+        spacing: units.gu(1)
+        width: units.gu(20)
+
+        Button {
+            text: "emit hinting signal"
+            onClicked: LauncherModel.emitHint()
+            Layout.fillWidth: true
+        }
+
+        Button {
+            text: "rotate"
+            onClicked: launcherLoader.item.inverted = !launcherLoader.item.inverted
+            Layout.fillWidth: true
+        }
     }
 
     SignalSpy {
@@ -454,6 +467,7 @@
 
             verify(quickList.y >= units.gu(1));
             verify(quickList.y + quickList.height + units.gu(1) <= launcher.height);
+            compare(quickList.width, units.gu(30));
 
             // Click somewhere in the empty space to dismiss the quicklist
             mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));