178aa7d · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix creator expected code

178aa7dAlbert Astals12 years ago

tests/plugins/Dash/cardcreator/1.res+2−8

compare with xenial

@@ -33,19 +33,14 @@ Item {

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

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

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

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

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36− readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;

37 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

36 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

38− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

39 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

37 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

40 function updateWidthHeightBindings() {

38 function updateWidthHeightBindings() {

41 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

39 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

42 width = root.fixedArtShapeSize.width;

40 width = root.fixedArtShapeSize.width;

43 height = root.fixedArtShapeSize.height;

41 height = root.fixedArtShapeSize.height;

44− } else if (aspectSmallerThanImageAspect) {

45− width = Qt.binding(function() { return !visible ? 0 : image.width });

46− height = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.height : width / image.aspect });

47 } else {

42 } else {

48− width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect });

43+ width = Qt.binding(function() { return !visible ? 0 : image.width });

49 height = Qt.binding(function() { return !visible ? 0 : image.height });

44 height = Qt.binding(function() { return !visible ? 0 : image.height });

50 }

45 }

51 }

46 }

@@ -54,8 +49,7 @@ Item {

54 source: cardData && cardData["art"] || "";

49 source: cardData && cardData["art"] || "";

55 cache: true;

50 cache: true;

56 asynchronous: root.asynchronous;

51 asynchronous: root.asynchronous;

57− fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop;

52+ fillMode: Image.PreserveAspectCrop;

58− readonly property real aspect: implicitWidth / implicitHeight;

59 width: root.width;

53 width: root.width;

60 height: width / artShape.aspect;

54 height: width / artShape.aspect;

61 }

55 }

tests/plugins/Dash/cardcreator/3.res+2−8

@@ -33,19 +33,14 @@ Item {

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

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

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

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

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36− readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;

37 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

36 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

38− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

39 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

37 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

40 function updateWidthHeightBindings() {

38 function updateWidthHeightBindings() {

41 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

39 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

42 width = root.fixedArtShapeSize.width;

40 width = root.fixedArtShapeSize.width;

43 height = root.fixedArtShapeSize.height;

41 height = root.fixedArtShapeSize.height;

44− } else if (aspectSmallerThanImageAspect) {

45− width = Qt.binding(function() { return !visible ? 0 : image.width });

46− height = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.height : width / image.aspect });

47 } else {

42 } else {

48− width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect });

43+ width = Qt.binding(function() { return !visible ? 0 : image.width });

49 height = Qt.binding(function() { return !visible ? 0 : image.height });

44 height = Qt.binding(function() { return !visible ? 0 : image.height });

50 }

45 }

51 }

46 }

@@ -54,8 +49,7 @@ Item {

54 source: cardData && cardData["art"] || "";

49 source: cardData && cardData["art"] || "";

55 cache: true;

50 cache: true;

56 asynchronous: root.asynchronous;

51 asynchronous: root.asynchronous;

57− fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop;

52+ fillMode: Image.PreserveAspectCrop;

58− readonly property real aspect: implicitWidth / implicitHeight;

59 width: root.width;

53 width: root.width;

60 height: width / artShape.aspect;

54 height: width / artShape.aspect;

61 }

55 }

tests/plugins/Dash/cardcreator/5.res+2−8

@@ -33,19 +33,14 @@ Item {

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

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

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

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

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36− readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;

37 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

36 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

38− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

39 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

37 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

40 function updateWidthHeightBindings() {

38 function updateWidthHeightBindings() {

41 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

39 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

42 width = root.fixedArtShapeSize.width;

40 width = root.fixedArtShapeSize.width;

43 height = root.fixedArtShapeSize.height;

41 height = root.fixedArtShapeSize.height;

44− } else if (aspectSmallerThanImageAspect) {

45− width = Qt.binding(function() { return !visible ? 0 : image.width });

46− height = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.height : width / image.aspect });

47 } else {

42 } else {

48− width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect });

43+ width = Qt.binding(function() { return !visible ? 0 : image.width });

49 height = Qt.binding(function() { return !visible ? 0 : image.height });

44 height = Qt.binding(function() { return !visible ? 0 : image.height });

50 }

45 }

51 }

46 }

@@ -54,8 +49,7 @@ Item {

54 source: cardData && cardData["art"] || "";

49 source: cardData && cardData["art"] || "";

55 cache: true;

50 cache: true;

56 asynchronous: root.asynchronous;

51 asynchronous: root.asynchronous;

57− fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop;

52+ fillMode: Image.PreserveAspectCrop;

58− readonly property real aspect: implicitWidth / implicitHeight;

59 width: root.width;

53 width: root.width;

60 height: width / artShape.aspect;

54 height: width / artShape.aspect;

61 }

55 }

tests/plugins/Dash/cardcreator/6.res+2−8

@@ -33,19 +33,14 @@ Item {

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

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

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

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

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36− readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;

37 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

36 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

38− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

39 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

37 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

40 function updateWidthHeightBindings() {

38 function updateWidthHeightBindings() {

41 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

39 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

42 width = root.fixedArtShapeSize.width;

40 width = root.fixedArtShapeSize.width;

43 height = root.fixedArtShapeSize.height;

41 height = root.fixedArtShapeSize.height;

44− } else if (aspectSmallerThanImageAspect) {

45− width = Qt.binding(function() { return !visible ? 0 : image.width });

46− height = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.height : width / image.aspect });

47 } else {

42 } else {

48− width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect });

43+ width = Qt.binding(function() { return !visible ? 0 : image.width });

49 height = Qt.binding(function() { return !visible ? 0 : image.height });

44 height = Qt.binding(function() { return !visible ? 0 : image.height });

50 }

45 }

51 }

46 }

@@ -54,8 +49,7 @@ Item {

54 source: cardData && cardData["art"] || "";

49 source: cardData && cardData["art"] || "";

55 cache: true;

50 cache: true;

56 asynchronous: root.asynchronous;

51 asynchronous: root.asynchronous;

57− fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop;

52+ fillMode: Image.PreserveAspectCrop;

58− readonly property real aspect: implicitWidth / implicitHeight;

59 width: root.width;

53 width: root.width;

60 height: width / artShape.aspect;

54 height: width / artShape.aspect;

61 }

55 }