git.iko.soy/unity8
on xenial help sign in
Change the art back to the cardData value if it changes from broken to valid image
commitd2bdb2213abb4147c8f797af7df9d46c41fda79f authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 18 Mar 2016, 12:16 (11 years ago) parentde9d097
10 files changed+21
compare with xenial
unifiedsplit
plugins/Dash/CardCreator.js+1 tests/plugins/Dash/cardcreator/1.res+1 tests/plugins/Dash/cardcreator/1.res.cardcreator+1 tests/plugins/Dash/cardcreator/11.res+1 tests/plugins/Dash/cardcreator/11.res.cardcreator+1 tests/plugins/Dash/cardcreator/3.res+1 tests/plugins/Dash/cardcreator/3.res.cardcreator+1 tests/plugins/Dash/cardcreator/5.res+1 tests/plugins/Dash/cardcreator/5.res.cardcreator+1 tests/qmltests/Dash/tst_Card.qml+12
plugins/Dash/CardCreator.js+1
@@ -92,6 +92,7 @@ var kArtShapeHolderCode = 'Item { \n\
9292 id: artShapeLoader; \n\
9393 objectName: "artShapeLoader"; \n\
9494 readonly property string cardArt: cardData && cardData["art"] || %9; \n\
95+ onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
9596 active: cardArt != ""; \n\
9697 asynchronous: %6; \n\
9798 visible: status == Loader.Ready; \n\
tests/plugins/Dash/cardcreator/1.res+1
@@ -21,6 +21,7 @@ Item {
2121 id: artShapeLoader;
2222 objectName: "artShapeLoader";
2323 readonly property string cardArt: cardData && cardData["art"] || "";
24+ onCardArtChanged: { if (item) { item.image.source = cardArt; } }
2425 active: cardArt != "";
2526 asynchronous: true;
2627 visible: status == Loader.Ready;
tests/plugins/Dash/cardcreator/1.res.cardcreator+1
@@ -20,6 +20,7 @@ Item {
2020 id: artShapeLoader;
2121 objectName: "artShapeLoader";
2222 readonly property string cardArt: cardData && cardData["art"] || "";
23+ onCardArtChanged: { if (item) { item.image.source = cardArt; } }
2324 active: cardArt != "";
2425 asynchronous: false;
2526 visible: status == Loader.Ready;
tests/plugins/Dash/cardcreator/11.res+1
@@ -59,6 +59,7 @@ Item {
5959 id: artShapeLoader;
6060 objectName: "artShapeLoader";
6161 readonly property string cardArt: cardData && cardData["art"] || decodeURI("%5C");
62+ onCardArtChanged: { if (item) { item.image.source = cardArt; } }
6263 active: cardArt != "";
6364 asynchronous: true;
6465 visible: status == Loader.Ready;
tests/plugins/Dash/cardcreator/11.res.cardcreator+1
@@ -58,6 +58,7 @@ Item {
5858 id: artShapeLoader;
5959 objectName: "artShapeLoader";
6060 readonly property string cardArt: cardData && cardData["art"] || "";
61+ onCardArtChanged: { if (item) { item.image.source = cardArt; } }
6162 active: cardArt != "";
6263 asynchronous: false;
6364 visible: status == Loader.Ready;
tests/plugins/Dash/cardcreator/3.res+1
@@ -21,6 +21,7 @@ Item {
2121 id: artShapeLoader;
2222 objectName: "artShapeLoader";
2323 readonly property string cardArt: cardData && cardData["art"] || decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");
24+ onCardArtChanged: { if (item) { item.image.source = cardArt; } }
2425 active: cardArt != "";
2526 asynchronous: true;
2627 visible: status == Loader.Ready;
tests/plugins/Dash/cardcreator/3.res.cardcreator+1
@@ -20,6 +20,7 @@ Item {
2020 id: artShapeLoader;
2121 objectName: "artShapeLoader";
2222 readonly property string cardArt: cardData && cardData["art"] || "";
23+ onCardArtChanged: { if (item) { item.image.source = cardArt; } }
2324 active: cardArt != "";
2425 asynchronous: false;
2526 visible: status == Loader.Ready;
tests/plugins/Dash/cardcreator/5.res+1
@@ -21,6 +21,7 @@ Item {
2121 id: artShapeLoader;
2222 objectName: "artShapeLoader";
2323 readonly property string cardArt: cardData && cardData["art"] || "";
24+ onCardArtChanged: { if (item) { item.image.source = cardArt; } }
2425 active: cardArt != "";
2526 asynchronous: true;
2627 visible: status == Loader.Ready;
tests/plugins/Dash/cardcreator/5.res.cardcreator+1
@@ -20,6 +20,7 @@ Item {
2020 id: artShapeLoader;
2121 objectName: "artShapeLoader";
2222 readonly property string cardArt: cardData && cardData["art"] || "";
23+ onCardArtChanged: { if (item) { item.image.source = cardArt; } }
2324 active: cardArt != "";
2425 asynchronous: false;
2526 visible: status == Loader.Ready;
tests/qmltests/Dash/tst_Card.qml+12
@@ -485,6 +485,18 @@ Rectangle {
485485 tryCompare(art, "visible", true);
486486 compare(artImage.source, Qt.resolvedUrl("artwork/checkers.png"));
487487
488+ card.cardData["art"] = "somethingbroken";
489+ card.cardDataChanged();
490+ waitForRendering(card);
491+ tryCompare(art, "visible", true);
492+ compare(artImage.source, Qt.resolvedUrl("artwork/checkers.png"));
493+
494+ card.cardData["art"] = Qt.resolvedUrl("artwork/music-player-design.png");
495+ card.cardDataChanged();
496+ waitForRendering(card);
497+ tryCompare(art, "visible", true);
498+ compare(artImage.source, Qt.resolvedUrl("artwork/music-player-design.png"));
499+
488500 card.cardData["mascot"] = "somethingbroken2";
489501 card.cardDataChanged();
490502 compare(mascotImage.status, Image.Error);