diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2019-02-01 13:53:06 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-02-04 15:38:56 +0000 |
| commit | 1d29b1e36732a7d17ed34c5fa207e7b935f2f41d (patch) | |
| tree | 6b301be574b0ee83fa536ce79dc5753ddb7e0991 /src | |
| parent | 763b51d494b708790acc3c3f797313f29d09976b (diff) | |
QQuickMenu: don't give focus to disabled menu items
Change-Id: I7eb394ca3991eae585fbbd8e665c46b11ef64a07
Fixes: QTBUG-70181
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 4bed851c..f91d15a5 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -602,7 +602,7 @@ bool QQuickMenuPrivate::activateNextItem() int count = contentModel->count(); while (++index < count) { QQuickItem *item = itemAt(index); - if (!item || !item->activeFocusOnTab()) + if (!item || !item->activeFocusOnTab() || !item->isEnabled()) continue; setCurrentIndex(index, Qt::TabFocusReason); return true; @@ -615,7 +615,7 @@ bool QQuickMenuPrivate::activatePreviousItem() int index = currentIndex; while (--index >= 0) { QQuickItem *item = itemAt(index); - if (!item || !item->activeFocusOnTab()) + if (!item || !item->activeFocusOnTab() || !item->isEnabled()) continue; setCurrentIndex(index, Qt::BacktabFocusReason); return true; |