git.iko.soy/unity8
on xenial help sign in
fix issue with news scope
commitb65d58b1c8ebdc5dbbf6a6f7fec628cfb17fc0a4 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 27 Jun 2016, 16:25 (10 years ago) parent18b5d2d
11 files changed+24
compare with xenial
unifiedsplit
plugins/Dash/CardCreator.js+4 tests/plugins/Dash/cardcreator/1.res+2 tests/plugins/Dash/cardcreator/1.res.cardcreator+2 tests/plugins/Dash/cardcreator/11.res+2 tests/plugins/Dash/cardcreator/11.res.cardcreator+2 tests/plugins/Dash/cardcreator/12.res+2 tests/plugins/Dash/cardcreator/12.res.cardcreator+2 tests/plugins/Dash/cardcreator/3.res+2 tests/plugins/Dash/cardcreator/3.res.cardcreator+2 tests/plugins/Dash/cardcreator/5.res+2 tests/plugins/Dash/cardcreator/5.res.cardcreator+2
plugins/Dash/CardCreator.js+4
@@ -84,6 +84,8 @@ var kArtProportionalShapeCode = 'ProportionalShape { \n\
8484// %8 is used as image fallback
8585var kArtShapeHolderCode = 'Loader { \n\
8686 id: artShapeLoader; \n\
87+ height: root.fixedArtShapeSize.height; \n\
88+ width: root.fixedArtShapeSize.width; \n\
8789 anchors { %1 } \n\
8890 objectName: "artShapeLoader"; \n\
8991 readonly property string cardArt: cardData && cardData["art"] || %8; \n\
@@ -122,6 +124,8 @@ var kArtShapeHolderCode = 'Loader { \n\
122124// %8 is used as image fallback
123125var kArtShapeHolderCodeCardToolCard = 'Loader { \n\
124126 id: artShapeLoader; \n\
127+ height: root.fixedArtShapeSize.height; \n\
128+ width: root.fixedArtShapeSize.width; \n\
125129 anchors { %1 } \n\
126130 objectName: "artShapeLoader"; \n\
127131 readonly property string cardArt: cardData && cardData["art"] || %8; \n\
tests/plugins/Dash/cardcreator/1.res+2
@@ -14,6 +14,8 @@ signal action(var actionId);
1414readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
1515Loader {
1616 id: artShapeLoader;
17+ height: root.fixedArtShapeSize.height; \n\
18+ width: root.fixedArtShapeSize.width; \n\
1719 anchors { horizontalCenter: parent.horizontalCenter; }
1820 objectName: "artShapeLoader";
1921 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/1.res.cardcreator+2
@@ -12,6 +12,8 @@ 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: root.fixedArtShapeSize.height; \n\
16+ width: root.fixedArtShapeSize.width; \n\
1517 anchors { horizontalCenter: parent.horizontalCenter; }
1618 objectName: "artShapeLoader";
1719 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/11.res+2
@@ -52,6 +52,8 @@ Loader {
5252readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
5353Loader {
5454 id: artShapeLoader;
55+ height: root.fixedArtShapeSize.height; \n\
56+ width: root.fixedArtShapeSize.width; \n\
5557 anchors { horizontalCenter: parent.horizontalCenter; }
5658 objectName: "artShapeLoader";
5759 readonly property string cardArt: cardData && cardData["art"] || decodeURI("%5C");
tests/plugins/Dash/cardcreator/11.res.cardcreator+2
@@ -50,6 +50,8 @@ 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: root.fixedArtShapeSize.height; \n\
54+ width: root.fixedArtShapeSize.width; \n\
5355 anchors { horizontalCenter: parent.horizontalCenter; }
5456 objectName: "artShapeLoader";
5557 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/12.res+2
@@ -14,6 +14,8 @@ signal action(var actionId);
1414readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
1515Loader {
1616 id: artShapeLoader;
17+ height: root.fixedArtShapeSize.height; \n\
18+ width: root.fixedArtShapeSize.width; \n\
1719 anchors { horizontalCenter: parent.horizontalCenter; }
1820 objectName: "artShapeLoader";
1921 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/12.res.cardcreator+2
@@ -12,6 +12,8 @@ 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: root.fixedArtShapeSize.height; \n\
16+ width: root.fixedArtShapeSize.width; \n\
1517 anchors { horizontalCenter: parent.horizontalCenter; }
1618 objectName: "artShapeLoader";
1719 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/3.res+2
@@ -14,6 +14,8 @@ signal action(var actionId);
1414readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
1515Loader {
1616 id: artShapeLoader;
17+ height: root.fixedArtShapeSize.height; \n\
18+ width: root.fixedArtShapeSize.width; \n\
1719 anchors { horizontalCenter: parent.horizontalCenter; }
1820 objectName: "artShapeLoader";
1921 readonly property string cardArt: cardData && cardData["art"] || decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");
tests/plugins/Dash/cardcreator/3.res.cardcreator+2
@@ -12,6 +12,8 @@ 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: root.fixedArtShapeSize.height; \n\
16+ width: root.fixedArtShapeSize.width; \n\
1517 anchors { horizontalCenter: parent.horizontalCenter; }
1618 objectName: "artShapeLoader";
1719 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/5.res+2
@@ -14,6 +14,8 @@ signal action(var actionId);
1414readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
1515Loader {
1616 id: artShapeLoader;
17+ height: root.fixedArtShapeSize.height; \n\
18+ width: root.fixedArtShapeSize.width; \n\
1719 anchors { horizontalCenter: parent.horizontalCenter; }
1820 objectName: "artShapeLoader";
1921 readonly property string cardArt: cardData && cardData["art"] || "";
tests/plugins/Dash/cardcreator/5.res.cardcreator+2
@@ -12,6 +12,8 @@ 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: root.fixedArtShapeSize.height; \n\
16+ width: root.fixedArtShapeSize.width; \n\
1517 anchors { horizontalCenter: parent.horizontalCenter; }
1618 objectName: "artShapeLoader";
1719 readonly property string cardArt: cardData && cardData["art"] || "";