git.iko.soy/unity8
on xenial help sign in
ooops
commit3366446568b508859c824d41e813b947bf6571c3 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 28 Jun 2016, 16:50 (10 years ago) parentdfaa73f
6 files changed+2−14
compare with xenial
unifiedsplit
plugins/Dash/CardCreator.js−2 tests/plugins/Dash/cardcreator/1.res.cardcreator−2 tests/plugins/Dash/cardcreator/11.res.cardcreator−2 tests/plugins/Dash/cardcreator/12.res.cardcreator−2 tests/plugins/Dash/cardcreator/3.res.cardcreator+2−4 tests/plugins/Dash/cardcreator/5.res.cardcreator−2
plugins/Dash/CardCreator.js−2
@@ -124,8 +124,6 @@ var kArtShapeHolderCode = 'Loader { \n\
124124// %8 is used as image fallback
125125var kArtShapeHolderCodeCardToolCard = 'Loader { \n\
126126 id: artShapeLoader; \n\
127− height: artShapeLoader.height; \n\
128− width: artShapeLoader.width; \n\
129127 anchors { %1 } \n\
130128 objectName: "artShapeLoader"; \n\
131129 readonly property string cardArt: cardData && cardData["art"] || %8; \n\
tests/plugins/Dash/cardcreator/1.res.cardcreator−2
@@ -12,8 +12,6 @@ signal action(var actionId);
1212readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
1313Loader {
1414 id: artShapeLoader;
15− height: artShapeLoader.height;
16− width: artShapeLoader.width;
1715 anchors { horizontalCenter: parent.horizontalCenter; }
1816 objectName: "artShapeLoader";
1917 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/11.res.cardcreator−2
@@ -50,8 +50,6 @@ Loader {
5050readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
5151Loader {
5252 id: artShapeLoader;
53− height: artShapeLoader.height;
54− width: artShapeLoader.width;
5553 anchors { horizontalCenter: parent.horizontalCenter; }
5654 objectName: "artShapeLoader";
5755 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/12.res.cardcreator−2
@@ -12,8 +12,6 @@ signal action(var actionId);
1212readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
1313Loader {
1414 id: artShapeLoader;
15− height: artShapeLoader.height;
16− width: artShapeLoader.width;
1715 anchors { horizontalCenter: parent.horizontalCenter; }
1816 objectName: "artShapeLoader";
1917 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/3.res.cardcreator+2−4
@@ -11,10 +11,8 @@ AbstractButton {
1111signal action(var actionId);
1212readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
1313Loader {
14− id: artShapeLoader;
15− height: artShapeLoader.height;
16− width: artShapeLoader.width;
17− anchors { horizontalCenter: parent.horizontalCenter; }
14+ id: artShapeLoader;
15+ anchors { horizontalCenter: parent.horizontalCenter; }
1816 objectName: "artShapeLoader";
1917 readonly property string cardArt: cardData && cardData["art"] || "";
2018 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
tests/plugins/Dash/cardcreator/5.res.cardcreator−2
@@ -12,8 +12,6 @@ signal action(var actionId);
1212readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
1313Loader {
1414 id: artShapeLoader;
15− height: artShapeLoader.height;
16− width: artShapeLoader.width;
1715 anchors { horizontalCenter: parent.horizontalCenter; }
1816 objectName: "artShapeLoader";
1917 readonly property string cardArt: cardData && cardData["art"] || "";