summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-10 23:22:23 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-10 23:22:23 +0200
commitbcbec4bc49774b80780872c8234acb256c38d779 (patch)
tree038e1c47f9156877b89a840fb69947e0774218b4 /tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
parent507a7b4df918a091c45af35110fd2cdeff3713aa (diff)
parent2346ae167568bb9e5d247da0b946067b7f9aad48 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp')
-rw-r--r--tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index d3191b2206..6c04e5b39a 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -52,6 +52,7 @@
#include <qitemdelegate.h>
#include <qscrollbar.h>
#include <private/qcolumnview_p.h>
+#include <qscreen.h>
#define ANIMATION_DELAY 300
@@ -387,6 +388,12 @@ void tst_QColumnView::scrollTo_data()
QTest::newRow("reverse") << true << false;
}
+static inline void centerOnScreen(QWidget *w)
+{
+ const QPoint offset = QPoint(w->width() / 2, w->height() / 2);
+ w->move(QGuiApplication::primaryScreen()->availableGeometry().center() - offset);
+}
+
void tst_QColumnView::scrollTo()
{
QFETCH(bool, reverse);
@@ -397,6 +404,7 @@ void tst_QColumnView::scrollTo()
ColumnView view(&topLevel);
view.resize(200, 200);
topLevel.show();
+ centerOnScreen(&topLevel);
view.scrollTo(QModelIndex(), QAbstractItemView::EnsureVisible);
QCOMPARE(view.HorizontalOffset(), 0);