diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-10 16:56:51 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-11 16:37:40 +0000 |
| commit | f0efd6b5f49703f64b97287ec7ecabc777536d65 (patch) | |
| tree | a41b0d33a51669e1cff6a632c59cc9d9db1807b9 /src/quicktemplates2/qquickmenu.cpp | |
| parent | d2d0e08e584c780b4b70a37e7b39c6bbcc7bc63e (diff) | |
QQuickMenu: cleanup focus handling
Since 744164e6, there is no more need to manually transfer the focus
when dealing with nested menus.
Change-Id: I8e283b2ef4501aa36d57b3e06190237a1fee7133
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 634528c1..c87573a1 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -449,10 +449,6 @@ void QQuickMenuPrivate::openSubMenu(QQuickMenuItem *item, bool activate) subMenu->setCascade(cascade); subMenu->open(); - // transfer focus to the sub-menu - if (focus) - subMenu->popupItem()->setFocus(true); - if (!subMenu->cascade()) q->close(); } @@ -462,13 +458,10 @@ void QQuickMenuPrivate::closeSubMenu(QQuickMenu *subMenu) if (!subMenu || !subMenu->isVisible()) return; - // transfer focus back to the parent menu + // re-open the parent menu of a cascading sub-menu QQuickMenu *parentMenu = QQuickMenuPrivate::get(subMenu)->parentMenu; - if (parentMenu && parentMenu->hasFocus()) { - parentMenu->popupItem()->setFocus(true); - if (!subMenu->cascade()) - parentMenu->open(); - } + if (parentMenu && !subMenu->cascade()) + parentMenu->open(); // close the whole chain of sub-menus while (subMenu) { |