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

Add tst_QMenuBar::pressDragRelease

Browse Source 
Test this gesture with both mouse and touch.

Change-Id: I0285e7a17302361893c4b7ed0faf97c4f342814e
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Shawn Rutledge 2024-05-28 17:14:17 -07:00
parent d06047698c
commit 12d45d049a
1 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
View File

@ -124,6 +124,9 @@ private slots:
void platformMenu(); void platformMenu();
void addActionQt5connect(); void addActionQt5connect();
void QTBUG_65488_hiddenActionTriggered(); void QTBUG_65488_hiddenActionTriggered();
void pressDragRelease_data();
void pressDragRelease();
protected slots: protected slots:
void onSimpleActivated( QAction*); void onSimpleActivated( QAction*);
void onComplexActionTriggered(); void onComplexActionTriggered();
@ -141,6 +144,7 @@ private:
int m_simpleActivatedCount; int m_simpleActivatedCount;
int m_complexTriggerCount[int('k')]; int m_complexTriggerCount[int('k')];
QMenuBar* taskQTBUG53205MenuBar; QMenuBar* taskQTBUG53205MenuBar;
QScopedPointer<QPointingDevice> m_touchScreen = QScopedPointer<QPointingDevice>(QTest::createTouchDevice());
}; };
// Testing get/set functions // Testing get/set functions
@ -1420,6 +1424,70 @@ void tst_QMenuBar::QTBUG_65488_hiddenActionTriggered()
QCOMPARE(spy.size(), 0); QCOMPARE(spy.size(), 0);
} }
void tst_QMenuBar::pressDragRelease_data()
{
QTest::addColumn<QPointingDevice *>("device");
QTest::newRow("mouse") << const_cast<QPointingDevice *>(QPointingDevice::primaryPointingDevice());
QTest::newRow("touchscreen") << m_touchScreen.get();
}
void tst_QMenuBar::pressDragRelease()
{
QFETCH(QPointingDevice *, device);
QMainWindow w;
const TestMenu menu = initWindowWithComplexMenuBar(w);
const QMenu *firstMenu = menu.menus.first();
QAction *hoveredAction = nullptr;
connect(firstMenu, &QMenu::hovered, firstMenu, [&hoveredAction](QAction *hov) { hoveredAction = hov; });
w.show();
QVERIFY(QTest::qWaitForWindowActive(&w));
QWindow *win = w.windowHandle();
const QPoint p1(50, w.menuBar()->geometry().height() / 2);
switch (device->type()) {
case QInputDevice::DeviceType::Mouse:
case QInputDevice::DeviceType::TouchPad:
QTest::mousePress(win, Qt::LeftButton, {}, p1);
break;
case QInputDevice::DeviceType::TouchScreen:
QTest::touchEvent(win, device).press(0, p1);
break;
default:
break;
}
QTRY_VERIFY(firstMenu->isVisible());
const QPoint firstMenuItemPos = firstMenu->geometry().center() - QPoint(0, 2);
const QPoint firstMenuItemPosInWin = w.mapFromGlobal(firstMenuItemPos);
switch (device->type()) {
case QInputDevice::DeviceType::Mouse:
case QInputDevice::DeviceType::TouchPad:
QTest::mouseMove(win, firstMenuItemPosInWin);
break;
case QInputDevice::DeviceType::TouchScreen:
QTest::touchEvent(win, device).move(0, firstMenuItemPosInWin);
break;
default:
break;
}
QVERIFY(hoveredAction);
QCOMPARE(hoveredAction, firstMenu->actionAt(firstMenu->mapFromGlobal(firstMenuItemPos)));
QSignalSpy triggeredSpy(hoveredAction, &QAction::triggered);
switch (device->type()) {
case QInputDevice::DeviceType::Mouse:
case QInputDevice::DeviceType::TouchPad:
QTest::mouseRelease(win, Qt::LeftButton, {}, firstMenuItemPosInWin);
break;
case QInputDevice::DeviceType::TouchScreen:
QTest::touchEvent(win, device).release(0, firstMenuItemPosInWin);
break;
default:
break;
}
QTRY_COMPARE(triggeredSpy.size(), 1);
}
// QTBUG-56526 // QTBUG-56526
void tst_QMenuBar::platformMenu() void tst_QMenuBar::platformMenu()
{ {