Merge lp:~mzanetti/unity8/rework-quicklist-visuals into lp:unity8

[Michael Zanetti]

rework launcher quicklist visuals to fit new design

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

change requested by design. see linked bug report

[Michael Terry (mterry)]

Based on the visuals Design provided, you may want to make the popup even more opaque.

Also, I get white text on white background with this branch.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1355
http://jenkins.qa.ubuntu.com/job/unity8-ci/4607/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5813/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1593
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1701
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5467/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7065
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7065/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14505

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Much better. Opacity still seems higher in the design visuals to me, but it's close.

If you're going to use Theme.palette.normal.highlightText, mightn't you want to use Theme.palette.normal.highlight as the background color? (i.e. either use palette colors for both or hardcode both)

Also, highlightText isn't in the SDK: http://developer.ubuntu.com/api/qml/sdk-14.10/Ubuntu.Components.Themes.PaletteValues/ Is that from an older version of the SDK?

[Michael Terry (mterry)]

Nailed it! :)

 * 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.
 Naw, for normal reasons.

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1356
http://jenkins.qa.ubuntu.com/job/unity8-ci/4612/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5827
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1598
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1706
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7079
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7079/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14523

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

"""
- dragLauncherIntoView();
+ revealer.dragLauncherIntoView();
"""

"""
- dragLauncherIntoView();
+ revealer.dragLauncherIntoView();
"""

There's no "revealer" anymore in tst_Launcher.qml after the refactoring done by touchOwnership branch.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1358
http://jenkins.qa.ubuntu.com/job/unity8-ci/4625/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5868/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1721
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1719
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5519/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7120
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14589

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/rework-quicklist-visuals]

1359. By Michael Zanetti on 2014-10-13

fix bad merge

[Michael Zanetti (mzanetti)]

> """
> - dragLauncherIntoView();
> + revealer.dragLauncherIntoView();
> """
>
> """
> - dragLauncherIntoView();
> + revealer.dragLauncherIntoView();
> """
>
> There's no "revealer" anymore in tst_Launcher.qml after the refactoring done
> by touchOwnership branch.

fixxxt

[Daniel d'Andrada (dandrader)]

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1359
http://jenkins.qa.ubuntu.com/job/unity8-ci/4631/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5881/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1727
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1725
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5529/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7133
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7133/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14606

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/Dash/GenericScopeView.qml
1 conflicts encountered.

[lp:~mzanetti/unity8/rework-quicklist-visuals]

1360. By Michael Zanetti on 2014-10-14

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1360
http://jenkins.qa.ubuntu.com/job/unity8-ci/4654/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5933
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1748
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7185
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14668

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

qml/Dash/GenericScopeView.qml has a bad merge

[lp:~mzanetti/unity8/rework-quicklist-visuals]

1361. By Michael Zanetti on 2014-10-15

fix bad merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1361
http://jenkins.qa.ubuntu.com/job/unity8-ci/4660/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5951
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1646
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1754
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5593
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7203
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14701

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1361
http://jenkins.qa.ubuntu.com/job/unity8-ci/4702/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6056/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1688
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1796
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5685/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7308
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14848

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

LGTM again, merges fine

review: Approve

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2014-10-13 15:42:40 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-10-15 08:17:14 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItems
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItems
 import Unity.Launcher 0.1
 import Ubuntu.Components.Popups 0.1
 import "../Components/ListItems"
@@ -485,7 +485,7 @@
         id: quickListShape
         objectName: "quickListShape"
         anchors.fill: quickList
-        opacity: quickList.state === "open" ? 0.8 : 0
+        opacity: quickList.state === "open" ? 0.96 : 0
         visible: opacity > 0
         rotation: root.rotation
 
@@ -497,15 +497,15 @@
 
         Image {
             anchors {
-                right: parent.left
-                rightMargin: -units.dp(4)
+                left: parent.left
+                leftMargin: (quickList.item.width - units.gu(1)) / 2 - width / 2
                 verticalCenter: parent.verticalCenter
-                verticalCenterOffset: -quickList.offset
+                verticalCenterOffset: (parent.height / 2 + units.dp(3)) * (quickList.offset > 0 ? 1 : -1)
             }
             height: units.gu(1)
             width: units.gu(2)
             source: "graphics/quicklist_tooltip.png"
-            rotation: 90
+            rotation: quickList.offset > 0 ? 0 : 180
         }
 
         InverseMouseArea {
@@ -521,16 +521,16 @@
     Rectangle {
         id: quickList
         objectName: "quickList"
-        color: "#221e1c"
+        color: "#f5f5f5"
         width: units.gu(30)
         height: quickListColumn.height
         visible: quickListShape.visible
         anchors {
-            left: root.inverted ? undefined : parent.right
-            right: root.inverted ? parent.left : undefined
+            left: root.inverted ? undefined : parent.left
+            right: root.inverted ? parent.right : undefined
             margins: units.gu(1)
         }
-        y: itemCenter - (height / 2) + offset
+        y: itemCenter + offset
         rotation: root.rotation
 
         property var model
@@ -539,8 +539,9 @@
 
         // internal
         property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)
-        property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :
-                             itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0
+        property int offset: itemCenter + (item.height/2) + height + units.gu(1) > parent.height ?
+                                 -(item.height/2) - height - units.gu(.5) :
+                                 (item.height/2) + units.gu(.5)
 
         Column {
             id: quickListColumn
@@ -559,7 +560,7 @@
                     // FIXME: This is a workaround for the theme not being context sensitive. I.e. the
                     // ListItems don't know that they are sitting in a themed Popover where the color
                     // needs to be inverted.
-                    __foregroundColor: Theme.palette.selected.backgroundText
+                    __foregroundColor: "black"
 
                     onClicked: {
                         if (!model.clickable) {

=== modified file 'qml/Launcher/graphics/[e-mail]'
Binary files qml/Launcher/graphics/[e-mail]	2013-08-22 09:34:39 +0000 and qml/Launcher/graphics/[e-mail]	2014-10-15 08:17:14 +0000 differ
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2014-10-03 12:42:48 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2014-10-15 08:17:14 +0000
@@ -431,20 +431,20 @@
             }
 
             // Doing longpress
-            mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
-            tryCompare(quickListShape, "opacity", 0.8)
+            mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2);
+            tryCompare(quickListShape, "opacity", 0.96);
             mouseRelease(draggedItem);
 
-            verify(quickList.y >= units.gu(1))
-            verify(quickList.y + quickList.height + units.gu(1) <= launcher.height)
+            verify(quickList.y >= units.gu(1));
+            verify(quickList.y + quickList.height + units.gu(1) <= launcher.height);
 
             // Click somewhere in the empty space to dismiss the quicklist
             mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
-            tryCompare(quickListShape, "visible", false)
+            tryCompare(quickListShape, "visible", false);
 
             // Click somewhere in the empty space to dismiss the launcher
             mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));
-            waitUntilLauncherDisappears()
+            waitUntilLauncherDisappears();
         }
 
         function test_quicklist_click_data() {