git.iko.soy/unity8
on xenial help sign in
Fix regression introduced by the concierge change

borderSource was being assigned incorrectly, bubbled up the property with an alias to the parent item so that less code has to be changed

commit78c378cd218d39c2f28a9ba8006d7cb22f4106fd authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 12 May 2015, 15:47 (11 years ago) parent948f323
4 files changed+8
compare with xenial
unifiedsplit
plugins/Dash/CardCreator.js+2 tests/plugins/Dash/cardcreator/1.res+2 tests/plugins/Dash/cardcreator/3.res+2 tests/plugins/Dash/cardcreator/5.res+2
plugins/Dash/CardCreator.js+2
@@ -70,6 +70,7 @@ var kArtShapeHolderCode = 'Item { \n\
7070 property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\
7171 visible: image.status == Image.Ready; \n\
7272 readonly property alias image: artImage.image; \n\
73+ property alias borderSource: artShapeShape.borderSource; \n\
7374 ShaderEffectSource { \n\
7475 id: artShapeSource; \n\
7576 sourceItem: artImage; \n\
@@ -79,6 +80,7 @@ var kArtShapeHolderCode = 'Item { \n\
7980 hideSource: doShapeItem; \n\
8081 } \n\
8182 Shape { \n\
83+ id: artShapeShape; \n\
8284 image: artShapeSource; \n\
8385 anchors.fill: parent; \n\
8486 visible: doShapeItem; \n\
tests/plugins/Dash/cardcreator/1.res+2
@@ -34,6 +34,7 @@ Item {
3434 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
3535 visible: image.status == Image.Ready;
3636 readonly property alias image: artImage.image;
37+ property alias borderSource: artShapeShape.borderSource;
3738 ShaderEffectSource {
3839 id: artShapeSource;
3940 sourceItem: artImage;
@@ -43,6 +44,7 @@ Item {
4344 hideSource: doShapeItem;
4445 }
4546 Shape {
47+ id: artShapeShape;
4648 image: artShapeSource;
4749 anchors.fill: parent;
4850 visible: doShapeItem;
tests/plugins/Dash/cardcreator/3.res+2
@@ -34,6 +34,7 @@ Item {
3434 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
3535 visible: image.status == Image.Ready;
3636 readonly property alias image: artImage.image;
37+ property alias borderSource: artShapeShape.borderSource;
3738 ShaderEffectSource {
3839 id: artShapeSource;
3940 sourceItem: artImage;
@@ -43,6 +44,7 @@ Item {
4344 hideSource: doShapeItem;
4445 }
4546 Shape {
47+ id: artShapeShape;
4648 image: artShapeSource;
4749 anchors.fill: parent;
4850 visible: doShapeItem;
tests/plugins/Dash/cardcreator/5.res+2
@@ -34,6 +34,7 @@ Item {
3434 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
3535 visible: image.status == Image.Ready;
3636 readonly property alias image: artImage.image;
37+ property alias borderSource: artShapeShape.borderSource;
3738 ShaderEffectSource {
3839 id: artShapeSource;
3940 sourceItem: artImage;
@@ -43,6 +44,7 @@ Item {
4344 hideSource: doShapeItem;
4445 }
4546 Shape {
47+ id: artShapeShape;
4648 image: artShapeSource;
4749 anchors.fill: parent;
4850 visible: doShapeItem;