1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stabilize tst_QComboBox::keyBoardNavigationWithMouse.

Browse Source 
The cursor needs to be within the view from start on Mac.

Task-number: QTBUG-33973
Change-Id: I313c9fd1c3a917e135a92497f1818d1b0d8b7698
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
This commit is contained in:
Friedemann Kleint 2013-10-10 13:57:57 +02:00 committed by The Qt Project
parent 65855d9d68
commit 2b8e571f84
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
View File

@ -2587,6 +2587,18 @@ void tst_QComboBox::resetModel()
} }
static inline void centerCursor(const QWidget *w)
{
#ifndef QT_NO_CURSOR
// Force cursor movement to prevent QCursor::setPos() from returning prematurely on QPA:
const QPoint target(w->mapToGlobal(w->rect().center()));
QCursor::setPos(QPoint(target.x() + 1, target.y()));
QCursor::setPos(target);
#else // !QT_NO_CURSOR
Q_UNUSED(w)
#endif
}
void tst_QComboBox::keyBoardNavigationWithMouse() void tst_QComboBox::keyBoardNavigationWithMouse()
{ {
QComboBox combo; QComboBox combo;
@ -2597,6 +2609,7 @@ void tst_QComboBox::keyBoardNavigationWithMouse()
combo.addItem( QString::number(i)); combo.addItem( QString::number(i));
combo.show(); combo.show();
centerCursor(&combo); // QTBUG-33973, cursor needs to be within view from start on Mac.
QApplication::setActiveWindow(&combo); QApplication::setActiveWindow(&combo);
QVERIFY(QTest::qWaitForWindowActive(&combo)); QVERIFY(QTest::qWaitForWindowActive(&combo));
QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&combo)); QCOMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&combo));
@ -2617,10 +2630,7 @@ void tst_QComboBox::keyBoardNavigationWithMouse()
// When calling cursor function, Windows CE responds with: This function is not supported on this system. // When calling cursor function, Windows CE responds with: This function is not supported on this system.
#ifndef Q_OS_WINCE #ifndef Q_OS_WINCE
// Force cursor movement to prevent QCursor::setPos() from returning prematurely on QPA: // Force cursor movement to prevent QCursor::setPos() from returning prematurely on QPA:
const QPoint target(combo.view()->mapToGlobal(combo.view()->rect().center())); centerCursor(combo.view());
QCursor::setPos(QPoint(target.x() + 1, target.y()));
QCursor::setPos(target);
QTest::qWait(200); QTest::qWait(200);
#define GET_SELECTION(SEL) \ #define GET_SELECTION(SEL) \
@ -2632,7 +2642,7 @@ void tst_QComboBox::keyBoardNavigationWithMouse()
GET_SELECTION(selection); GET_SELECTION(selection);
//since we moved the mouse is in the middle it should even be around 5; //since we moved the mouse is in the middle it should even be around 5;
QVERIFY(selection > 3); QVERIFY2(selection > 3, (QByteArrayLiteral("selection=") + QByteArray::number(selection)).constData());
static const int final = 40; static const int final = 40;
for (int i = selection + 1; i <= final; i++) for (int i = selection + 1; i <= final; i++)