diff options
author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2016-02-26 17:34:33 -0800 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@theqtcompany.com> | 2016-03-17 10:06:51 +0000 |
commit | d19c9cfd29bcb3c8fb8108bbcb29d71be19711f5 (patch) | |
tree | 7bf89afd1510079961a4f1e87977e14ef2a3a15c /tests | |
parent | b5af1bd8cff1643239809633d6be4513dd21a057 (diff) |
QMenu: Add showTearOffMenu()
The API is incomplete since we can't show a tear-off menu
programatically. This could be useful when restoring the
application state on launch.
Change-Id: Ice1911b44a5b973680f67b0150efacf3d023c2c5
Task-number: QTBUG-47974
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 48 |
1 files changed, 38 insertions, 10 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 17efc05f59..c3b432788b 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -591,10 +591,19 @@ void tst_QMenu::widgetActionFocus() QCOMPARE(m.activeAction(), (QAction *)wa); } +static QMenu *getTornOffMenu() +{ + foreach (QWidget *w, QApplication::allWidgets()) { + if (w->isVisible() && w->inherits("QTornOffMenu")) + return static_cast<QMenu *>(w); + } + return Q_NULLPTR; +} + void tst_QMenu::tearOff() { QWidget widget; - QMenu *menu = new QMenu(&widget); + QScopedPointer<QMenu> menu(new QMenu(&widget)); QVERIFY(!menu->isTearOffEnabled()); //default value menu->setTearOffEnabled(true); menu->addAction("aaa"); @@ -607,24 +616,43 @@ void tst_QMenu::tearOff() widget.activateWindow(); QVERIFY(QTest::qWaitForWindowActive(&widget)); menu->popup(widget.geometry().topRight() + QPoint(50, 0)); - QVERIFY(QTest::qWaitForWindowActive(menu)); + QVERIFY(QTest::qWaitForWindowActive(menu.data())); QVERIFY(!menu->isTearOffMenuVisible()); - QTest::mouseClick(menu, Qt::LeftButton, 0, QPoint(3, 3), 10); + QTest::mouseClick(menu.data(), Qt::LeftButton, 0, QPoint(3, 3), 10); QTRY_VERIFY(menu->isTearOffMenuVisible()); - QPointer<QMenu> torn = 0; - foreach (QWidget *w, QApplication::allWidgets()) { - if (w->inherits("QTornOffMenu")) { - torn = static_cast<QMenu *>(w); - break; - } - } + QPointer<QMenu> torn = getTornOffMenu(); + QVERIFY(torn); + QVERIFY(torn->isVisible()); + + menu->hideTearOffMenu(); + QVERIFY(!menu->isTearOffMenuVisible()); + QVERIFY(!torn->isVisible()); + +#ifndef QT_NO_CURSOR + // Test under-mouse positioning + menu->showTearOffMenu(); + torn = getTornOffMenu(); QVERIFY(torn); QVERIFY(torn->isVisible()); + QVERIFY(menu->isTearOffMenuVisible()); + // Some platforms include the window title bar in its geometry. + QTRY_COMPARE(torn->windowHandle()->position(), QCursor::pos()); menu->hideTearOffMenu(); QVERIFY(!menu->isTearOffMenuVisible()); QVERIFY(!torn->isVisible()); + + // Test custom positioning + const QPoint &pos = QCursor::pos() / 2 + QPoint(10, 10); + menu->showTearOffMenu(pos); + torn = getTornOffMenu(); + QVERIFY(torn); + QVERIFY(torn->isVisible()); + QVERIFY(menu->isTearOffMenuVisible()); + // Some platforms include the window title bar in its geometry. + QTRY_COMPARE(torn->windowHandle()->position(), pos); +#endif // QT_NO_CURSOR } void tst_QMenu::layoutDirection() |