git.iko.soy/unity8
on xenial help sign in
Fix regression introduced by the concierge change
78c378cAlbert Astals Cid
plugins/Dash/CardCreator.js+2
compare with xenial
unifiedsplit
@@ -70,6 +70,7 @@ var kArtShapeHolderCode = 'Item { \n\
70 property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\
70 property bool doShapeItem: components["art"]["conciergeMode"] !== true; \n\
71 visible: image.status == Image.Ready; \n\
71 visible: image.status == Image.Ready; \n\
72 readonly property alias image: artImage.image; \n\
72 readonly property alias image: artImage.image; \n\
73+ property alias borderSource: artShapeShape.borderSource; \n\
73 ShaderEffectSource { \n\
74 ShaderEffectSource { \n\
74 id: artShapeSource; \n\
75 id: artShapeSource; \n\
75 sourceItem: artImage; \n\
76 sourceItem: artImage; \n\
@@ -79,6 +80,7 @@ var kArtShapeHolderCode = 'Item { \n\
79 hideSource: doShapeItem; \n\
80 hideSource: doShapeItem; \n\
80 } \n\
81 } \n\
81 Shape { \n\
82 Shape { \n\
83+ id: artShapeShape; \n\
82 image: artShapeSource; \n\
84 image: artShapeSource; \n\
83 anchors.fill: parent; \n\
85 anchors.fill: parent; \n\
84 visible: doShapeItem; \n\
86 visible: doShapeItem; \n\
tests/plugins/Dash/cardcreator/1.res+2
@@ -34,6 +34,7 @@ Item {
34 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
34 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
35 visible: image.status == Image.Ready;
35 visible: image.status == Image.Ready;
36 readonly property alias image: artImage.image;
36 readonly property alias image: artImage.image;
37+ property alias borderSource: artShapeShape.borderSource;
37 ShaderEffectSource {
38 ShaderEffectSource {
38 id: artShapeSource;
39 id: artShapeSource;
39 sourceItem: artImage;
40 sourceItem: artImage;
@@ -43,6 +44,7 @@ Item {
43 hideSource: doShapeItem;
44 hideSource: doShapeItem;
44 }
45 }
45 Shape {
46 Shape {
47+ id: artShapeShape;
46 image: artShapeSource;
48 image: artShapeSource;
47 anchors.fill: parent;
49 anchors.fill: parent;
48 visible: doShapeItem;
50 visible: doShapeItem;
tests/plugins/Dash/cardcreator/3.res+2
@@ -34,6 +34,7 @@ Item {
34 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
34 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
35 visible: image.status == Image.Ready;
35 visible: image.status == Image.Ready;
36 readonly property alias image: artImage.image;
36 readonly property alias image: artImage.image;
37+ property alias borderSource: artShapeShape.borderSource;
37 ShaderEffectSource {
38 ShaderEffectSource {
38 id: artShapeSource;
39 id: artShapeSource;
39 sourceItem: artImage;
40 sourceItem: artImage;
@@ -43,6 +44,7 @@ Item {
43 hideSource: doShapeItem;
44 hideSource: doShapeItem;
44 }
45 }
45 Shape {
46 Shape {
47+ id: artShapeShape;
46 image: artShapeSource;
48 image: artShapeSource;
47 anchors.fill: parent;
49 anchors.fill: parent;
48 visible: doShapeItem;
50 visible: doShapeItem;
tests/plugins/Dash/cardcreator/5.res+2
@@ -34,6 +34,7 @@ Item {
34 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
34 property bool doShapeItem: components["art"]["conciergeMode"] !== true;
35 visible: image.status == Image.Ready;
35 visible: image.status == Image.Ready;
36 readonly property alias image: artImage.image;
36 readonly property alias image: artImage.image;
37+ property alias borderSource: artShapeShape.borderSource;
37 ShaderEffectSource {
38 ShaderEffectSource {
38 id: artShapeSource;
39 id: artShapeSource;
39 sourceItem: artImage;
40 sourceItem: artImage;
@@ -43,6 +44,7 @@ Item {
43 hideSource: doShapeItem;
44 hideSource: doShapeItem;
44 }
45 }
45 Shape {
46 Shape {
47+ id: artShapeShape;
46 image: artShapeSource;
48 image: artShapeSource;
47 anchors.fill: parent;
49 anchors.fill: parent;
48 visible: doShapeItem;
50 visible: doShapeItem;