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 | |
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>
-rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml | 74 | ||||
-rw-r--r-- | tests/auto/qquickmenu/tst_qquickmenu.cpp | 64 |
3 files changed, 140 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; diff --git a/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml b/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml new file mode 100644 index 00000000..a39c5f44 --- /dev/null +++ b/tests/auto/qquickmenu/data/disabledMenuItemKeyNavigation.qml @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +ApplicationWindow { + width: 200 + height: 200 + + property alias menu: menu + + Menu { + id: menu + + MenuItem { + text: qsTr("Enabled 1") + } + MenuItem { + text: qsTr("Disabled 1") + enabled: false + } + MenuItem { + text: qsTr("Enabled 2") + } + } +} diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 8e65383c..a24305b7 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -68,6 +68,7 @@ private slots: void mouse(); void pressAndHold(); void contextMenuKeyboard(); + void disabledMenuItemKeyNavigation(); void mnemonics(); void menuButton(); void addItem(); @@ -396,6 +397,69 @@ void tst_QQuickMenu::contextMenuKeyboard() QVERIFY(!menu->isVisible()); } +// QTBUG-70181 +void tst_QQuickMenu::disabledMenuItemKeyNavigation() +{ + if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) + QSKIP("This platform only allows tab focus for text controls"); + + QQuickApplicationHelper helper(this, QLatin1String("disabledMenuItemKeyNavigation.qml")); + + QQuickApplicationWindow *window = helper.appWindow; + window->show(); + window->requestActivate(); + QVERIFY(QTest::qWaitForWindowActive(window)); + QVERIFY(QGuiApplication::focusWindow() == window); + centerOnScreen(window); + moveMouseAway(window); + + QQuickMenu *menu = window->property("menu").value<QQuickMenu*>(); + QCOMPARE(menu->currentIndex(), -1); + QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); + + QQuickMenuItem *firstItem = qobject_cast<QQuickMenuItem *>(menu->itemAt(0)); + QVERIFY(firstItem); + + QQuickMenuItem *secondItem = qobject_cast<QQuickMenuItem *>(menu->itemAt(1)); + QVERIFY(secondItem); + + QQuickMenuItem *thirdItem = qobject_cast<QQuickMenuItem *>(menu->itemAt(2)); + QVERIFY(thirdItem); + + menu->setFocus(true); + menu->open(); + QVERIFY(menu->isVisible()); + QVERIFY(!firstItem->hasActiveFocus()); + QVERIFY(!firstItem->property("highlighted").toBool()); + QCOMPARE(menu->currentIndex(), -1); + + QTest::keyClick(window, Qt::Key_Tab); + QVERIFY(firstItem->hasActiveFocus()); + QVERIFY(firstItem->hasVisualFocus()); + QVERIFY(firstItem->isHighlighted()); + QCOMPARE(firstItem->focusReason(), Qt::TabFocusReason); + QCOMPARE(menu->currentIndex(), 0); + + // Shouldn't be possible to give focus to a disabled menu item. + QTest::keyClick(window, Qt::Key_Down); + QVERIFY(!secondItem->hasActiveFocus()); + QVERIFY(!secondItem->hasVisualFocus()); + QVERIFY(!secondItem->isHighlighted()); + QVERIFY(thirdItem->hasActiveFocus()); + QVERIFY(thirdItem->hasVisualFocus()); + QVERIFY(thirdItem->isHighlighted()); + QCOMPARE(thirdItem->focusReason(), Qt::TabFocusReason); + + QTest::keyClick(window, Qt::Key_Up); + QVERIFY(firstItem->hasActiveFocus()); + QVERIFY(firstItem->hasVisualFocus()); + QVERIFY(firstItem->isHighlighted()); + QCOMPARE(firstItem->focusReason(), Qt::BacktabFocusReason); + + QTest::keyClick(window, Qt::Key_Escape); + QVERIFY(!menu->isVisible()); +} + void tst_QQuickMenu::mnemonics() { #ifdef Q_OS_MACOS |