git.iko.soy/unity8
on xenial help sign in
fixed card creator test
31ca93bAndrea Cimitan
tests/plugins/Dash/cardcreator/12.res+3−10
compare with xenial
unifiedsplit
@@ -30,14 +30,6 @@ Item {
30 objectName: "artShape";
30 objectName: "artShape";
31 visible: image.status == Image.Ready;
31 visible: image.status == Image.Ready;
32 readonly property alias image: artImage;
32 readonly property alias image: artImage;
33− ShaderEffectSource {
34− id: artShapeSource;
35− sourceItem: artImage;
36− anchors.centerIn: parent;
37− width: 1;
38− height: 1;
39− hideSource: true;
40− }
41 Loader {
33 Loader {
42 anchors.fill: parent;
34 anchors.fill: parent;
43 visible: true;
35 visible: true;
@@ -45,7 +37,7 @@ Item {
45 Component {
37 Component {
46 id: artShapeShapeComponent;
38 id: artShapeShapeComponent;
47 UbuntuShape {
39 UbuntuShape {
48− source: artShapeSource;
40+ source: artImage;
49 sourceFillMode: UbuntuShape.PreserveAspectCrop;
41 sourceFillMode: UbuntuShape.PreserveAspectCrop;
50 radius: "medium";
42 radius: "medium";
51 aspect: {
43 aspect: {
@@ -60,7 +52,7 @@ Item {
60 }
52 }
61 Component {
53 Component {
62 id: artShapeIconComponent;
54 id: artShapeIconComponent;
63− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
55+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
64 }
56 }
65 }
57 }
66 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
58 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
@@ -81,6 +73,7 @@ Item {
81 objectName: "artImage";
73 objectName: "artImage";
82 source: artShapeLoader.cardArt;
74 source: artShapeLoader.cardArt;
83 asynchronous: true;
75 asynchronous: true;
76+ visible: !true;
84 width: root.width;
77 width: root.width;
85 height: width / artShape.aspect;
78 height: width / artShape.aspect;
86 }
79 }
tests/plugins/Dash/cardcreator/12.res.cardcreator+3−10
@@ -29,14 +29,6 @@ Item {
29 objectName: "artShape";
29 objectName: "artShape";
30 visible: image.status == Image.Ready;
30 visible: image.status == Image.Ready;
31 readonly property alias image: artImage;
31 readonly property alias image: artImage;
32− ShaderEffectSource {
33− id: artShapeSource;
34− sourceItem: artImage;
35− anchors.centerIn: parent;
36− width: 1;
37− height: 1;
38− hideSource: true;
39− }
40 Loader {
32 Loader {
41 anchors.fill: parent;
33 anchors.fill: parent;
42 visible: true;
34 visible: true;
@@ -44,7 +36,7 @@ Item {
44 Component {
36 Component {
45 id: artShapeShapeComponent;
37 id: artShapeShapeComponent;
46 UbuntuShape {
38 UbuntuShape {
47− source: artShapeSource;
39+ source: artImage;
48 sourceFillMode: UbuntuShape.PreserveAspectCrop;
40 sourceFillMode: UbuntuShape.PreserveAspectCrop;
49 radius: "medium";
41 radius: "medium";
50 aspect: {
42 aspect: {
@@ -59,7 +51,7 @@ Item {
59 }
51 }
60 Component {
52 Component {
61 id: artShapeIconComponent;
53 id: artShapeIconComponent;
62− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
54+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
63 }
55 }
64 }
56 }
65 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
57 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
@@ -80,6 +72,7 @@ Item {
80 objectName: "artImage";
72 objectName: "artImage";
81 source: artShapeLoader.cardArt;
73 source: artShapeLoader.cardArt;
82 asynchronous: false;
74 asynchronous: false;
75+ visible: !true;
83 width: root.width;
76 width: root.width;
84 height: width / artShape.aspect;
77 height: width / artShape.aspect;
85 }
78 }