diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2019-01-28 13:14:30 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-02-04 14:53:39 +0000 |
commit | 763b51d494b708790acc3c3f797313f29d09976b (patch) | |
tree | 65f5dba1a2d0ead6b3e3259b14bc5ddedc12484a /src/quicktemplates2/qquickmenu.cpp | |
parent | 32f05c5f5f5a580af0e0fe0964d71cf498ce391b (diff) |
Menu: fix disabled sub-menu items being highlighted
When a menu item with a sub-menu was triggered by key or mouse,
it would open the sub-menu with the first menu item highlighted.
This doesn't make sense for disabled menu items, so this patch
makes it find the first enabled item.
Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd
Fixes: QTBUG-69540
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenu.cpp')
-rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index f52405c9..4bed851c 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -468,10 +468,12 @@ void QQuickMenuPrivate::onItemTriggered() if (!item) return; - if (QQuickMenu *subMenu = item->subMenu()) - subMenu->popup(subMenu->itemAt(0)); - else + if (QQuickMenu *subMenu = item->subMenu()) { + auto subMenuPrivate = QQuickMenuPrivate::get(subMenu); + subMenu->popup(subMenuPrivate->firstEnabledMenuItem()); + } else { q->dismiss(); + } } void QQuickMenuPrivate::onItemActiveFocusChanged() @@ -621,6 +623,22 @@ bool QQuickMenuPrivate::activatePreviousItem() return false; } +QQuickMenuItem *QQuickMenuPrivate::firstEnabledMenuItem() const +{ + for (int i = 0; i < contentModel->count(); ++i) { + QQuickItem *item = itemAt(i); + if (!item || !item->isEnabled()) + continue; + + QQuickMenuItem *menuItem = qobject_cast<QQuickMenuItem *>(item); + if (!menuItem) + continue; + + return menuItem; + } + return nullptr; +} + void QQuickMenuPrivate::contentData_append(QQmlListProperty<QObject> *prop, QObject *obj) { QQuickMenu *q = qobject_cast<QQuickMenu *>(prop->object); @@ -1419,7 +1437,8 @@ void QQuickMenu::keyPressEvent(QKeyEvent *event) } } else { if (QQuickMenu *subMenu = d->currentSubMenu()) { - subMenu->popup(subMenu->itemAt(0)); + auto subMenuPrivate = QQuickMenuPrivate::get(subMenu); + subMenu->popup(subMenuPrivate->firstEnabledMenuItem()); event->accept(); } } |