Merge lp:~aacid/unity8/fixTodayScope into lp:unity8

[Albert Astals Cid]

Set width of title label when inside the title row

 * Are there any related MPs required for this MP to build/function as expected?
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

 * Did you have a look at the warnings when running tests? Can they be reduced?
No new warnings

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1825
http://jenkins.qa.ubuntu.com/job/unity8-ci/5842/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/137/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/123
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/89/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/137
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21347

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

review: Needs Fixing (continuous-integration)

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

review: Approve

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2015-06-16 15:12:28 +0000
+++ plugins/Dash/CardCreator.js	2015-06-22 08:48:09 +0000
@@ -155,7 +155,7 @@
 
 // multiple row version of HeaderRowCode
 function kHeaderRowCodeGenerator() {
-var kHeaderRowCodeTemplate = 'Row { \n\
+    var kHeaderRowCodeTemplate = 'Row { \n\
                         id: row; \n\
                         objectName: "outerRow"; \n\
                         property real margins: units.gu(1); \n\
@@ -220,6 +220,7 @@
 // %1 is used as anchors of titleLabel
 // %2 is used as color of titleLabel
 // %3 is used as extra condition for visible of titleLabel
+// %4 is used as title width
 var kTitleLabelCode = 'Label { \n\
                         id: titleLabel; \n\
                         objectName: "titleLabel"; \n\
@@ -231,6 +232,7 @@
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
                         color: %2; \n\
                         visible: showHeader %3; \n\
+                        width: %4; \n\
                         text: root.title; \n\
                         font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
                         horizontalAlignment: root.titleAlignment; \n\
@@ -491,6 +493,7 @@
         var attributesAnchors;
         var titleContainerAnchors;
         var titleRightAnchor;
+        var titleWidth = "undefined";
 
         var extraRightAnchor = '';
         var extraLeftAnchor = '';
@@ -534,8 +537,9 @@
                 attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
             }
         } else if (hasMascot) {
-            // Using row + titleContainer
+            // Using row without titleContainer
             titleAnchors = 'verticalCenter: parent.verticalCenter;\n';
+            titleWidth = "parent.width - x";
         } else {
             if (headerAsOverlay) {
                 // Using anchors to the overlay
@@ -573,7 +577,7 @@
 
         // code for different elements
         var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
-        var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra);
+        var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth);
         var subtitleCode;
         var attributesCode;
 

=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res	2015-06-16 15:12:28 +0000
+++ tests/plugins/Dash/cardcreator/1.res	2015-06-22 08:48:09 +0000
@@ -89,6 +89,7 @@
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
                         visible: showHeader ; 
+                        width: undefined;
                         text: root.title; 
                         font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
                         horizontalAlignment: root.titleAlignment; 

=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2015-05-13 10:21:18 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2015-06-22 08:48:09 +0000
@@ -90,6 +90,7 @@
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
+                        width: undefined;
                         text: root.title; 
                         font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
                         horizontalAlignment: root.titleAlignment; 

=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2015-06-16 15:12:28 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2015-06-22 08:48:09 +0000
@@ -89,6 +89,7 @@
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
                         visible: showHeader ; 
+                        width: undefined;
                         text: root.title; 
                         font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
                         horizontalAlignment: root.titleAlignment; 

=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res	2015-05-13 10:21:18 +0000
+++ tests/plugins/Dash/cardcreator/4.res	2015-06-22 08:48:09 +0000
@@ -74,6 +74,7 @@
                     font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                     color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
                     visible: showHeader ; 
+                    width: undefined;
                     text: root.title; 
                     font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
                     horizontalAlignment: root.titleAlignment; 

=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2015-06-16 15:12:28 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2015-06-22 08:48:09 +0000
@@ -133,6 +133,7 @@
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                         visible: showHeader && overlayLoader.active; 
+                        width: undefined;
                         text: root.title; 
                         font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
                         horizontalAlignment: root.titleAlignment; 

=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res	2015-05-13 10:21:18 +0000
+++ tests/plugins/Dash/cardcreator/6.res	2015-06-22 08:48:09 +0000
@@ -69,6 +69,7 @@
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
+                        width: undefined;
                         text: root.title; 
                         font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
                         horizontalAlignment: root.titleAlignment; 

=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2015-05-13 10:21:18 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2015-06-22 08:48:09 +0000
@@ -91,6 +91,7 @@
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
                         color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
+                        width: undefined;
                         text: root.title; 
                         font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
                         horizontalAlignment: root.titleAlignment; 

=== added file 'tests/plugins/Dash/cardcreator/8.res'
--- tests/plugins/Dash/cardcreator/8.res	1970-01-01 00:00:00 +0000
+++ tests/plugins/Dash/cardcreator/8.res	2015-06-22 08:48:09 +0000
@@ -0,0 +1,102 @@
+AbstractButton { 
+                id: root; 
+                property var components; 
+                property var cardData; 
+                property var artShapeBorderSource: undefined; 
+                property real fontScale: 1.0; 
+                property var scopeStyle: null; 
+                property int titleAlignment: Text.AlignLeft; 
+                property int fixedHeaderHeight: -1; 
+                property size fixedArtShapeSize: Qt.size(-1, -1); 
+                readonly property string title: cardData && cardData["title"] || ""; 
+                property bool asynchronous: true; 
+                property bool showHeader: true; 
+                implicitWidth: childrenRect.width; 
+                enabled: true; 
+                
+Loader {
+                                id: backgroundLoader; 
+                                objectName: "backgroundLoader"; 
+                                anchors.fill: parent; 
+                                asynchronous: root.asynchronous; 
+                                visible: status == Loader.Ready; 
+                                sourceComponent: UbuntuShape { 
+                                    objectName: "background"; 
+                                    radius: "medium"; 
+                                    color: getColor(0) || "white"; 
+                                    gradientColor: getColor(1) || color; 
+                                    anchors.fill: parent; 
+                                    image: backgroundImage.source ? backgroundImage : null; 
+                                    property real luminance: Style.luminance(color); 
+                                    property Image backgroundImage: Image { 
+                                        objectName: "backgroundImage"; 
+                                        source: { 
+                                            if (cardData && typeof cardData["background"] === "string") return cardData["background"]; 
+                                            else return ""; 
+                                        } 
+                                    } 
+                                    function getColor(index) { 
+                                        if (cardData && typeof cardData["background"] === "object" 
+                                            && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) { 
+                                            return cardData["background"]["elements"][index]; 
+                                        } else return index === 0 ? "#E9E9E9" : "#E9AAE9"; 
+                                    } 
+                                } 
+                            }
+readonly property size artShapeSize: Qt.size(-1, -1);
+readonly property int headerHeight: row.height;
+Row { 
+                        id: row; 
+                        objectName: "outerRow"; 
+                        property real margins: units.gu(1); 
+                        spacing: margins; 
+                        height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; 
+                        anchors { top: parent.top; 
+                                     topMargin: units.gu(1);
+left: parent.left;
+ } 
+                        anchors.right: parent.right; 
+                        anchors.margins: margins; 
+                        anchors.rightMargin: 0; 
+                        data: [ 
+                                CroppedImageMinimumSourceSize { 
+                            id: mascotImage; 
+                            objectName: "mascotImage"; 
+                            anchors { verticalCenter: parent.verticalCenter; } 
+                            source: cardData && cardData["mascot"] || ""; 
+                            width: units.gu(6); 
+                            height: units.gu(5.625); 
+                            horizontalAlignment: Image.AlignHCenter; 
+                            verticalAlignment: Image.AlignVCenter; 
+                            visible: showHeader; 
+                        }
+,Label { 
+                        id: titleLabel; 
+                        objectName: "titleLabel"; 
+                        anchors { verticalCenter: parent.verticalCenter;
+ } 
+                        elide: Text.ElideRight; 
+                        fontSize: "small"; 
+                        wrapMode: Text.Wrap; 
+                        maximumLineCount: 2; 
+                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white"); 
+                        visible: showHeader ; 
+                        width: parent.width - x; 
+                        text: root.title; 
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.titleAlignment; 
+                    }
+ 
+                                ] 
+                    }
+UbuntuShape { 
+                        id: touchdown; 
+                        objectName: "touchdown"; 
+                        anchors { fill: backgroundLoader } 
+                        visible: root.pressed; 
+                        radius: "medium"; 
+                        borderSource: "radius_pressed.sci" 
+                    }
+implicitHeight: row.y + row.height + units.gu(1);
+}

=== added file 'tests/plugins/Dash/cardcreator/8.tst'
--- tests/plugins/Dash/cardcreator/8.tst	1970-01-01 00:00:00 +0000
+++ tests/plugins/Dash/cardcreator/8.tst	2015-06-22 08:48:09 +0000
@@ -0,0 +1,3 @@
+template: {"card-background":{"elements":["#E9E9E9","#E9AAE9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}
+components: {"background":{"field":"background"},"mascot":{"field":"icon"},"title":{"field":"title"},"attributes":{}}
+result: 8.res