Merge lp:~aacid/unity8/40-50-90-dash into lp:unity8

[Albert Astals Cid]

dummy message. to be changed before landing (silo build requires it)

This is more a test so people can test the whole 40/50/90 experience fast probably needs better code if we're going to go with it.

See pre-requisite for testing instructions.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1838
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~aacid/unity8/40-50-90-dash/+merge/263536/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5915/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/236/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/196
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/158/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/236
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21601

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1838
http://jenkins.qa.ubuntu.com/job/unity8-ci/5920/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/201
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/241
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21618

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1838. By Albert Astals Cid on 2015-07-01

Some quick fiddling with sizes to have a 40/50/90gu prototype for the Dash

1837. By Michael Zanetti on 2015-07-01

fix greeter not being swipable from the edge

1836. By Michael Zanetti on 2015-07-01

revert bad change

1835. By Michael Zanetti on 2015-07-01

fixes

1834. By Michael Zanetti on 2015-06-30

fix mouse event eater in launcher

1833. By Michael Zanetti on 2015-06-30

restrict viewport to 40, 50 or 90 gu

1832. By Michael Zanetti on 2015-06-29

merge orientedShellFixes

=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2015-05-13 10:24:18 +0000
+++ qml/Dash/CardTool.qml	2015-07-01 15:43:51 +0000
@@ -80,16 +80,25 @@
 
      If undefined, should use implicit width of the actual card.
      */
-    readonly property var cardWidth: {
+    property var cardWidth: {
         switch (categoryLayout) {
             case "grid":
             case "vertical-journal":
-                if (template["card-layout"] === "horizontal") return units.gu(38);
-                switch (template["card-size"]) {
-                    case "small": return units.gu(12);
-                    case "large": return units.gu(38);
+                var size = template["card-size"];
+                if (template["card-layout"] === "horizontal") size = "large";
+                switch (size) {
+                    case "small": {
+                        if (viewWidth == units.gu(40)) return units.gu(12);
+                        else return units.gu(14);
+                    }
+                    case "large": {
+                        if (viewWidth == units.gu(90)) return units.gu(42);
+                        else return viewWidth - units.gu(2);
+                    }
                 }
-                return units.gu(18.5);
+                if (viewWidth == units.gu(40)) return units.gu(18);
+                else if (viewWidth == units.gu(50)) return units.gu(23);
+                else return units.gu(20);
             case "carousel":
             case "horizontal-list":
                 return carouselTool.minimumTileWidth;

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2015-06-16 15:12:33 +0000
+++ qml/Dash/GenericScopeView.qml	2015-07-01 15:43:51 +0000
@@ -332,6 +332,11 @@
                     updateRanges();
                     if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {
                         // Yeah, hackish :/
+                        if (scopeView.width === units.gu(50)) {
+                            cardTool.cardWidth = units.gu(10);
+                        } else if (scopeView.width === units.gu(90)) {
+                            cardTool.cardWidth = units.gu(9);
+                        }
                         cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
                     }
                     item.cardTool = cardTool;