git.iko.soy/unity8
on xenial help sign in
TODO--
commitffc4735fd814e75bead53f9198aefc6223c2726b authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 10 Dec 2015, 15:52 (11 years ago) parent5529608
2 files changed+11−4
compare with xenial
unifiedsplit
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp+10−3 tests/utils/modules/Unity/Test/UnityTestCase.qml+1−1
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp+10−3
@@ -59,13 +59,20 @@ void tst_FloatingFlickable::tapGoesThrough()
5959 QCOMPARE(testItem->touchEventsReceived.count(), 1);
6060}
6161
62+static void removeTimeConstraints(QQuickItem *floatingFlickable)
63+{
64+ QObject *swipeAreaPrivate = floatingFlickable->findChild<QObject*>("UCSwipeAreaPrivate");
65+
66+ QMetaObject::invokeMethod(swipeAreaPrivate, "setMaxTime", Q_ARG(int, 60 * 60 * 1000));
67+ QMetaObject::invokeMethod(swipeAreaPrivate, "setCompositionTime", Q_ARG(int, 0));
68+}
69+
6270void tst_FloatingFlickable::flickChangesContentX()
6371{
6472 QQuickItem *floatingFlickable =
6573 m_view->rootObject()->findChild<QQuickItem*>("floatingFlickable");
6674 QVERIFY(floatingFlickable != nullptr);
67−
68−// TODO? floatingFlickable->m_dragArea->removeTimeConstraints();
75+ removeTimeConstraints(floatingFlickable);
6976
7077 qreal startContentX = floatingFlickable->property("contentX").toReal();
7178
@@ -93,7 +100,7 @@ void tst_FloatingFlickable::flickChangesContentY()
93100 QVERIFY(floatingFlickable != nullptr);
94101
95102 floatingFlickable->setProperty("direction", Direction::Vertical);
96−// TODO? floatingFlickable->m_dragArea->removeTimeConstraints();
103+ removeTimeConstraints(floatingFlickable);
97104
98105 qreal startContentY = floatingFlickable->property("contentY").toReal();
99106
tests/utils/modules/Unity/Test/UnityTestCase.qml+1−1
@@ -454,7 +454,7 @@ TestCase {
454454 if (UT.Util.isInstanceOf(item, "UCSwipeArea")) {
455455 var privateSwipeArea = UT.Util.findQObjectChild(item, "UCSwipeAreaPrivate");
456456 privateSwipeArea.setMaxTime(60 * 60 * 1000);
457− privateSwipeArea.compositionTime = 0;
457+ privateSwipeArea.setCompositionTime(0);
458458 } else {
459459 for (var i in item.children) {
460460 removeTimeConstraintsFromSwipeAreas(item.children[i]);