diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-07-25 17:13:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-26 06:29:54 +0200 |
| commit | 414b91ab7f11efaf89afb237d682507caec05eff (patch) | |
| tree | 48ef40359136cd9f2e12cc1866dccd8c77aba590 /tests | |
| parent | df5c836fe9753e81cda4a30fa27ce7af5e6f9a5f (diff) | |
Use visible only, and not opacity, in positioners
Task-number: QTBUG-12940
Change-Id: Id637bbd7c30aea8bc23c2aeaccfb069a8de7955f
Reviewed-on: http://codereview.qt.nokia.com/2082
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests')
4 files changed, 25 insertions, 27 deletions
diff --git a/tests/auto/declarative/qsgpositioners/data/grid-animated.qml b/tests/auto/declarative/qsgpositioners/data/grid-animated.qml index 56e8f26953..b8ee8f9a52 100644 --- a/tests/auto/declarative/qsgpositioners/data/grid-animated.qml +++ b/tests/auto/declarative/qsgpositioners/data/grid-animated.qml @@ -31,7 +31,7 @@ Item { objectName: "two" x: -100 y: -100 - opacity: 0 + visible: false color: "green" width: 50 height: 50 diff --git a/tests/auto/declarative/qsgpositioners/data/horizontal-animated.qml b/tests/auto/declarative/qsgpositioners/data/horizontal-animated.qml index d19cc46c8b..b9b8591e83 100644 --- a/tests/auto/declarative/qsgpositioners/data/horizontal-animated.qml +++ b/tests/auto/declarative/qsgpositioners/data/horizontal-animated.qml @@ -29,7 +29,7 @@ Item { objectName: "two" color: "blue" x: -100; - opacity: 0 + visible: false width: 50 height: 50 } diff --git a/tests/auto/declarative/qsgpositioners/data/vertical-animated.qml b/tests/auto/declarative/qsgpositioners/data/vertical-animated.qml index 69f1b7eb25..ecf593cd70 100644 --- a/tests/auto/declarative/qsgpositioners/data/vertical-animated.qml +++ b/tests/auto/declarative/qsgpositioners/data/vertical-animated.qml @@ -26,7 +26,7 @@ Item { objectName: "two" color: "blue" y: -100 - opacity: 0 + visible: false width: 50 height: 50 } diff --git a/tests/auto/declarative/qsgpositioners/tst_qsgpositioners.cpp b/tests/auto/declarative/qsgpositioners/tst_qsgpositioners.cpp index 788c072025..21b0ea1e88 100644 --- a/tests/auto/declarative/qsgpositioners/tst_qsgpositioners.cpp +++ b/tests/auto/declarative/qsgpositioners/tst_qsgpositioners.cpp @@ -251,19 +251,17 @@ void tst_qsgpositioners::test_horizontal_animated() QTRY_COMPARE(one->x(), 0.0); QTRY_COMPARE(one->y(), 0.0); - QTRY_COMPARE(two->opacity(), 0.0); + QTRY_COMPARE(two->isVisible(), false); QTRY_COMPARE(two->x(), -100.0);//Not 'in' yet QTRY_COMPARE(two->y(), 0.0); QTRY_COMPARE(three->x(), 50.0); QTRY_COMPARE(three->y(), 0.0); //Add 'two' - two->setOpacity(1.0); - QCOMPARE(two->opacity(), 1.0); - - // New size should be immediate - QCOMPARE(row->width(), 150.0); - QCOMPARE(row->height(), 50.0); + two->setVisible(true); + QTRY_COMPARE(two->isVisible(), true); + QTRY_COMPARE(row->width(), 150.0); + QTRY_COMPARE(row->height(), 50.0); QTest::qWait(0);//Let the animation start QCOMPARE(two->x(), -100.0); @@ -305,19 +303,19 @@ void tst_qsgpositioners::test_horizontal_animated_rightToLeft() QTRY_COMPARE(one->x(), 50.0); QTRY_COMPARE(one->y(), 0.0); - QTRY_COMPARE(two->opacity(), 0.0); + QTRY_COMPARE(two->isVisible(), false); QTRY_COMPARE(two->x(), -100.0);//Not 'in' yet QTRY_COMPARE(two->y(), 0.0); QTRY_COMPARE(three->x(), 0.0); QTRY_COMPARE(three->y(), 0.0); //Add 'two' - two->setOpacity(1.0); - QCOMPARE(two->opacity(), 1.0); + two->setVisible(true); + QTRY_COMPARE(two->isVisible(), true); - // New size should be immediate - QCOMPARE(row->width(), 150.0); - QCOMPARE(row->height(), 50.0); + // New size should propagate after visible change + QTRY_COMPARE(row->width(), 150.0); + QTRY_COMPARE(row->height(), 50.0); QTest::qWait(0);//Let the animation start QCOMPARE(one->x(), 50.0); @@ -411,17 +409,17 @@ void tst_qsgpositioners::test_vertical_animated() QTRY_COMPARE(one->y(), 0.0); QTRY_COMPARE(one->x(), 0.0); - QTRY_COMPARE(two->opacity(), 0.0); + QTRY_COMPARE(two->isVisible(), false); QTRY_COMPARE(two->y(), -100.0);//Not 'in' yet QTRY_COMPARE(two->x(), 0.0); QTRY_COMPARE(three->y(), 50.0); QTRY_COMPARE(three->x(), 0.0); //Add 'two' - two->setOpacity(1.0); - QTRY_COMPARE(two->opacity(), 1.0); - QCOMPARE(column->height(), 150.0); - QCOMPARE(column->width(), 50.0); + two->setVisible(true); + QTRY_COMPARE(two->isVisible(), true); + QTRY_COMPARE(column->height(), 150.0); + QTRY_COMPARE(column->width(), 50.0); QTest::qWait(0);//Let the animation start QCOMPARE(two->y(), -100.0); QCOMPARE(three->y(), 50.0); @@ -624,7 +622,7 @@ void tst_qsgpositioners::test_grid_animated() QTRY_COMPARE(one->y(), 0.0); QTRY_COMPARE(one->x(), 0.0); - QTRY_COMPARE(two->opacity(), 0.0); + QTRY_COMPARE(two->isVisible(), false); QTRY_COMPARE(two->y(), -100.0); QTRY_COMPARE(two->x(), -100.0); QTRY_COMPARE(three->y(), 0.0); @@ -635,8 +633,8 @@ void tst_qsgpositioners::test_grid_animated() QTRY_COMPARE(five->x(), 0.0); //Add 'two' - two->setOpacity(1.0); - QCOMPARE(two->opacity(), 1.0); + two->setVisible(true); + QCOMPARE(two->isVisible(), true); QCOMPARE(grid->width(), 150.0); QCOMPARE(grid->height(), 100.0); QTest::qWait(0);//Let the animation start @@ -707,7 +705,7 @@ void tst_qsgpositioners::test_grid_animated_rightToLeft() QTRY_COMPARE(one->y(), 0.0); QTRY_COMPARE(one->x(), 100.0); - QTRY_COMPARE(two->opacity(), 0.0); + QTRY_COMPARE(two->isVisible(), false); QTRY_COMPARE(two->y(), -100.0); QTRY_COMPARE(two->x(), -100.0); QTRY_COMPARE(three->y(), 0.0); @@ -718,8 +716,8 @@ void tst_qsgpositioners::test_grid_animated_rightToLeft() QTRY_COMPARE(five->x(), 100.0); //Add 'two' - two->setOpacity(1.0); - QCOMPARE(two->opacity(), 1.0); + two->setVisible(true); + QCOMPARE(two->isVisible(), true); QCOMPARE(grid->width(), 150.0); QCOMPARE(grid->height(), 100.0); QTest::qWait(0);//Let the animation start |