aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/menu
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-05-11 15:15:17 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-05-12 07:57:17 +0000
commit9cf30f1613bc18a1f16c70c8d293dad3bc23b6d9 (patch)
tree95586ce80f629ce863dd8bfefcac0c9e66541b42 /tests/auto/menu
parenteb6e122c68333382309843ad96e7d04d2c5a3595 (diff)
QQuickMenu: cull items outside the popup
Same as a055629 for QQuickSwipeView. This hides them until they become visible in the popup. Hiding them explicitly is not an option, because then they will never show up. This technique is used in QQuickItemView::initItem() and FxViewItem::setVisible(). Change-Id: I848652fd98f47b87a85f742205d1db729ad9de8d Task-number: QTBUG-53262 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/menu')
-rw-r--r--tests/auto/menu/tst_menu.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/menu/tst_menu.cpp
index 0d72814c..dc9c296a 100644
--- a/tests/auto/menu/tst_menu.cpp
+++ b/tests/auto/menu/tst_menu.cpp
@@ -261,11 +261,15 @@ void tst_menu::addItem()
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QVERIFY(menu);
menu->open();
+ QVERIFY(menu->isVisible());
QQuickItem *menuItem = menu->itemAt(0);
+ QVERIFY(menuItem);
+ QTRY_VERIFY(!QQuickItemPrivate::get(menuItem)->culled); // QTBUG-53262
+
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
menuItem->mapToScene(QPointF(menuItem->width() / 2, menuItem->height() / 2)).toPoint());
- QVERIFY(!menu->isVisible());
+ QTRY_VERIFY(!menu->isVisible());
}
QTEST_MAIN(tst_menu)