Merge lp:~cimi/unity8/fix-1536745 into lp:unity8

[Andrea Cimitan]

Dynamically change click scope card size according to size

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2138
http://jenkins.qa.ubuntu.com/job/unity8-ci/7132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6144
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/547/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1837
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1732
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6155
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26944
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/282/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/545
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/545/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26948

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

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2138
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/174/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/174/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2139
http://jenkins.qa.ubuntu.com/job/unity8-ci/7136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6157
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/551/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1841
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4751
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6168
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26965
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/286/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/549
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/549/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26964

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

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2139
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/178/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/178/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

The return; in if (scopeView.width >= units.gu(70)) { makes artShapeSize not be set, no?

review: Needs Fixing

[lp:~cimi/unity8/fix-1536745]

2140. By Andrea Cimitan on 2016-01-28

Moved some code in more logic place

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2140
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/218/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/218/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2140
http://jenkins.qa.ubuntu.com/job/unity8-ci/7168/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6236
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/583/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1873
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/576
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1768
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1768
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6247
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6247/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27115
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/302/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/581
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/581/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27117

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

> The return; in if (scopeView.width >= units.gu(70)) { makes artShapeSize not
> be set, no?

it should not require being changed anyway, but I moved it up in the onLoaded of the loader because it's better there since it doesnt need to be recalculated twice :)

[Albert Astals Cid (aacid)]

> it should not require being changed anyway
No, it's not required to change, but as it was, it was never set even once.

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
No, Saviq will test with the whole silo

 * Did CI run pass?
Mostly yes, some known hickups not related

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

review: Approve (code looks good)

[Michał Sawicz (saviq)]

Approving per cimi's silo testing

=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2016-01-28 10:49:58 +0000
+++ qml/Dash/CardGrid.qml	2016-01-28 10:49:59 +0000
@@ -20,6 +20,7 @@
 DashRenderer {
     id: root
 
+    readonly property real defaultMinimumHorizontalSpacing: units.gu(1)
     readonly property int collapsedRows: {
         if (!cardTool || !cardTool.template || typeof cardTool.template["collapsed-rows"] != "number") return 2;
         return cardTool.template["collapsed-rows"];
@@ -46,7 +47,7 @@
     ResponsiveGridView {
         id: grid
         anchors.fill: parent
-        minimumHorizontalSpacing: units.gu(1)
+        minimumHorizontalSpacing: root.defaultMinimumHorizontalSpacing
         delegateWidth: cardTool.cardWidth
         delegateHeight: cardTool.cardHeight
         verticalSpacing: units.gu(1)

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-01-28 10:49:58 +0000
+++ qml/Dash/GenericScopeView.qml	2016-01-28 10:49:59 +0000
@@ -360,17 +360,9 @@
                         baseItem.expand(shouldExpand, false /*animate*/);
                     }
                     updateRanges();
+                    clickScopeSizingHacks();
                     if (scope && scope.id === "clickscope") {
                         if (categoryId === "predefined" || categoryId === "local") {
-                            // Yeah, hackish :/
-                            if (scopeView.width > units.gu(45)) {
-                                if (scopeView.width >= units.gu(70)) {
-                                    cardTool.cardWidth = units.gu(11);
-                                    item.minimumHorizontalSpacing = units.gu(5)
-                                } else {
-                                    cardTool.cardWidth = units.gu(10);
-                                }
-                            }
                             cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
                             item.artShapeStyle = "icon";
                         } else {
@@ -388,6 +380,23 @@
                     }
                 }
 
+                function clickScopeSizingHacks() {
+                    if (scope && scope.id === "clickscope" &&
+                        (categoryId === "predefined" || categoryId === "local")) {
+                        // Yeah, hackish :/
+                        if (scopeView.width > units.gu(45)) {
+                            if (scopeView.width >= units.gu(70)) {
+                                cardTool.cardWidth = units.gu(11);
+                                item.minimumHorizontalSpacing = units.gu(5);
+                                return;
+                            } else {
+                                cardTool.cardWidth = units.gu(10);
+                            }
+                        }
+                        item.minimumHorizontalSpacing = item.defaultMinimumHorizontalSpacing;
+                    }
+                }
+
                 Connections {
                     target: rendererLoader.item
                     onClicked: { // (int index, var result, var item, var itemModel)
@@ -417,6 +426,7 @@
                     target: scopeView
                     onIsCurrentChanged: rendererLoader.updateRanges();
                     onVisibleToParentChanged: rendererLoader.updateRanges();
+                    onWidthChanged: rendererLoader.clickScopeSizingHacks();
                 }
                 Connections {
                     target: holdingList

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2016-01-28 10:49:58 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-01-28 10:49:59 +0000
@@ -666,6 +666,26 @@
                 var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
                 compare(shape.borderSource, undefined);
             }
+
+            function test_clickScopeSizing() {
+                genericScopeView.scope = scopes.getScopeFromAll("clickscope");
+                waitForRendering(genericScopeView);
+
+                var categoryListView = findChild(genericScopeView, "categoryListView");
+                waitForRendering(categoryListView);
+
+                var categorypredefined = findChild(categoryListView, "dashCategorypredefined");
+                waitForRendering(categorypredefined);
+
+                var cardTool = findChild(categorypredefined, "cardTool");
+
+                compare(cardTool.cardWidth, units.gu(11));
+                shell.width = units.gu(46);
+                waitForRendering(genericScopeView);
+                compare(cardTool.cardWidth, units.gu(10));
+
+                shell.width = units.gu(120)
+            }
         }
     }
 }