c7a8e4b · unity8 · git.iko.soy

on xenial help sign in

Don't signal for "purchaseCancelled" to avoid preview refreshing.

c7a8e4bRodney Dawes12 years ago

qml/Dash/Previews/PreviewPayments.qml+3−1

@@ -65,7 +65,9 @@ PreviewWidget {

65 }

66 onPurchaseCancelled: {

67 paymentButton.opacity = 1;

68+ // DO NOT emit the signal right now, as it causes a new

69+ // preview to be requested, when that is not what we want.

68− root.triggered(widgetId, "purchaseCancelled", source);

70+ //root.triggered(widgetId, "purchaseCancelled", source);

69 }

71 }

70 }

72 }

71 }

73 }

tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+9−5

@@ -183,12 +183,16 @@ Rectangle {

183 tryCompare(button, "opacity", 0);

184

185 paymentClient.process();

186− spy.wait();

187

186

187+ // Signal is not used at the moment, to avoid preview refresh.

188+ /*

189+ *spy.wait();

190+ *

188− var args = spy.signalArguments[0];

191+ * var args = spy.signalArguments[0];

189− compare(args[0], "previewPayments");

192+ * compare(args[0], "previewPayments");

190− compare(args[1], "purchaseCancelled");

193+ * compare(args[1], "purchaseCancelled");

191− compare(args[2], jsonPurchaseCancel["source"]);

194+ * compare(args[2], jsonPurchaseCancel["source"]);

195+ */

192

196

193 tryCompare(progress, "visible", false);

197 tryCompare(progress, "visible", false);

194 tryCompare(progress, "opacity", 0);

198 tryCompare(progress, "opacity", 0);