git.iko.soy/unity8
on xenial help sign in
fix as review
5cb1049Andrea Cimitan
plugins/Dash/CardCreator.js+2−2
compare with xenial
unifiedsplit
@@ -124,8 +124,8 @@ var kArtShapeHolderCode = 'Loader { \n\
124// %8 is used as image fallback
124// %8 is used as image fallback
125var kArtShapeHolderCodeCardToolCard = 'Loader { \n\
125var kArtShapeHolderCodeCardToolCard = 'Loader { \n\
126 id: artShapeLoader; \n\
126 id: artShapeLoader; \n\
127− height: root.fixedArtShapeSize.height; \n\
127+ height: artShapeLoader.height; \n\
128− width: root.fixedArtShapeSize.width; \n\
128+ width: artShapeLoader.width; \n\
129 anchors { %1 } \n\
129 anchors { %1 } \n\
130 objectName: "artShapeLoader"; \n\
130 objectName: "artShapeLoader"; \n\
131 readonly property string cardArt: cardData && cardData["art"] || %8; \n\
131 readonly property string cardArt: cardData && cardData["art"] || %8; \n\
tests/plugins/Dash/cardcreator/1.res.cardcreator+2−2
@@ -12,8 +12,8 @@ signal action(var actionId);
12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
13Loader {
13Loader {
14 id: artShapeLoader;
14 id: artShapeLoader;
15− height: root.fixedArtShapeSize.height;
15+ height: artShapeLoader.height;
16− width: root.fixedArtShapeSize.width;
16+ width: artShapeLoader.width;
17 anchors { horizontalCenter: parent.horizontalCenter; }
17 anchors { horizontalCenter: parent.horizontalCenter; }
18 objectName: "artShapeLoader";
18 objectName: "artShapeLoader";
19 readonly property string cardArt: cardData && cardData["art"] || "";
19 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/11.res.cardcreator+2−2
@@ -50,8 +50,8 @@ Loader {
50readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
50readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
51Loader {
51Loader {
52 id: artShapeLoader;
52 id: artShapeLoader;
53− height: root.fixedArtShapeSize.height;
53+ height: artShapeLoader.height;
54− width: root.fixedArtShapeSize.width;
54+ width: artShapeLoader.width;
55 anchors { horizontalCenter: parent.horizontalCenter; }
55 anchors { horizontalCenter: parent.horizontalCenter; }
56 objectName: "artShapeLoader";
56 objectName: "artShapeLoader";
57 readonly property string cardArt: cardData && cardData["art"] || "";
57 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/12.res.cardcreator+2−2
@@ -12,8 +12,8 @@ signal action(var actionId);
12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
13Loader {
13Loader {
14 id: artShapeLoader;
14 id: artShapeLoader;
15− height: root.fixedArtShapeSize.height;
15+ height: artShapeLoader.height;
16− width: root.fixedArtShapeSize.width;
16+ width: artShapeLoader.width;
17 anchors { horizontalCenter: parent.horizontalCenter; }
17 anchors { horizontalCenter: parent.horizontalCenter; }
18 objectName: "artShapeLoader";
18 objectName: "artShapeLoader";
19 readonly property string cardArt: cardData && cardData["art"] || "";
19 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/3.res.cardcreator+2−2
@@ -12,8 +12,8 @@ signal action(var actionId);
12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
13Loader {
13Loader {
14 id: artShapeLoader;
14 id: artShapeLoader;
15− height: root.fixedArtShapeSize.height;
15+ height: artShapeLoader.height;
16− width: root.fixedArtShapeSize.width;
16+ width: artShapeLoader.width;
17 anchors { horizontalCenter: parent.horizontalCenter; }
17 anchors { horizontalCenter: parent.horizontalCenter; }
18 objectName: "artShapeLoader";
18 objectName: "artShapeLoader";
19 readonly property string cardArt: cardData && cardData["art"] || "";
19 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/5.res.cardcreator+2−2
@@ -12,8 +12,8 @@ signal action(var actionId);
12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
12readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
13Loader {
13Loader {
14 id: artShapeLoader;
14 id: artShapeLoader;
15− height: root.fixedArtShapeSize.height;
15+ height: artShapeLoader.height;
16− width: root.fixedArtShapeSize.width;
16+ width: artShapeLoader.width;
17 anchors { horizontalCenter: parent.horizontalCenter; }
17 anchors { horizontalCenter: parent.horizontalCenter; }
18 objectName: "artShapeLoader";
18 objectName: "artShapeLoader";
19 readonly property string cardArt: cardData && cardData["art"] || "";
19 readonly property string cardArt: cardData && cardData["art"] || "";