From 444ddd9b662ab00e21cc56174ed0670109a2d3af Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 12 Jul 2017 15:32:51 +0200 Subject: QQuickMenu: close non-cascading parent menu from prepareEnterTransition() Change-Id: I075241c07702d1e8bbc89c43cef35525d9e67cc7 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickmenu.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 77327e55..6abaaf36 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -379,6 +379,9 @@ void QQuickMenuPrivate::reposition() bool QQuickMenuPrivate::prepareEnterTransition() { Q_Q(QQuickMenu); + if (parentMenu && !cascade) + parentMenu->close(); + // If a cascading sub-menu doesn't have enough space to open on // the right, it flips on the other side of the parent menu. allowHorizontalFlip = cascade && parentMenu; @@ -471,14 +474,10 @@ void QQuickMenuPrivate::onItemActiveFocusChanged() void QQuickMenuPrivate::openSubMenu(QQuickMenuItem *item, bool activate) { - Q_Q(QQuickMenu); QQuickMenu *subMenu = item ? item->subMenu() : nullptr; if (!subMenu) return; - if (!cascade) - q->close(); - if (activate) QQuickMenuPrivate::get(subMenu)->setCurrentIndex(0, Qt::PopupFocusReason); subMenu->open(); -- cgit v1.2.3