@@ -68,14 +68,6 @@ Item {
68 objectName: "artShape";
68 objectName: "artShape";
69 visible: image.status == Image.Ready;
69 visible: image.status == Image.Ready;
70 readonly property alias image: artImage;
70 readonly property alias image: artImage;
73− sourceItem: artImage;
74− anchors.centerIn: parent;
80 anchors.fill: parent;
72 anchors.fill: parent;
81 visible: true;
73 visible: true;
@@ -83,7 +75,7 @@ Item {
83 Component {
75 Component {
84 id: artShapeShapeComponent;
76 id: artShapeShapeComponent;
85 UbuntuShape {
77 UbuntuShape {
86− source: artShapeSource;
78+ source: artImage;
87 sourceFillMode: UbuntuShape.PreserveAspectCrop;
79 sourceFillMode: UbuntuShape.PreserveAspectCrop;
88 radius: "medium";
80 radius: "medium";
89 aspect: {
81 aspect: {
@@ -98,7 +90,7 @@ Item {
99 Component {
91 Component {
100 id: artShapeIconComponent;
92 id: artShapeIconComponent;
101− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
93+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
104 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
96 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
@@ -119,6 +111,7 @@ Item {
119 objectName: "artImage";
111 objectName: "artImage";
120 source: artShapeLoader.cardArt;
112 source: artShapeLoader.cardArt;
121 asynchronous: true;
113 asynchronous: true;
122 width: root.width;
115 width: root.width;
123 height: width / artShape.aspect;
116 height: width / artShape.aspect;
124 onStatusChanged: if (status === Image.Error) source = decodeURI("%5C");
117 onStatusChanged: if (status === Image.Error) source = decodeURI("%5C");