31ca93b · unity8 · git.iko.soy

git.iko.soy/unity8

fixed card creator test

commit31ca93bb88c21389b368aed1efaa020169391bee authorAndrea Cimitan <andrea.cimitan@gmail.com> dateWed 4 May 2016, 15:25 (10 years ago) parentb6df3a2

2 files changed+6−20

compare with xenial

unifiedsplit

tests/plugins/Dash/cardcreator/12.res+3−10 tests/plugins/Dash/cardcreator/12.res.cardcreator+3−10

tests/plugins/Dash/cardcreator/12.res+3−10

@@ -30,14 +30,6 @@ Item {

3030 objectName: "artShape";

3131 visible: image.status == Image.Ready;

3232 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− }

4133 Loader {

4234 anchors.fill: parent;

4335 visible: true;

@@ -45,7 +37,7 @@ Item {

4537 Component {

4638 id: artShapeShapeComponent;

4739 UbuntuShape {

48− source: artShapeSource;

40+ source: artImage;

4941 sourceFillMode: UbuntuShape.PreserveAspectCrop;

5042 radius: "medium";

5143 aspect: {

@@ -60,7 +52,7 @@ Item {

6052 }

6153 Component {

6254 id: artShapeIconComponent;

63− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

55+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

6456 }

6557 }

6658 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -81,6 +73,7 @@ Item {

8173 objectName: "artImage";

8274 source: artShapeLoader.cardArt;

8375 asynchronous: true;

76+ visible: !true;

8477 width: root.width;

8578 height: width / artShape.aspect;

8679 }

tests/plugins/Dash/cardcreator/12.res.cardcreator+3−10

@@ -29,14 +29,6 @@ Item {

2929 objectName: "artShape";

3030 visible: image.status == Image.Ready;

3131 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− }

4032 Loader {

4133 anchors.fill: parent;

4234 visible: true;

@@ -44,7 +36,7 @@ Item {

4436 Component {

4537 id: artShapeShapeComponent;

4638 UbuntuShape {

47− source: artShapeSource;

39+ source: artImage;

4840 sourceFillMode: UbuntuShape.PreserveAspectCrop;

4941 radius: "medium";

5042 aspect: {

@@ -59,7 +51,7 @@ Item {

5951 }

6052 Component {

6153 id: artShapeIconComponent;

62− ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }

54+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }

6355 }

6456 }

6557 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

@@ -80,6 +72,7 @@ Item {

8072 objectName: "artImage";

8173 source: artShapeLoader.cardArt;

8274 asynchronous: false;

75+ visible: !true;

8376 width: root.width;

8477 height: width / artShape.aspect;

8578 }