summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-02-10 10:15:13 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-13 01:36:13 +0100
commite99c5a3f113bbc1b8f8db996b4b0d5715eea2d89 (patch)
tree8a973abb533edd382e1b41169039d6baf518857f /tests
parentbd3307402d9249ab8155546d7e7db6d381b56e85 (diff)
Fix anchor jitters that could occur during animation.
The anchors were using a different definition of center than the actual center (9337c140cab7db1285f893b66d0e56423a74c253). With this change center-anchored Rectangles may sometimes have fuzzy antialiasing again. Task-number: QTBUG-12441 Task-number: QTBUG-21730 Change-Id: Iaf61409c7c523510d0d657fe7ba96f29a8610090 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/centerin.qml6
-rw-r--r--tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp6
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/auto/qtquick2/qquickanchors/data/centerin.qml b/tests/auto/qtquick2/qquickanchors/data/centerin.qml
index e5f64f1e47..e6c9179116 100644
--- a/tests/auto/qtquick2/qquickanchors/data/centerin.qml
+++ b/tests/auto/qtquick2/qquickanchors/data/centerin.qml
@@ -9,4 +9,10 @@ Rectangle {
anchors.verticalCenterOffset: 30
anchors.horizontalCenterOffset: 10
}
+
+ Rectangle {
+ objectName: "centered2"
+ width: 11; height: 11; color: "green"
+ anchors.centerIn: parent;
+ }
}
diff --git a/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp b/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp
index ff3426bf13..d046f4e0a4 100644
--- a/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp
+++ b/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp
@@ -535,6 +535,11 @@ void tst_qquickanchors::centerIn()
QCOMPARE(rect->x(), 75.0 - 20.0);
QCOMPARE(rect->y(), 75.0 - 10.0);
+ //QTBUG-21730 (use actual center to prevent animation jitter)
+ QQuickRectangle* rect2 = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("centered2"));
+ QCOMPARE(rect2->x(), 94.5);
+ QCOMPARE(rect2->y(), 94.5);
+
delete view;
}
@@ -567,7 +572,6 @@ void tst_qquickanchors::centerInRotation()
QQuickRectangle* outer = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("outer"));
QQuickRectangle* inner = findItem<QQuickRectangle>(view->rootObject(), QLatin1String("inner"));
- QEXPECT_FAIL("", "QTBUG-12441", Abort);
QCOMPARE(outer->x(), qreal(49.5));
QCOMPARE(outer->y(), qreal(49.5));
QCOMPARE(inner->x(), qreal(25.5));