git.iko.soy/unity8
on xenial help sign in
Fix regression introduced by the concierge change
086eb86Albert Astals Cid
plugins/Dash/CardCreator.js+2
compare with xenial
unifiedsplit
@@ -69,6 +69,7 @@ var kArtShapeHolderCode = 'Item { \n\
69 property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\
69 property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\
70 visible: image.status == Image.Ready; \n\
70 visible: image.status == Image.Ready; \n\
71 readonly property alias image: artImage.image; \n\
71 readonly property alias image: artImage.image; \n\
72+ property alias borderSource: artShapeShape.borderSource; \n\
72 ShaderEffectSource { \n\
73 ShaderEffectSource { \n\
73 id: artShapeSource; \n\
74 id: artShapeSource; \n\
74 sourceItem: artImage; \n\
75 sourceItem: artImage; \n\
@@ -78,6 +79,7 @@ var kArtShapeHolderCode = 'Item { \n\
78 hideSource: doShapeItem; \n\
79 hideSource: doShapeItem; \n\
79 } \n\
80 } \n\
80 Shape { \n\
81 Shape { \n\
82+ id: artShapeShape; \n\
81 image: artShapeSource; \n\
83 image: artShapeSource; \n\
82 anchors.fill: parent; \n\
84 anchors.fill: parent; \n\
83 visible: doShapeItem; \n\
85 visible: doShapeItem; \n\
tests/plugins/Dash/cardcreator/1.res+2
@@ -33,6 +33,7 @@ Item {
33 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
33 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
34 visible: image.status == Image.Ready;
34 visible: image.status == Image.Ready;
35 readonly property alias image: artImage.image;
35 readonly property alias image: artImage.image;
36+ property alias borderSource: artShapeShape.borderSource;
36 ShaderEffectSource {
37 ShaderEffectSource {
37 id: artShapeSource;
38 id: artShapeSource;
38 sourceItem: artImage;
39 sourceItem: artImage;
@@ -42,6 +43,7 @@ Item {
42 hideSource: doShapeItem;
43 hideSource: doShapeItem;
43 }
44 }
44 Shape {
45 Shape {
46+ id: artShapeShape;
45 image: artShapeSource;
47 image: artShapeSource;
46 anchors.fill: parent;
48 anchors.fill: parent;
47 visible: doShapeItem;
49 visible: doShapeItem;
tests/plugins/Dash/cardcreator/3.res+2
@@ -33,6 +33,7 @@ Item {
33 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
33 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
34 visible: image.status == Image.Ready;
34 visible: image.status == Image.Ready;
35 readonly property alias image: artImage.image;
35 readonly property alias image: artImage.image;
36+ property alias borderSource: artShapeShape.borderSource;
36 ShaderEffectSource {
37 ShaderEffectSource {
37 id: artShapeSource;
38 id: artShapeSource;
38 sourceItem: artImage;
39 sourceItem: artImage;
@@ -42,6 +43,7 @@ Item {
42 hideSource: doShapeItem;
43 hideSource: doShapeItem;
43 }
44 }
44 Shape {
45 Shape {
46+ id: artShapeShape;
45 image: artShapeSource;
47 image: artShapeSource;
46 anchors.fill: parent;
48 anchors.fill: parent;
47 visible: doShapeItem;
49 visible: doShapeItem;
tests/plugins/Dash/cardcreator/5.res+2
@@ -33,6 +33,7 @@ Item {
33 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
33 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
34 visible: image.status == Image.Ready;
34 visible: image.status == Image.Ready;
35 readonly property alias image: artImage.image;
35 readonly property alias image: artImage.image;
36+ property alias borderSource: artShapeShape.borderSource;
36 ShaderEffectSource {
37 ShaderEffectSource {
37 id: artShapeSource;
38 id: artShapeSource;
38 sourceItem: artImage;
39 sourceItem: artImage;
@@ -42,6 +43,7 @@ Item {
42 hideSource: doShapeItem;
43 hideSource: doShapeItem;
43 }
44 }
44 Shape {
45 Shape {
46+ id: artShapeShape;
45 image: artShapeSource;
47 image: artShapeSource;
46 anchors.fill: parent;
48 anchors.fill: parent;
47 visible: doShapeItem;
49 visible: doShapeItem;
tests/qmltests/Dash/tst_GenericScopeView.qml+9
@@ -652,6 +652,15 @@ Item {
652 compare(touchdown.visible, false);
652 compare(touchdown.visible, false);
653 closePreview();
653 closePreview();
654 }
654 }
655+
656+ function test_carousel_borderSource() {
657+ var category = scrollToCategory("dashCategory1");
658+ var tile = findChild(category, "carouselDelegate0");
659+ tryCompareFunction(function() { return findChild(tile, "artShapeLoader") !== null; }, true);
660+ var artShapeLoader = findChild(tile, "artShapeLoader");
661+ var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
662+ compare(shape.borderSource, undefined);
663+ }
655 }
664 }
656 }
665 }
657}
666}