d232e39 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Make so that fixedArtShapeSize actually fixes artShapeSize.

d232e39Michał Sawicz12 years ago

plugins/Dash/CardCreator.js+11−6

compare with xenial

unifiedsplit

@@ -55,8 +55,8 @@ var kBackgroundLoaderCode = 'Loader {\n\

55// %3 is used as image height

56var kArtShapeHolderCode = 'Item { \n\

57 id: artShapeHolder; \n\

58− height: root.fixedArtShapeSize.height != -1 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\

58+ height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\

59− width: root.fixedArtShapeSize.width != -1 ? root.fixedArtShapeSize.width : artShapeLoader.width; \n\

59+ width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width; \n\

60 anchors { %1 } \n\

61 Loader { \n\

62 id: artShapeLoader; \n\

@@ -68,13 +68,18 @@ var kArtShapeHolderCode = 'Item { \n\

68 id: artShape; \n\

69 objectName: "artShape"; \n\

70 radius: "medium"; \n\

71+ visible: image.status == Image.Ready; \n\

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

71− readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1; \n\

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

72 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect; \n\

74 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect; \n\

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

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

74 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings(); \n\

76 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings(); \n\

75− visible: image.status == Image.Ready; \n\

77+ Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\

76 function updateWidthHeightBindings() { \n\

78 function updateWidthHeightBindings() { \n\

79+ if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\

80+ width = root.fixedArtShapeSize.width; \n\

81+ height = root.fixedArtShapeSize.height; \n\

77− if (aspectSmallerThanImageAspect) { \n\

82+ } else if (aspectSmallerThanImageAspect) { \n\

78 width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\

83 width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\

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

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

80 } else { \n\

85 } else { \n\

@@ -108,7 +113,7 @@ var kOverlayLoaderCode = 'Loader { \n\

108 visible: showHeader && status == Loader.Ready; \n\

113 visible: showHeader && status == Loader.Ready; \n\

109 sourceComponent: ShaderEffect { \n\

114 sourceComponent: ShaderEffect { \n\

110 id: overlay; \n\

115 id: overlay; \n\

111− height: fixedHeaderHeight != -1 ? fixedHeaderHeight + units.gu(1) * 2 : headerHeight; \n\

116+ height: fixedHeaderHeight > 0 ? fixedHeaderHeight + units.gu(1) * 2 : headerHeight; \n\

112 opacity: 0.6; \n\

117 opacity: 0.6; \n\

113 property var source: ShaderEffectSource { \n\

118 property var source: ShaderEffectSource { \n\

114 id: shaderSource; \n\

119 id: shaderSource; \n\

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

@@ -16,8 +16,8 @@ onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artSh

16readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

17Item {

18 id: artShapeHolder;

19− height: root.fixedArtShapeSize.height != -1 ? root.fixedArtShapeSize.height : artShapeLoader.height;

19+ height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

20− width: root.fixedArtShapeSize.width != -1 ? root.fixedArtShapeSize.width : artShapeLoader.width;

20+ width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

21 anchors { horizontalCenter: parent.horizontalCenter; }

22 Loader {

23 id: artShapeLoader;

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

28 sourceComponent: UbuntuShape {

29 id: artShape;

30 objectName: "artShape";

31− radius: "medium";

31+ radius: "medium";

32− readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1;

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

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

35− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

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

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

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

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

35+ readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;

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

37+ onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

38+ Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

37 function updateWidthHeightBindings() {

39 function updateWidthHeightBindings() {

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

41+ width = root.fixedArtShapeSize.width;

42+ height = root.fixedArtShapeSize.height;

38− if (aspectSmallerThanImageAspect) {

43+ } else if (aspectSmallerThanImageAspect) {

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

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

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

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

41 } else {

46 } else {

tests/plugins/Dash/cardcreator/3.res+19−14

@@ -16,8 +16,8 @@ onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artSh

16readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

17Item {

18 id: artShapeHolder;

19− height: root.fixedArtShapeSize.height != -1 ? root.fixedArtShapeSize.height : artShapeLoader.height;

19+ height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

20− width: root.fixedArtShapeSize.width != -1 ? root.fixedArtShapeSize.width : artShapeLoader.width;

20+ width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

21 anchors { horizontalCenter: parent.horizontalCenter; }

22 Loader {

23 id: artShapeLoader;

@@ -29,19 +29,24 @@ Item {

29 id: artShape;

30 objectName: "artShape";

31 radius: "medium";

32− readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1;

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

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

35− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

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

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

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

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

35+ readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;

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

37+ onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

38+ Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

37− function updateWidthHeightBindings() {

39+ function updateWidthHeightBindings() {

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

41+ width = root.fixedArtShapeSize.width;

42+ height = root.fixedArtShapeSize.height;

38− if (aspectSmallerThanImageAspect) {

43+ } else if (aspectSmallerThanImageAspect) {

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

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

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

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

41− } else {

46+ } else {

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

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

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

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

44− }

49+ }

45 }

50 }

46 image: Image {

51 image: Image {

47 objectName: "artImage";

52 objectName: "artImage";

tests/plugins/Dash/cardcreator/5.res+20−15

@@ -16,8 +16,8 @@ onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artSh

16readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);

17Item {

18 id: artShapeHolder;

19− height: root.fixedArtShapeSize.height != -1 ? root.fixedArtShapeSize.height : artShapeLoader.height;

19+ height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;

20− width: root.fixedArtShapeSize.width != -1 ? root.fixedArtShapeSize.width : artShapeLoader.width;

20+ width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;

21 anchors { horizontalCenter: parent.horizontalCenter; }

22 Loader {

23 id: artShapeLoader;

@@ -29,19 +29,24 @@ Item {

29 id: artShape;

30 objectName: "artShape";

31 radius: "medium";

32− readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1;

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

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

35− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

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

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

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

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

35+ readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;

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

37+ onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

38+ Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

37− function updateWidthHeightBindings() {

39+ function updateWidthHeightBindings() {

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

41+ width = root.fixedArtShapeSize.width;

42+ height = root.fixedArtShapeSize.height;

38− if (aspectSmallerThanImageAspect) {

43+ } else if (aspectSmallerThanImageAspect) {

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

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

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

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

41− } else {

46+ } else {

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

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

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

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

44− }

49+ }

45 }

50 }

46 image: Image {

51 image: Image {

47 objectName: "artImage";

52 objectName: "artImage";

@@ -68,7 +73,7 @@ Loader {

68 visible: showHeader && status == Loader.Ready;

73 visible: showHeader && status == Loader.Ready;

69 sourceComponent: ShaderEffect {

74 sourceComponent: ShaderEffect {

70 id: overlay;

75 id: overlay;

71− height: fixedHeaderHeight != -1 ? fixedHeaderHeight + units.gu(1) * 2 : headerHeight;

76+ height: fixedHeaderHeight > 0 ? fixedHeaderHeight + units.gu(1) * 2 : headerHeight;

72 opacity: 0.6;

77 opacity: 0.6;

73 property var source: ShaderEffectSource {

78 property var source: ShaderEffectSource {

74 id: shaderSource;

79 id: shaderSource;

tests/qmltests/Dash/tst_Card.qml+9

@@ -305,6 +305,15 @@ Rectangle {

305 }

306 }

307

308+ function test_art_shape_fixed_size() {

309+ selector.selectedIndex = 6;

310+ card.fixedArtShapeSize = Qt.size( units.gu(8), units.gu(4) );

311+ waitForRendering(card);

312+ tryCompare(art, "width", units.gu(8));

313+ tryCompare(art, "height", units.gu(4));

314+ tryCompare(art, "fixedArtShapeSizeAspect", 2);

315+ }

316+

308 function test_art_layout_data() {

317 function test_art_layout_data() {

309 return [

318 return [

310 { tag: "Vertical", left: function() { return units.gu(1); }, index: 0},

319 { tag: "Vertical", left: function() { return units.gu(1); }, index: 0},