qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/auto/qquickmenu/tst_qquickmenu.cpp

1315 lines
52 KiB
C++
Raw Normal View History

Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
/****************************************************************************
**
Welcome to 2017 Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-01-09 16:13:48 +00:00
** Copyright (C) 2017 The Qt Company Ltd.
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
** Contact: http://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL3$
** 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 http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free
** Software Foundation and appearing in the file LICENSE.GPL included in
** the packaging of this file. Please review the following information to
** ensure the GNU General Public License version 2.0 requirements will be
** met: http://www.gnu.org/licenses/gpl-2.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <qtest.h>
#include <QtTest/QSignalSpy>
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
#include <QtGui/qcursor.h>
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
#include <QtGui/qstylehints.h>
#include <QtQml/qqmlengine.h>
#include <QtQml/qqmlcomponent.h>
#include <QtQml/qqmlcontext.h>
#include <QtQuick/qquickview.h>
#include <QtQuick/private/qquickitem_p.h>
#include "../shared/util.h"
#include "../shared/visualtestutil.h"
Add QQuickMenu::add/insert/remove/takeAction() [ChangeLog][Controls][Menu] Added addAction(), insertAction(), removeAction(), and takeAction() methods for adding and removing actions programmatically. Change-Id: I7d494ef1edc1cf384314fa90d97cfd2290d2e8a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-09 08:09:28 +00:00
#include <QtQuickTemplates2/private/qquickaction_p.h>
Templates: rename the C++ module to qtquicktemplates2 Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-04-13 13:59:53 +00:00
#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
#include <QtQuickTemplates2/private/qquickoverlay_p.h>
#include <QtQuickTemplates2/private/qquickbutton_p.h>
#include <QtQuickTemplates2/private/qquickmenu_p.h>
#include <QtQuickTemplates2/private/qquickmenuitem_p.h>
Add MenuSeparator [ChangeLog][Controls] Added MenuSeparator to visually distinguish between groups of items in a menu. Change-Id: I7a52910b19633ed1188c90ca56c92346a28d4d5c Task-number: QTBUG-54862 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-07-21 14:04:18 +00:00
#include <QtQuickTemplates2/private/qquickmenuseparator_p.h>
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
using namespace QQuickVisualTestUtil;
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
class tst_QQuickMenu : public QQmlDataTest
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
{
Q_OBJECT
public:
private slots:
void defaults();
Add QQuickMenu::count [ChangeLog][Controls][Menu] Added "count" property. Change-Id: I42971a6bf8fd74b9f2d3df52f191b66cd7022b81 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-12 13:58:02 +00:00
void count();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
void mouse();
QQuickMenu: fix press-and-hold support Remove the OnReleaseOutside close policy, just use the defaults from QQuickPopup. This way menus won't get immediately closed on release, when opened from an onPressAndHold signal handler. Task-number: QTBUG-61608 Change-Id: Ifedd596aa0e71ac5f4211fa42e2ae499918df1b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-29 11:15:24 +00:00
void pressAndHold();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
void contextMenuKeyboard();
QQuickMenu: fix mnemonics for dynamic action/submenu items Previously mnemonics worked only for "normal" menu items, but not for dynamically created menu items that present actions and sub-menus. This patch fixes the issue by specifying the menu as a QObject-parent for such dynamically created items, because QQuickShortcutContext is based on QObject-hierarchy. Change-Id: I3637ef06e9cb2a27673e4618c253279a0123b7c8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-29 12:23:13 +00:00
void mnemonics();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
void menuButton();
Menu: support dynamically added items in the same way as static ones Task-number: QTBUG-53274 Change-Id: I172e431cd456b91dee569b510288d0eccbdb4cef Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-05-10 11:58:05 +00:00
void addItem();
Add MenuSeparator [ChangeLog][Controls] Added MenuSeparator to visually distinguish between groups of items in a menu. Change-Id: I7a52910b19633ed1188c90ca56c92346a28d4d5c Task-number: QTBUG-54862 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-07-21 14:04:18 +00:00
void menuSeparator();
QQuickMenu: fix Repeater support QQuickMenu had itemChildAdded() copied from QQuickContainer, but it did not actually install an item change listener on the content item so itemChildAdded() got never called. Change-Id: Idfe558c7055b9a3df124b1f009941c423ecef4bb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-12-28 19:24:18 +00:00
void repeater();
void order();
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
void popup();
QQuickMenu: add support for declaring Actions [ChangeLog][Controls][Menu] Added support for declaring Actions. The new "delegate" property is used to define a Component that is used to create menu items that present the actions. Change-Id: If26f38f6910aa5592879703429a2b418193d5710 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 18:09:44 +00:00
void actions();
QQuickMenu: removeItem(Item) and takeItem(int) Deprecate removeItem(int) in favor of removeItem(Item) and takeItem(int) with clearer semantics. If one already has access to an item, one can pass it to removeItem() to get rid of it for good, instead of having to call destroy() by hand. If one knows the index instead, we provide a way to take the respective item out of the menu, and let the user decide what to do with it. This way we provide convenient ways to remove & destroy items in one go, and to take items out without destroying them. This nice pattern was once upon time planned for the QQC1 containers such as SplitView, and should have been used for the QQC2 containers, but was simply forgotten during the development... [ChangeLog][Controls][Menu] Deprecated removeItem(int) in favor of removeItem(Item) and takeItem(int) with clearer semantics. The former destroys the item, whereas the latter transfers ownership to the caller. Change-Id: Id2a07fb65019b2904a013c8bcc3154089d36a0ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-02 14:18:56 +00:00
void removeTakeItem();
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
void subMenuMouse_data();
void subMenuMouse();
void subMenuKeyboard_data();
void subMenuKeyboard();
void subMenuPosition_data();
void subMenuPosition();
Add QQuickMenu::add/insert/remove/takeMenu() [ChangeLog][Controls][Menu] Added addMenu(), insertMenu(), removeMenu(), and takeMenu() methods for adding and removing sub-menus programmatically. Change-Id: Ibf39448cdf528f64695b1ee5f0781384b754ba22 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-07 17:43:58 +00:00
void addRemoveSubMenus();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
};
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
void tst_QQuickMenu::defaults()
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
{
Move ApplicationHelper to visualtestutil.h and rename it This class is useful for other auto tests, like Popup's. Change-Id: Ie193c07e5b53b67493fceba9a1c32798db2f4e34 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-09 14:37:01 +00:00
QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
auto tests: allow using QQuickWindow with QQuickApplicationHelper This allows us to run the relevant popup tests for both QQuickWindow and QQuickApplicationWindow. Change-Id: I14b6435afeeb8a6cf640d8c52ad1d9e1fae070b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-09-03 13:15:53 +00:00
QQuickMenu *emptyMenu = helper.appWindow->property("emptyMenu").value<QQuickMenu*>();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(emptyMenu->isVisible(), false);
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(emptyMenu->currentIndex(), -1);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(emptyMenu->contentItem()->property("currentIndex"), QVariant(-1));
Add QQuickMenu::count [ChangeLog][Controls][Menu] Added "count" property. Change-Id: I42971a6bf8fd74b9f2d3df52f191b66cd7022b81 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-12 13:58:02 +00:00
QCOMPARE(emptyMenu->count(), 0);
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::count()
Add QQuickMenu::count [ChangeLog][Controls][Menu] Added "count" property. Change-Id: I42971a6bf8fd74b9f2d3df52f191b66cd7022b81 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-12 13:58:02 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
QQuickMenu *menu = helper.window->property("emptyMenu").value<QQuickMenu*>();
QVERIFY(menu);
QSignalSpy countSpy(menu, &QQuickMenu::countChanged);
QVERIFY(countSpy.isValid());
menu->addItem(new QQuickItem);
QCOMPARE(menu->count(), 1);
QCOMPARE(countSpy.count(), 1);
menu->insertItem(0, new QQuickItem);
QCOMPARE(menu->count(), 2);
QCOMPARE(countSpy.count(), 2);
menu->removeItem(menu->itemAt(1));
QCOMPARE(menu->count(), 1);
QCOMPARE(countSpy.count(), 3);
QQuickItem *item = menu->takeItem(0);
QVERIFY(item);
QCOMPARE(menu->count(), 0);
QCOMPARE(countSpy.count(), 4);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
}
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
void tst_QQuickMenu::mouse()
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
{
Fix tests for boot2qt The tests for boot2qt were disabled with commit 28063805bf22b77a93f22a4289ca8afa9f1cb201. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Some tests involving mouse behavior and window grabbing need to be skipped on minimal/offscreen platforms. Task-number: QTBUG-60268 Change-Id: Ib468638df8d5001bf127dd17aee7dcfe38b11780 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-05 09:48:40 +00:00
if ((QGuiApplication::platformName() == QLatin1String("offscreen"))
|| (QGuiApplication::platformName() == QLatin1String("minimal")))
QSKIP("Mouse hovering not functional on offscreen/minimal platforms");
Move ApplicationHelper to visualtestutil.h and rename it This class is useful for other auto tests, like Popup's. Change-Id: Ie193c07e5b53b67493fceba9a1c32798db2f4e34 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-09 14:37:01 +00:00
QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
auto tests: allow using QQuickWindow with QQuickApplicationHelper This allows us to run the relevant popup tests for both QQuickWindow and QQuickApplicationWindow. Change-Id: I14b6435afeeb8a6cf640d8c52ad1d9e1fae070b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-09-03 13:15:53 +00:00
QQuickApplicationWindow *window = helper.appWindow;
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
Fix failing tests in tst_menu and tst_qquickmenubar As mentioned in the bug report for the failing tst_qquickmenubar test, the window is sometimes opened at the bottom right corner of the screen on the Ubuntu CI machines. However, even after centering the window on the screen, the old setPos() call still caused the tests to fail. So, we position the cursor past a different corner of the window, which works.. though I don't know why. Task-number: QTBUG-62363 Task-number: QTBUG-62383 Change-Id: I3649230002eaac5a6391daff24427e6f9f58cfa5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-09 10:51:40 +00:00
centerOnScreen(window);
Stabilize tst_menu Add QQuickVisualTestUtil::moveMouseAway() (adapted from qtdeclarative) to help with testing menus that are now highlighting items on hover. It is important to move the mouse cursor away outside the window in such tests where hover highlight might conflict with the test. Change-Id: If3d642dd4f3ba2936a0d22c078d8fb0125d16c6c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-10 08:18:21 +00:00
moveMouseAway(window);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
Popup: rename show()/hide() to open()/close() QML popups have traditionally used more explicit open() and close(). Renaming them to show() and hide() at this stage doesn't seem to have any real advantages. Change-Id: I1e7c8c4817c67e62cef965525e00f5bf125a7d76 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-11 14:34:55 +00:00
menu->open();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(menu->isVisible());
Refactor Popup Added relevant properties to make it almost like a Control: x, y, width, height, padding, background... This change makes popup use an internal item where the style/user-supplied contentItem and background are re-parented. This way we can provide a default style (background) for Popup. Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-22 11:10:12 +00:00
QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QQuickItem *firstItem = menu->itemAt(0);
AbstractButton: remove the mouse params from signals If we ever want to expose these, the name would be something else than "mouse"... :) Change-Id: Ie9dad16e84708059fd0b43d4764925db7b014d64 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-25 14:14:27 +00:00
QSignalSpy clickedSpy(firstItem, SIGNAL(clicked()));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QSignalSpy triggeredSpy(firstItem, SIGNAL(triggered()));
QSignalSpy visibleSpy(menu, SIGNAL(visibleChanged()));
// Ensure that presses cause the current index to change,
// so that the highlight acts as a way of illustrating press state.
QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(firstItem->width() / 2, firstItem->height() / 2));
QVERIFY(firstItem->hasActiveFocus());
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), 0);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(0));
QVERIFY(menu->isVisible());
QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(firstItem->width() / 2, firstItem->height() / 2));
QCOMPARE(clickedSpy.count(), 1);
QCOMPARE(triggeredSpy.count(), 1);
QCOMPARE(visibleSpy.count(), 1);
QVERIFY(!menu->isVisible());
QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()));
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), -1);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
Popup: rename show()/hide() to open()/close() QML popups have traditionally used more explicit open() and close(). Renaming them to show() and hide() at this stage doesn't seem to have any real advantages. Change-Id: I1e7c8c4817c67e62cef965525e00f5bf125a7d76 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-11 14:34:55 +00:00
menu->open();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(visibleSpy.count(), 2);
QVERIFY(menu->isVisible());
Refactor Popup Added relevant properties to make it almost like a Control: x, y, width, height, padding, background... This change makes popup use an internal item where the style/user-supplied contentItem and background are re-parented. This way we can provide a default style (background) for Popup. Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-22 11:10:12 +00:00
QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
// Ensure that we have enough space to click outside of the menu.
QVERIFY(window->width() > menu->contentItem()->width());
QVERIFY(window->height() > menu->contentItem()->height());
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
QPoint(menu->contentItem()->width() + 1, menu->contentItem()->height() + 1));
QCOMPARE(visibleSpy.count(), 3);
QVERIFY(!menu->isVisible());
Refactor Popup Added relevant properties to make it almost like a Control: x, y, width, height, padding, background... This change makes popup use an internal item where the style/user-supplied contentItem and background are re-parented. This way we can provide a default style (background) for Popup. Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-22 11:10:12 +00:00
QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
Popup: rename show()/hide() to open()/close() QML popups have traditionally used more explicit open() and close(). Renaming them to show() and hide() at this stage doesn't seem to have any real advantages. Change-Id: I1e7c8c4817c67e62cef965525e00f5bf125a7d76 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-11 14:34:55 +00:00
menu->open();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(visibleSpy.count(), 4);
QVERIFY(menu->isVisible());
Refactor Popup Added relevant properties to make it almost like a Control: x, y, width, height, padding, background... This change makes popup use an internal item where the style/user-supplied contentItem and background are re-parented. This way we can provide a default style (background) for Popup. Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-22 11:10:12 +00:00
QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QQuickMenu: update the highlighted item on mouse hover This is the expected behavior on desktop. NOTE: It must be possible to mix mouse hover highlighting, and keyboard navigation in the way that keyboard navigation must seamlessly continue from the item that was previously mouse highlighted. Furthermore, there should be only one item highlighted at a time. In order to be able to respect keyboard navigation while another item is hovered and vice versa, the visual highlight should be bound to MenuItem::highlighted instead of Control::activeFocus or Control::hovered. [ChangeLog][Controls][MenuItem] Menu has been fixed to highlight its items while key navigating and mouse hovering to ensure seamless item highlight between mouse hover and key navigation. In order to provide appropriate highlighting that works for key navigation and mouse hover, styles should bind their visual highlight to MenuItem::highlighted instead of Control::activeFocus or Control::hovered. Change-Id: I70cad5a5b441f2616d1ce2166e97974dc1ae063f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-06 13:58:36 +00:00
// Hover-highlight through the menu items one by one
QQuickItem *prevHoverItem = nullptr;
QQuickItem *listView = menu->contentItem();
for (int y = 0; y < listView->height(); ++y) {
QQuickItem *hoverItem = nullptr;
QVERIFY(QMetaObject::invokeMethod(listView, "itemAt", Q_RETURN_ARG(QQuickItem *, hoverItem), Q_ARG(qreal, 0), Q_ARG(qreal, listView->property("contentY").toReal() + y)));
if (!hoverItem || !hoverItem->isVisible() || hoverItem == prevHoverItem)
continue;
QTest::mouseMove(window, QPoint(hoverItem->x() + hoverItem->width() / 2, hoverItem->y() + hoverItem->height() / 2));
QTRY_VERIFY(hoverItem->property("highlighted").toBool());
if (prevHoverItem)
QVERIFY(!prevHoverItem->property("highlighted").toBool());
prevHoverItem = hoverItem;
}
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
// Try pressing within the menu and releasing outside of it; it should close.
Rename Panel to Popup Popup is a more descriptive name. Furthermore, this name change opens the door for another type called Pane. It gives the appropriate background color for the current style & theme. Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-08 13:26:51 +00:00
// TODO: won't work until QQuickPopup::releasedOutside() actually gets emitted
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
// QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(firstItem->width() / 2, firstItem->height() / 2));
// QVERIFY(firstItem->hasActiveFocus());
// QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(0));
// QVERIFY(menu->isVisible());
// QCOMPARE(triggeredSpy.count(), 1);
// QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(menu->contentItem()->width() + 1, firstItem->height() / 2));
// QCOMPARE(clickedSpy.count(), 1);
// QCOMPARE(triggeredSpy.count(), 1);
// QCOMPARE(visibleSpy.count(), 5);
// QVERIFY(!menu->isVisible());
// QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()));
// QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
}
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
void tst_QQuickMenu::pressAndHold()
QQuickMenu: fix press-and-hold support Remove the OnReleaseOutside close policy, just use the defaults from QQuickPopup. This way menus won't get immediately closed on release, when opened from an onPressAndHold signal handler. Task-number: QTBUG-61608 Change-Id: Ifedd596aa0e71ac5f4211fa42e2ae499918df1b2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-29 11:15:24 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("pressAndHold.qml"));
QQuickWindow *window = helper.window;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QVERIFY(menu);
QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
QTRY_VERIFY(menu->isVisible());
QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
QVERIFY(menu->isVisible());
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
QTRY_VERIFY(!menu->isVisible());
}
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
void tst_QQuickMenu::contextMenuKeyboard()
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
{
if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls)
QSKIP("This platform only allows tab focus for text controls");
Move ApplicationHelper to visualtestutil.h and rename it This class is useful for other auto tests, like Popup's. Change-Id: Ie193c07e5b53b67493fceba9a1c32798db2f4e34 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-09 14:37:01 +00:00
QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
auto tests: allow using QQuickWindow with QQuickApplicationHelper This allows us to run the relevant popup tests for both QQuickWindow and QQuickApplicationWindow. Change-Id: I14b6435afeeb8a6cf640d8c52ad1d9e1fae070b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-09-03 13:15:53 +00:00
QQuickApplicationWindow *window = helper.appWindow;
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window));
QVERIFY(QGuiApplication::focusWindow() == window);
Fix failing tests in tst_menu and tst_qquickmenubar As mentioned in the bug report for the failing tst_qquickmenubar test, the window is sometimes opened at the bottom right corner of the screen on the Ubuntu CI machines. However, even after centering the window on the screen, the old setPos() call still caused the tests to fail. So, we position the cursor past a different corner of the window, which works.. though I don't know why. Task-number: QTBUG-62363 Task-number: QTBUG-62383 Change-Id: I3649230002eaac5a6391daff24427e6f9f58cfa5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-09 10:51:40 +00:00
centerOnScreen(window);
Stabilize tst_menu Add QQuickVisualTestUtil::moveMouseAway() (adapted from qtdeclarative) to help with testing menus that are now highlighting items on hover. It is important to move the mouse cursor away outside the window in such tests where hover highlight might conflict with the test. Change-Id: If3d642dd4f3ba2936a0d22c078d8fb0125d16c6c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-10 08:18:21 +00:00
moveMouseAway(window);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), -1);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QQuickMenuItem *firstItem = qobject_cast<QQuickMenuItem *>(menu->itemAt(0));
QVERIFY(firstItem);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QSignalSpy visibleSpy(menu, SIGNAL(visibleChanged()));
menu->setFocus(true);
Popup: rename show()/hide() to open()/close() QML popups have traditionally used more explicit open() and close(). Renaming them to show() and hide() at this stage doesn't seem to have any real advantages. Change-Id: I1e7c8c4817c67e62cef965525e00f5bf125a7d76 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-11 14:34:55 +00:00
menu->open();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(visibleSpy.count(), 1);
QVERIFY(menu->isVisible());
Refactor Popup Added relevant properties to make it almost like a Control: x, y, width, height, padding, background... This change makes popup use an internal item where the style/user-supplied contentItem and background are re-parented. This way we can provide a default style (background) for Popup. Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-22 11:10:12 +00:00
QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(!firstItem->hasActiveFocus());
QQuickMenu: update the highlighted item on mouse hover This is the expected behavior on desktop. NOTE: It must be possible to mix mouse hover highlighting, and keyboard navigation in the way that keyboard navigation must seamlessly continue from the item that was previously mouse highlighted. Furthermore, there should be only one item highlighted at a time. In order to be able to respect keyboard navigation while another item is hovered and vice versa, the visual highlight should be bound to MenuItem::highlighted instead of Control::activeFocus or Control::hovered. [ChangeLog][Controls][MenuItem] Menu has been fixed to highlight its items while key navigating and mouse hovering to ensure seamless item highlight between mouse hover and key navigation. In order to provide appropriate highlighting that works for key navigation and mouse hover, styles should bind their visual highlight to MenuItem::highlighted instead of Control::activeFocus or Control::hovered. Change-Id: I70cad5a5b441f2616d1ce2166e97974dc1ae063f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-06 13:58:36 +00:00
QVERIFY(!firstItem->property("highlighted").toBool());
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), -1);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
QTest::keyClick(window, Qt::Key_Tab);
QVERIFY(firstItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(firstItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(firstItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QCOMPARE(firstItem->focusReason(), Qt::TabFocusReason);
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), 0);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(0));
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QQuickMenuItem *secondItem = qobject_cast<QQuickMenuItem *>(menu->itemAt(1));
QVERIFY(secondItem);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QTest::keyClick(window, Qt::Key_Tab);
QVERIFY(!firstItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!firstItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!firstItem->isHighlighted());
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(secondItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(secondItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(secondItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QCOMPARE(secondItem->focusReason(), Qt::TabFocusReason);
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), 1);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(1));
QSignalSpy secondTriggeredSpy(secondItem, SIGNAL(triggered()));
QTest::keyClick(window, Qt::Key_Space);
QCOMPARE(secondTriggeredSpy.count(), 1);
QCOMPARE(visibleSpy.count(), 2);
QVERIFY(!menu->isVisible());
QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()));
QVERIFY(!firstItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!firstItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!firstItem->isHighlighted());
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(!secondItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!secondItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!secondItem->isHighlighted());
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), -1);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
Popup: rename show()/hide() to open()/close() QML popups have traditionally used more explicit open() and close(). Renaming them to show() and hide() at this stage doesn't seem to have any real advantages. Change-Id: I1e7c8c4817c67e62cef965525e00f5bf125a7d76 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-11 14:34:55 +00:00
menu->open();
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(visibleSpy.count(), 3);
QVERIFY(menu->isVisible());
Refactor Popup Added relevant properties to make it almost like a Control: x, y, width, height, padding, background... This change makes popup use an internal item where the style/user-supplied contentItem and background are re-parented. This way we can provide a default style (background) for Popup. Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-22 11:10:12 +00:00
QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(!firstItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!firstItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!firstItem->isHighlighted());
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(!secondItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!secondItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!secondItem->isHighlighted());
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), -1);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(firstItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(firstItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(firstItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QCOMPARE(firstItem->focusReason(), Qt::TabFocusReason);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(secondItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(secondItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(secondItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QCOMPARE(secondItem->focusReason(), Qt::TabFocusReason);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QTest::keyClick(window, Qt::Key_Down);
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QQuickMenuItem *thirdItem = qobject_cast<QQuickMenuItem *>(menu->itemAt(2));
QVERIFY(thirdItem);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(!firstItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!firstItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!firstItem->isHighlighted());
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(!secondItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!secondItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!secondItem->isHighlighted());
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(thirdItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(thirdItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(thirdItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QCOMPARE(thirdItem->focusReason(), Qt::TabFocusReason);
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
// Key navigation shouldn't wrap by default.
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(!firstItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!firstItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!firstItem->isHighlighted());
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(!secondItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!secondItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!secondItem->isHighlighted());
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
QVERIFY(thirdItem->hasActiveFocus());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(thirdItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(thirdItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QCOMPARE(thirdItem->focusReason(), Qt::TabFocusReason);
QTest::keyClick(window, Qt::Key_Up);
QVERIFY(!firstItem->hasActiveFocus());
QVERIFY(!firstItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!firstItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(secondItem->hasActiveFocus());
QVERIFY(secondItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(secondItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QCOMPARE(secondItem->focusReason(), Qt::BacktabFocusReason);
QVERIFY(!thirdItem->hasActiveFocus());
QVERIFY(!thirdItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!thirdItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QTest::keyClick(window, Qt::Key_Backtab);
QVERIFY(firstItem->hasActiveFocus());
QVERIFY(firstItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(firstItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QCOMPARE(firstItem->focusReason(), Qt::BacktabFocusReason);
QVERIFY(!secondItem->hasActiveFocus());
QVERIFY(!secondItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!secondItem->isHighlighted());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
QVERIFY(!thirdItem->hasActiveFocus());
QVERIFY(!thirdItem->hasVisualFocus());
Merge remote-tracking branch 'origin/5.9' into dev Conflicts: src/imports/controls/ButtonGroup.qml tests/auto/controls/data/tst_container.qml tests/auto/menu/tst_menu.cpp Change-Id: Ie8ee7e4f83f3fda6a09507b060576ebda929a7cd
2017-06-15 09:41:19 +00:00
QVERIFY(!thirdItem->isHighlighted());
Make Qt::Key_Escape close Menu Change-Id: Ib7d74b556378f7ec5ac3156c92a02d6834bff82e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-03 09:29:00 +00:00
QTest::keyClick(window, Qt::Key_Escape);
QCOMPARE(visibleSpy.count(), 4);
QVERIFY(!menu->isVisible());
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::mnemonics()
QQuickMenu: fix mnemonics for dynamic action/submenu items Previously mnemonics worked only for "normal" menu items, but not for dynamically created menu items that present actions and sub-menus. This patch fixes the issue by specifying the menu as a QObject-parent for such dynamically created items, because QQuickShortcutContext is based on QObject-hierarchy. Change-Id: I3637ef06e9cb2a27673e4618c253279a0123b7c8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-29 12:23:13 +00:00
{
#ifdef Q_OS_MACOS
QSKIP("Mnemonics are not used on macOS");
#endif
QQuickApplicationHelper helper(this, QLatin1String("mnemonics.qml"));
QQuickWindow *window = helper.window;
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window));
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QQuickAction *action = window->property("action").value<QQuickAction *>();
QQuickMenuItem *menuItem = window->property("menuItem").value<QQuickMenuItem *>();
QQuickMenu *subMenu = window->property("subMenu").value<QQuickMenu *>();
QQuickMenuItem *subMenuItem = window->property("subMenuItem").value<QQuickMenuItem *>();
QVERIFY(menu && action && menuItem && subMenu && subMenuItem);
menu->open();
QTRY_VERIFY(menu->isOpened());
QSignalSpy actionSpy(action, &QQuickAction::triggered);
QVERIFY(actionSpy.isValid());
QTest::keyClick(window, Qt::Key_A, Qt::AltModifier); // "&Action"
QCOMPARE(actionSpy.count(), 1);
menu->open();
QTRY_VERIFY(menu->isOpened());
QSignalSpy menuItemSpy(menuItem, &QQuickMenuItem::triggered);
QVERIFY(menuItemSpy.isValid());
QTest::keyClick(window, Qt::Key_I, Qt::AltModifier); // "Menu &Item"
QCOMPARE(menuItemSpy.count(), 1);
menu->open();
QTRY_VERIFY(menu->isOpened());
QTest::keyClick(window, Qt::Key_M, Qt::AltModifier); // "Sub &Menu"
QTRY_VERIFY(subMenu->isOpened());
QSignalSpy subMenuItemSpy(subMenuItem, &QQuickMenuItem::triggered);
QVERIFY(subMenuItemSpy.isValid());
QTest::keyClick(window, Qt::Key_S, Qt::AltModifier); // "&Sub Menu Item"
QCOMPARE(subMenuItemSpy.count(), 1);
}
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
void tst_QQuickMenu::menuButton()
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
{
if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls)
QSKIP("This platform only allows tab focus for text controls");
Move ApplicationHelper to visualtestutil.h and rename it This class is useful for other auto tests, like Popup's. Change-Id: Ie193c07e5b53b67493fceba9a1c32798db2f4e34 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-09 14:37:01 +00:00
QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
auto tests: allow using QQuickWindow with QQuickApplicationHelper This allows us to run the relevant popup tests for both QQuickWindow and QQuickApplicationWindow. Change-Id: I14b6435afeeb8a6cf640d8c52ad1d9e1fae070b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-09-03 13:15:53 +00:00
QQuickApplicationWindow *window = helper.appWindow;
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window));
QVERIFY(QGuiApplication::focusWindow() == window);
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QQuickButton *menuButton = window->property("menuButton").value<QQuickButton*>();
QSignalSpy visibleSpy(menu, SIGNAL(visibleChanged()));
menuButton->setVisible(true);
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
menuButton->mapToScene(QPointF(menuButton->width() / 2, menuButton->height() / 2)).toPoint());
QCOMPARE(visibleSpy.count(), 1);
QVERIFY(menu->isVisible());
QTest::keyClick(window, Qt::Key_Tab);
QQuickItem *firstItem = menu->itemAt(0);
QVERIFY(firstItem->hasActiveFocus());
}
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
void tst_QQuickMenu::addItem()
Menu: support dynamically added items in the same way as static ones Task-number: QTBUG-53274 Change-Id: I172e431cd456b91dee569b510288d0eccbdb4cef Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-05-10 11:58:05 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("addItem.qml"));
auto tests: allow using QQuickWindow with QQuickApplicationHelper This allows us to run the relevant popup tests for both QQuickWindow and QQuickApplicationWindow. Change-Id: I14b6435afeeb8a6cf640d8c52ad1d9e1fae070b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-09-03 13:15:53 +00:00
QQuickApplicationWindow *window = helper.appWindow;
Menu: support dynamically added items in the same way as static ones Task-number: QTBUG-53274 Change-Id: I172e431cd456b91dee569b510288d0eccbdb4cef Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-05-10 11:58:05 +00:00
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QVERIFY(menu);
menu->open();
QQuickMenu: cull items outside the popup Same as a055629 for QQuickSwipeView. This hides them until they become visible in the popup. Hiding them explicitly is not an option, because then they will never show up. This technique is used in QQuickItemView::initItem() and FxViewItem::setVisible(). Change-Id: I848652fd98f47b87a85f742205d1db729ad9de8d Task-number: QTBUG-53262 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-05-11 13:15:17 +00:00
QVERIFY(menu->isVisible());
Menu: support dynamically added items in the same way as static ones Task-number: QTBUG-53274 Change-Id: I172e431cd456b91dee569b510288d0eccbdb4cef Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-05-10 11:58:05 +00:00
QQuickItem *menuItem = menu->itemAt(0);
QQuickMenu: cull items outside the popup Same as a055629 for QQuickSwipeView. This hides them until they become visible in the popup. Hiding them explicitly is not an option, because then they will never show up. This technique is used in QQuickItemView::initItem() and FxViewItem::setVisible(). Change-Id: I848652fd98f47b87a85f742205d1db729ad9de8d Task-number: QTBUG-53262 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-05-11 13:15:17 +00:00
QVERIFY(menuItem);
QTRY_VERIFY(!QQuickItemPrivate::get(menuItem)->culled); // QTBUG-53262
Menu: support dynamically added items in the same way as static ones Task-number: QTBUG-53274 Change-Id: I172e431cd456b91dee569b510288d0eccbdb4cef Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-05-10 11:58:05 +00:00
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
menuItem->mapToScene(QPointF(menuItem->width() / 2, menuItem->height() / 2)).toPoint());
QQuickMenu: cull items outside the popup Same as a055629 for QQuickSwipeView. This hides them until they become visible in the popup. Hiding them explicitly is not an option, because then they will never show up. This technique is used in QQuickItemView::initItem() and FxViewItem::setVisible(). Change-Id: I848652fd98f47b87a85f742205d1db729ad9de8d Task-number: QTBUG-53262 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-05-11 13:15:17 +00:00
QTRY_VERIFY(!menu->isVisible());
Menu: support dynamically added items in the same way as static ones Task-number: QTBUG-53274 Change-Id: I172e431cd456b91dee569b510288d0eccbdb4cef Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-05-10 11:58:05 +00:00
}
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
void tst_QQuickMenu::menuSeparator()
Add MenuSeparator [ChangeLog][Controls] Added MenuSeparator to visually distinguish between groups of items in a menu. Change-Id: I7a52910b19633ed1188c90ca56c92346a28d4d5c Task-number: QTBUG-54862 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-07-21 14:04:18 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("menuSeparator.qml"));
Merge remote-tracking branch 'origin/5.7' into 5.8 Change-Id: Ief98cd56abd13cfa4e30578e150207462a8243b8
2016-09-06 16:52:28 +00:00
QQuickWindow *window = helper.window;
Add MenuSeparator [ChangeLog][Controls] Added MenuSeparator to visually distinguish between groups of items in a menu. Change-Id: I7a52910b19633ed1188c90ca56c92346a28d4d5c Task-number: QTBUG-54862 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-07-21 14:04:18 +00:00
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
Fix failing tests in tst_menu and tst_qquickmenubar As mentioned in the bug report for the failing tst_qquickmenubar test, the window is sometimes opened at the bottom right corner of the screen on the Ubuntu CI machines. However, even after centering the window on the screen, the old setPos() call still caused the tests to fail. So, we position the cursor past a different corner of the window, which works.. though I don't know why. Task-number: QTBUG-62363 Task-number: QTBUG-62383 Change-Id: I3649230002eaac5a6391daff24427e6f9f58cfa5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-09 10:51:40 +00:00
centerOnScreen(window);
Yet another attempt to stabilize tst_menu We've seen a few tst_menu failures in the CI: FAIL! : tst_menu::menuSeparator() 'newMenuItem->hasActiveFocus()' returned FALSE. () Loc: [tst_menu.cpp(428)] Add moveMouseAway() calls (e81332e) to all remaining tests that test the current item or index, which can be affected by unexpected mouse hover events. Change-Id: I23b1743fcdcea5a4064fba2748426fd25274481e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-29 13:15:31 +00:00
moveMouseAway(window);
Add MenuSeparator [ChangeLog][Controls] Added MenuSeparator to visually distinguish between groups of items in a menu. Change-Id: I7a52910b19633ed1188c90ca56c92346a28d4d5c Task-number: QTBUG-54862 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-07-21 14:04:18 +00:00
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QVERIFY(menu);
menu->open();
QVERIFY(menu->isVisible());
QQuickMenuItem *newMenuItem = qobject_cast<QQuickMenuItem*>(menu->itemAt(0));
QVERIFY(newMenuItem);
QCOMPARE(newMenuItem->text(), QStringLiteral("New"));
QQuickMenuSeparator *menuSeparator = qobject_cast<QQuickMenuSeparator*>(menu->itemAt(1));
QVERIFY(menuSeparator);
QQuickMenuItem *saveMenuItem = qobject_cast<QQuickMenuItem*>(menu->itemAt(2));
QVERIFY(saveMenuItem);
QCOMPARE(saveMenuItem->text(), QStringLiteral("Save"));
QTRY_VERIFY(!QQuickItemPrivate::get(saveMenuItem)->culled); // QTBUG-53262
// Clicking on items should still close the menu.
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
newMenuItem->mapToScene(QPointF(newMenuItem->width() / 2, newMenuItem->height() / 2)).toPoint());
QTRY_VERIFY(!menu->isVisible());
menu->open();
QVERIFY(menu->isVisible());
// Clicking on a separator shouldn't close the menu.
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
menuSeparator->mapToScene(QPointF(menuSeparator->width() / 2, menuSeparator->height() / 2)).toPoint());
QVERIFY(menu->isVisible());
// Clicking on items should still close the menu.
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
saveMenuItem->mapToScene(QPointF(saveMenuItem->width() / 2, saveMenuItem->height() / 2)).toPoint());
QTRY_VERIFY(!menu->isVisible());
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
Auto tests: incorporate the QEvent::Leave trick to moveMouseAway() 6f1eba89 used QEvent::Leave to make QQuickWindow clear its last known mouse position, which ensures that QQuickWindow won't send unexpected hover events from flushFrameSynchronousEvents(). The same hover events are causing trouble in tst_qquickmenubar too, so incorporate the leave event trick to moveMouseAway() to benefit from it in other tests too. Change-Id: I25a285d008d1cb639c7be09d714e482d472b4e50 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-06 12:51:52 +00:00
moveMouseAway(window);
Stabilize tst_menu::menuSeparator() The same old story... QQuickWindowPrivate::flushFrameSynchronousEvents() keeps sending spurious hover events during auto tests. Send a manual leave event to the window to clear QQuickWindowPrivate::lastMousePosition so it won't send those hover events. Change-Id: I4d5548b2a5beff1a82f273f7e1e290e1cb88aadf Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-03 08:32:29 +00:00
QQuickMenu: fix key navigation Skip non-focusable separators, and use a key focus reason (Qt::TabFocusReason & Qt::BacktabFocusReason) to give the items visual focus. [ChangeLog][Controls][Menu] Fixed key navigation to skip separators. Change-Id: I99affabc50703c7363ab8146e5ced9b45111de00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 18:19:50 +00:00
menu->open();
QVERIFY(menu->isVisible());
// Key navigation skips separators
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(newMenuItem->hasActiveFocus());
QVERIFY(newMenuItem->hasVisualFocus());
QCOMPARE(newMenuItem->focusReason(), Qt::TabFocusReason);
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(saveMenuItem->hasActiveFocus());
QVERIFY(saveMenuItem->hasVisualFocus());
QCOMPARE(saveMenuItem->focusReason(), Qt::TabFocusReason);
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(saveMenuItem->hasActiveFocus());
QVERIFY(saveMenuItem->hasVisualFocus());
QCOMPARE(saveMenuItem->focusReason(), Qt::TabFocusReason);
QTest::keyClick(window, Qt::Key_Up);
QVERIFY(newMenuItem->hasActiveFocus());
QVERIFY(newMenuItem->hasVisualFocus());
QCOMPARE(newMenuItem->focusReason(), Qt::BacktabFocusReason);
QTest::keyClick(window, Qt::Key_Up);
QVERIFY(newMenuItem->hasActiveFocus());
QVERIFY(newMenuItem->hasVisualFocus());
QCOMPARE(newMenuItem->focusReason(), Qt::BacktabFocusReason);
Add MenuSeparator [ChangeLog][Controls] Added MenuSeparator to visually distinguish between groups of items in a menu. Change-Id: I7a52910b19633ed1188c90ca56c92346a28d4d5c Task-number: QTBUG-54862 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-07-21 14:04:18 +00:00
}
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
void tst_QQuickMenu::repeater()
QQuickMenu: fix Repeater support QQuickMenu had itemChildAdded() copied from QQuickContainer, but it did not actually install an item change listener on the content item so itemChildAdded() got never called. Change-Id: Idfe558c7055b9a3df124b1f009941c423ecef4bb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-12-28 19:24:18 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("repeater.qml"));
QQuickWindow *window = helper.window;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QVERIFY(menu);
menu->open();
QVERIFY(menu->isVisible());
QObject *repeater = window->property("repeater").value<QObject*>();
QVERIFY(repeater);
int count = repeater->property("count").toInt();
QCOMPARE(count, 5);
for (int i = 0; i < count; ++i) {
QQuickItem *item = menu->itemAt(i);
QVERIFY(item);
QCOMPARE(item->property("idx").toInt(), i);
QQuickItem *repeaterItem = nullptr;
QVERIFY(QMetaObject::invokeMethod(repeater, "itemAt", Q_RETURN_ARG(QQuickItem*, repeaterItem), Q_ARG(int, i)));
QCOMPARE(item, repeaterItem);
}
repeater->setProperty("model", 3);
count = repeater->property("count").toInt();
QCOMPARE(count, 3);
for (int i = 0; i < count; ++i) {
QQuickItem *item = menu->itemAt(i);
QVERIFY(item);
QCOMPARE(item->property("idx").toInt(), i);
QQuickItem *repeaterItem = nullptr;
QVERIFY(QMetaObject::invokeMethod(repeater, "itemAt", Q_RETURN_ARG(QQuickItem*, repeaterItem), Q_ARG(int, i)));
QCOMPARE(item, repeaterItem);
}
}
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
void tst_QQuickMenu::order()
QQuickMenu: fix Repeater support QQuickMenu had itemChildAdded() copied from QQuickContainer, but it did not actually install an item change listener on the content item so itemChildAdded() got never called. Change-Id: Idfe558c7055b9a3df124b1f009941c423ecef4bb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-12-28 19:24:18 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("order.qml"));
QQuickWindow *window = helper.window;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QVERIFY(menu);
menu->open();
QVERIFY(menu->isVisible());
const QStringList texts = {"dynamic_0", "static_1", "repeated_2", "repeated_3", "static_4", "dynamic_5", "dynamic_6"};
for (int i = 0; i < texts.count(); ++i) {
QQuickItem *item = menu->itemAt(i);
QVERIFY(item);
QCOMPARE(item->property("text").toString(), texts.at(i));
}
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::popup()
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("popup.qml"));
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QQuickApplicationWindow *window = helper.appWindow;
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
Fix failing tests in tst_menu and tst_qquickmenubar As mentioned in the bug report for the failing tst_qquickmenubar test, the window is sometimes opened at the bottom right corner of the screen on the Ubuntu CI machines. However, even after centering the window on the screen, the old setPos() call still caused the tests to fail. So, we position the cursor past a different corner of the window, which works.. though I don't know why. Task-number: QTBUG-62363 Task-number: QTBUG-62383 Change-Id: I3649230002eaac5a6391daff24427e6f9f58cfa5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-09 10:51:40 +00:00
centerOnScreen(window);
Yet another attempt to stabilize tst_menu We've seen a few tst_menu failures in the CI: FAIL! : tst_menu::menuSeparator() 'newMenuItem->hasActiveFocus()' returned FALSE. () Loc: [tst_menu.cpp(428)] Add moveMouseAway() calls (e81332e) to all remaining tests that test the current item or index, which can be affected by unexpected mouse hover events. Change-Id: I23b1743fcdcea5a4064fba2748426fd25274481e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-29 13:15:31 +00:00
moveMouseAway(window);
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QVERIFY(menu);
QQuickMenuItem *menuItem1 = window->property("menuItem1").value<QQuickMenuItem *>();
QVERIFY(menuItem1);
QQuickMenuItem *menuItem2 = window->property("menuItem2").value<QQuickMenuItem *>();
QVERIFY(menuItem2);
QQuickMenuItem *menuItem3 = window->property("menuItem3").value<QQuickMenuItem *>();
QVERIFY(menuItem3);
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QQuickItem *button = window->property("button").value<QQuickItem *>();
QVERIFY(button);
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
#if QT_CONFIG(cursor)
Stabilize tst_menu Add QQuickVisualTestUtil::moveMouseAway() (adapted from qtdeclarative) to help with testing menus that are now highlighting items on hover. It is important to move the mouse cursor away outside the window in such tests where hover highlight might conflict with the test. Change-Id: If3d642dd4f3ba2936a0d22c078d8fb0125d16c6c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-10 08:18:21 +00:00
QPoint oldCursorPos = QCursor::pos();
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
QPoint cursorPos = window->mapToGlobal(QPoint(11, 22));
QCursor::setPos(cursorPos);
QTRY_COMPARE(QCursor::pos(), cursorPos);
QVERIFY(QMetaObject::invokeMethod(window, "popupAtCursor"));
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QCOMPARE(menu->parentItem(), window->contentItem());
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), -1);
QQuickMenu::popup(): set the current index If a specific menu item is passed to popup(), set the current index appropriately to highlight the item. Change-Id: Id7b687d1248127fe0c2cdb88d3ebd5689763fe24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-06 18:56:54 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1);
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QTRY_COMPARE(menu->x(), 11);
QTRY_COMPARE(menu->y(), 22);
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
menu->close();
QVERIFY(QMetaObject::invokeMethod(window, "popupAtPos", Q_ARG(QVariant, QPointF(33, 44))));
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QCOMPARE(menu->parentItem(), window->contentItem());
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), -1);
QQuickMenu::popup(): set the current index If a specific menu item is passed to popup(), set the current index appropriately to highlight the item. Change-Id: Id7b687d1248127fe0c2cdb88d3ebd5689763fe24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-06 18:56:54 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1);
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QTRY_COMPARE(menu->x(), 33);
QTRY_COMPARE(menu->y(), 44);
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
menu->close();
QVERIFY(QMetaObject::invokeMethod(window, "popupAtCoord", Q_ARG(QVariant, 55), Q_ARG(QVariant, 66)));
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QCOMPARE(menu->parentItem(), window->contentItem());
QCOMPARE(menu->currentIndex(), -1);
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1);
QTRY_COMPARE(menu->x(), 55);
QTRY_COMPARE(menu->y(), 66);
menu->close();
menu->setParentItem(nullptr);
QVERIFY(QMetaObject::invokeMethod(window, "popupAtParentCursor", Q_ARG(QVariant, QVariant::fromValue(button))));
QCOMPARE(menu->parentItem(), button);
QCOMPARE(menu->currentIndex(), -1);
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1);
QTRY_COMPARE(menu->x(), button->mapFromScene(QPointF(11, 22)).x());
QTRY_COMPARE(menu->y(), button->mapFromScene(QPointF(11, 22)).y());
menu->close();
menu->setParentItem(nullptr);
QVERIFY(QMetaObject::invokeMethod(window, "popupAtParentPos", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, QPointF(-11, -22))));
QCOMPARE(menu->parentItem(), button);
QCOMPARE(menu->currentIndex(), -1);
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1);
QTRY_COMPARE(menu->x(), -11);
QTRY_COMPARE(menu->y(), -22);
QCOMPARE(menu->popupItem()->position(), button->mapToScene(QPointF(-11, -22)));
menu->close();
menu->setParentItem(nullptr);
QVERIFY(QMetaObject::invokeMethod(window, "popupAtParentCoord", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, -33), Q_ARG(QVariant, -44)));
QCOMPARE(menu->parentItem(), button);
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), -1);
QQuickMenu::popup(): set the current index If a specific menu item is passed to popup(), set the current index appropriately to highlight the item. Change-Id: Id7b687d1248127fe0c2cdb88d3ebd5689763fe24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-06 18:56:54 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), -1);
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QTRY_COMPARE(menu->x(), -33);
QTRY_COMPARE(menu->y(), -44);
QCOMPARE(menu->popupItem()->position(), button->mapToScene(QPointF(-33, -44)));
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
menu->close();
cursorPos = window->mapToGlobal(QPoint(12, window->height() / 2));
QCursor::setPos(cursorPos);
QTRY_COMPARE(QCursor::pos(), cursorPos);
const QList<QQuickMenuItem *> menuItems = QList<QQuickMenuItem *>() << menuItem1 << menuItem2 << menuItem3;
for (QQuickMenuItem *menuItem : menuItems) {
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
menu->resetParentItem();
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtCursor", Q_ARG(QVariant, QVariant::fromValue(menuItem))));
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem));
QQuickMenu::popup(): set the current index If a specific menu item is passed to popup(), set the current index appropriately to highlight the item. Change-Id: Id7b687d1248127fe0c2cdb88d3ebd5689763fe24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-06 18:56:54 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem));
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QTRY_COMPARE(menu->x(), 12);
QTRY_COMPARE(menu->y(), window->height() / 2 + menu->topPadding() - menuItem->y());
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
menu->close();
QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtPos", Q_ARG(QVariant, QPointF(33, window->height() / 3)), Q_ARG(QVariant, QVariant::fromValue(menuItem))));
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem));
QQuickMenu::popup(): set the current index If a specific menu item is passed to popup(), set the current index appropriately to highlight the item. Change-Id: Id7b687d1248127fe0c2cdb88d3ebd5689763fe24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-06 18:56:54 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem));
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QTRY_COMPARE(menu->x(), 33);
QTRY_COMPARE(menu->y(), window->height() / 3 + menu->topPadding() - menuItem->y());
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
menu->close();
QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtCoord", Q_ARG(QVariant, 55), Q_ARG(QVariant, window->height() / 3 * 2), Q_ARG(QVariant, QVariant::fromValue(menuItem))));
Add Menu::currentIndex De-couple current index management from the content item. Instead of manipulating the content item's current index directly from C++, offer a currentIndex property that can be visualized by the style, also when not using a ListView. This is essentially the same technique ComboBox uses to control the highlighted index in the popup ListView. [ChangeLog][Controls][Menu] Added currentIndex property for styling purposes. Change-Id: Idf7746d9c08fc9ca9a0dfd15225ebae5a29243c9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-14 22:16:57 +00:00
QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem));
QQuickMenu::popup(): set the current index If a specific menu item is passed to popup(), set the current index appropriately to highlight the item. Change-Id: Id7b687d1248127fe0c2cdb88d3ebd5689763fe24 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-06 18:56:54 +00:00
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem));
QQuickMenu::popup(): allow a parent argument The parent argument is handy for sharing a single context menu instance for multiple listview items: ListView { delegate: ItemDelegate { onPressAndHold: contextMenu.popup(this) } Menu { id: contextMenu } } Change-Id: I77ff87ee03d2d1b53485863ab9c99f3226496dfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-11 12:20:37 +00:00
QTRY_COMPARE(menu->x(), 55);
QTRY_COMPARE(menu->y(), window->height() / 3 * 2 + menu->topPadding() - menuItem->y());
menu->close();
menu->setParentItem(nullptr);
QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtParentCursor", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, QVariant::fromValue(menuItem))));
QCOMPARE(menu->parentItem(), button);
QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem));
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem));
QTRY_COMPARE(menu->x(), button->mapFromScene(QPoint(12, window->height() / 2)).x());
QTRY_COMPARE(menu->y(), button->mapFromScene(QPoint(12, window->height() / 2)).y() + menu->topPadding() - menuItem->y());
menu->close();
menu->setParentItem(nullptr);
QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtParentPos", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, QPointF(-11, -22)), Q_ARG(QVariant, QVariant::fromValue(menuItem))));
QCOMPARE(menu->parentItem(), button);
QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem));
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem));
QTRY_COMPARE(menu->x(), -11);
QTRY_COMPARE(menu->y(), -22 + menu->topPadding() - menuItem->y());
QCOMPARE(menu->popupItem()->position(), button->mapToScene(QPointF(-11, -22 + menu->topPadding() - menuItem->y())));
menu->close();
menu->setParentItem(nullptr);
QVERIFY(QMetaObject::invokeMethod(window, "popupItemAtParentCoord", Q_ARG(QVariant, QVariant::fromValue(button)), Q_ARG(QVariant, -33), Q_ARG(QVariant, -44), Q_ARG(QVariant, QVariant::fromValue(menuItem))));
QCOMPARE(menu->parentItem(), button);
QCOMPARE(menu->currentIndex(), menuItems.indexOf(menuItem));
QCOMPARE(menu->contentItem()->property("currentIndex").toInt(), menuItems.indexOf(menuItem));
QTRY_COMPARE(menu->x(), -33);
QTRY_COMPARE(menu->y(), -44 + menu->topPadding() - menuItem->y());
QCOMPARE(menu->popupItem()->position(), button->mapToScene(QPointF(-33, -44 + menu->topPadding() - menuItem->y())));
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
menu->close();
}
Stabilize tst_menu Add QQuickVisualTestUtil::moveMouseAway() (adapted from qtdeclarative) to help with testing menus that are now highlighting items on hover. It is important to move the mouse cursor away outside the window in such tests where hover highlight might conflict with the test. Change-Id: If3d642dd4f3ba2936a0d22c078d8fb0125d16c6c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-10 08:18:21 +00:00
QCursor::setPos(oldCursorPos);
QTRY_COMPARE(QCursor::pos(), oldCursorPos);
Add QQuickMenu::popup() [ChangeLog][Controls][Menu] Added a popup() method that opens a menu at the mouse cursor on desktop platforms that have a mouse cursor available, and otherwise centers the menu over its parent item. Task-number: QTBUG-50471 Change-Id: I9456a48e71fde91f73cdb268fcdd69a8511a41a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-05-17 15:35:00 +00:00
#endif
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::actions()
QQuickMenu: add support for declaring Actions [ChangeLog][Controls][Menu] Added support for declaring Actions. The new "delegate" property is used to define a Component that is used to create menu items that present the actions. Change-Id: If26f38f6910aa5592879703429a2b418193d5710 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 18:09:44 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("actions.qml"));
QQuickWindow *window = helper.window;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QVERIFY(menu);
QQuickMenu: add actionAt() and menuAt() accessors This complements the add/insert/remove/take API that was added for actions and menus. Unlike for menu items, there was no convenient way to access a specific action or menu directly without accessing the respective item first. [ChangeLog][Controls][Menu] Added actionAt() and menuAt() accessors. Change-Id: I5515441626b3a04b05265d5b42afdaea8e256709 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-10 09:59:47 +00:00
QPointer<QQuickAction> action1 = menu->actionAt(0);
QVERIFY(!action1.isNull());
QPointer<QQuickAction> action3 = menu->actionAt(2);
QVERIFY(!action3.isNull());
QVERIFY(!menu->actionAt(1));
QVERIFY(!menu->actionAt(3));
Add QQuickMenu::add/insert/remove/takeAction() [ChangeLog][Controls][Menu] Added addAction(), insertAction(), removeAction(), and takeAction() methods for adding and removing actions programmatically. Change-Id: I7d494ef1edc1cf384314fa90d97cfd2290d2e8a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-09 08:09:28 +00:00
QPointer<QQuickMenuItem> menuItem1 = qobject_cast<QQuickMenuItem *>(menu->itemAt(0));
QVERIFY(!menuItem1.isNull());
QQuickMenu: add actionAt() and menuAt() accessors This complements the add/insert/remove/take API that was added for actions and menus. Unlike for menu items, there was no convenient way to access a specific action or menu directly without accessing the respective item first. [ChangeLog][Controls][Menu] Added actionAt() and menuAt() accessors. Change-Id: I5515441626b3a04b05265d5b42afdaea8e256709 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-10 09:59:47 +00:00
QCOMPARE(menuItem1->action(), action1.data());
QQuickMenu: add support for declaring Actions [ChangeLog][Controls][Menu] Added support for declaring Actions. The new "delegate" property is used to define a Component that is used to create menu items that present the actions. Change-Id: If26f38f6910aa5592879703429a2b418193d5710 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 18:09:44 +00:00
QCOMPARE(menuItem1->text(), "action1");
Add QQuickMenu::add/insert/remove/takeAction() [ChangeLog][Controls][Menu] Added addAction(), insertAction(), removeAction(), and takeAction() methods for adding and removing actions programmatically. Change-Id: I7d494ef1edc1cf384314fa90d97cfd2290d2e8a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-09 08:09:28 +00:00
QPointer<QQuickMenuItem> menuItem2 = qobject_cast<QQuickMenuItem *>(menu->itemAt(1));
QVERIFY(!menuItem2.isNull());
QQuickMenu: add support for declaring Actions [ChangeLog][Controls][Menu] Added support for declaring Actions. The new "delegate" property is used to define a Component that is used to create menu items that present the actions. Change-Id: If26f38f6910aa5592879703429a2b418193d5710 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 18:09:44 +00:00
QVERIFY(!menuItem2->action());
QCOMPARE(menuItem2->text(), "menuitem2");
Add QQuickMenu::add/insert/remove/takeAction() [ChangeLog][Controls][Menu] Added addAction(), insertAction(), removeAction(), and takeAction() methods for adding and removing actions programmatically. Change-Id: I7d494ef1edc1cf384314fa90d97cfd2290d2e8a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-09 08:09:28 +00:00
QPointer<QQuickMenuItem> menuItem3 = qobject_cast<QQuickMenuItem *>(menu->itemAt(2));
QVERIFY(!menuItem3.isNull());
QQuickMenu: add actionAt() and menuAt() accessors This complements the add/insert/remove/take API that was added for actions and menus. Unlike for menu items, there was no convenient way to access a specific action or menu directly without accessing the respective item first. [ChangeLog][Controls][Menu] Added actionAt() and menuAt() accessors. Change-Id: I5515441626b3a04b05265d5b42afdaea8e256709 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-10 09:59:47 +00:00
QCOMPARE(menuItem3->action(), action3.data());
QQuickMenu: add support for declaring Actions [ChangeLog][Controls][Menu] Added support for declaring Actions. The new "delegate" property is used to define a Component that is used to create menu items that present the actions. Change-Id: If26f38f6910aa5592879703429a2b418193d5710 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 18:09:44 +00:00
QCOMPARE(menuItem3->text(), "action3");
Add QQuickMenu::add/insert/remove/takeAction() [ChangeLog][Controls][Menu] Added addAction(), insertAction(), removeAction(), and takeAction() methods for adding and removing actions programmatically. Change-Id: I7d494ef1edc1cf384314fa90d97cfd2290d2e8a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-09 08:09:28 +00:00
QPointer<QQuickMenuItem> menuItem4 = qobject_cast<QQuickMenuItem *>(menu->itemAt(3));
QVERIFY(!menuItem4.isNull());
QQuickMenu: add support for declaring Actions [ChangeLog][Controls][Menu] Added support for declaring Actions. The new "delegate" property is used to define a Component that is used to create menu items that present the actions. Change-Id: If26f38f6910aa5592879703429a2b418193d5710 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 18:09:44 +00:00
QVERIFY(!menuItem4->action());
QCOMPARE(menuItem4->text(), "menuitem4");
Add QQuickMenu::add/insert/remove/takeAction() [ChangeLog][Controls][Menu] Added addAction(), insertAction(), removeAction(), and takeAction() methods for adding and removing actions programmatically. Change-Id: I7d494ef1edc1cf384314fa90d97cfd2290d2e8a3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-09 08:09:28 +00:00
// takeAction(int) does not destroy the action, but does destroy the respective item
QCOMPARE(menu->takeAction(0), action1.data());
QVERIFY(!menu->itemAt(3));
QCoreApplication::sendPostedEvents(action1, QEvent::DeferredDelete);
QVERIFY(!action1.isNull());
QCoreApplication::sendPostedEvents(menuItem1, QEvent::DeferredDelete);
QVERIFY(menuItem1.isNull());
// takeAction(int) does not destroy an item that doesn't have an action
QVERIFY(!menuItem2->subMenu());
QVERIFY(!menu->takeAction(0));
QCoreApplication::sendPostedEvents(menuItem2, QEvent::DeferredDelete);
QVERIFY(!menuItem2.isNull());
// addAction(Action) re-creates the respective item in the menu
menu->addAction(action1);
menuItem1 = qobject_cast<QQuickMenuItem *>(menu->itemAt(3));
QVERIFY(!menuItem1.isNull());
QCOMPARE(menuItem1->action(), action1.data());
// removeAction(Action) destroys both the action and the respective item
menu->removeAction(action1);
QVERIFY(!menu->itemAt(3));
QCoreApplication::sendPostedEvents(action1, QEvent::DeferredDelete);
QVERIFY(action1.isNull());
QCoreApplication::sendPostedEvents(menuItem1, QEvent::DeferredDelete);
QVERIFY(menuItem1.isNull());
QQuickMenu: add support for declaring Actions [ChangeLog][Controls][Menu] Added support for declaring Actions. The new "delegate" property is used to define a Component that is used to create menu items that present the actions. Change-Id: If26f38f6910aa5592879703429a2b418193d5710 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 18:09:44 +00:00
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::removeTakeItem()
QQuickMenu: removeItem(Item) and takeItem(int) Deprecate removeItem(int) in favor of removeItem(Item) and takeItem(int) with clearer semantics. If one already has access to an item, one can pass it to removeItem() to get rid of it for good, instead of having to call destroy() by hand. If one knows the index instead, we provide a way to take the respective item out of the menu, and let the user decide what to do with it. This way we provide convenient ways to remove & destroy items in one go, and to take items out without destroying them. This nice pattern was once upon time planned for the QQC1 containers such as SplitView, and should have been used for the QQC2 containers, but was simply forgotten during the development... [ChangeLog][Controls][Menu] Deprecated removeItem(int) in favor of removeItem(Item) and takeItem(int) with clearer semantics. The former destroys the item, whereas the latter transfers ownership to the caller. Change-Id: Id2a07fb65019b2904a013c8bcc3154089d36a0ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-02 14:18:56 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("removeTakeItem.qml"));
QQuickWindow *window = helper.window;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QVERIFY(menu);
QPointer<QQuickMenuItem> menuItem1 = window->property("menuItem1").value<QQuickMenuItem *>();
QVERIFY(!menuItem1.isNull());
QCOMPARE(menuItem1->menu(), menu);
QPointer<QQuickMenuItem> menuItem2 = window->property("menuItem2").value<QQuickMenuItem *>();
QVERIFY(!menuItem2.isNull());
QCOMPARE(menuItem2->menu(), menu);
QPointer<QQuickMenuItem> menuItem3 = window->property("menuItem3").value<QQuickMenuItem *>();
QVERIFY(!menuItem3.isNull());
QCOMPARE(menuItem3->menu(), menu);
// takeItem(int) does not destroy
QVariant ret;
QVERIFY(QMetaObject::invokeMethod(window, "takeSecondItem", Q_RETURN_ARG(QVariant, ret)));
QCOMPARE(ret.value<QQuickMenuItem *>(), menuItem2);
QVERIFY(!menuItem2->menu());
QCoreApplication::sendPostedEvents(menuItem2, QEvent::DeferredDelete);
QVERIFY(!menuItem2.isNull());
// removeItem(Item) destroys
QVERIFY(QMetaObject::invokeMethod(window, "removeFirstItem"));
QVERIFY(!menuItem1->menu());
QCoreApplication::sendPostedEvents(menuItem1, QEvent::DeferredDelete);
QVERIFY(menuItem1.isNull());
// removeItem(null) must not call removeItem(0)
QVERIFY(QMetaObject::invokeMethod(window, "removeNullItem"));
QCOMPARE(menuItem3->menu(), menu);
QCoreApplication::sendPostedEvents(menuItem3, QEvent::DeferredDelete);
QVERIFY(!menuItem3.isNull());
// deprecated removeItem(int) does not destroy
QVERIFY(QMetaObject::invokeMethod(window, "removeFirstIndex"));
QVERIFY(!menuItem3->menu());
QCoreApplication::sendPostedEvents(menuItem3, QEvent::DeferredDelete);
QVERIFY(!menuItem3.isNull());
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::subMenuMouse_data()
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
{
QTest::addColumn<bool>("cascade");
QTest::newRow("cascading") << true;
QTest::newRow("non-cascading") << false;
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::subMenuMouse()
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
{
Fix tests for boot2qt The tests for boot2qt were disabled with commit 28063805bf22b77a93f22a4289ca8afa9f1cb201. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Some tests involving mouse behavior and window grabbing need to be skipped on minimal/offscreen platforms. Task-number: QTBUG-60268 Change-Id: Ib468638df8d5001bf127dd17aee7dcfe38b11780 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-05 09:48:40 +00:00
if ((QGuiApplication::platformName() == QLatin1String("offscreen"))
|| (QGuiApplication::platformName() == QLatin1String("minimal")))
QSKIP("Mouse hovering not functional on offscreen/minimal platforms");
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
QFETCH(bool, cascade);
QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml"));
QQuickApplicationWindow *window = helper.appWindow;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
Fix failing tests in tst_menu and tst_qquickmenubar As mentioned in the bug report for the failing tst_qquickmenubar test, the window is sometimes opened at the bottom right corner of the screen on the Ubuntu CI machines. However, even after centering the window on the screen, the old setPos() call still caused the tests to fail. So, we position the cursor past a different corner of the window, which works.. though I don't know why. Task-number: QTBUG-62363 Task-number: QTBUG-62383 Change-Id: I3649230002eaac5a6391daff24427e6f9f58cfa5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-09 10:51:40 +00:00
centerOnScreen(window);
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
moveMouseAway(window);
QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>();
QVERIFY(mainMenu);
mainMenu->setCascade(cascade);
QCOMPARE(mainMenu->cascade(), cascade);
QQuickMenu *subMenu1 = window->property("subMenu1").value<QQuickMenu *>();
QVERIFY(subMenu1);
QQuickMenu *subMenu2 = window->property("subMenu2").value<QQuickMenu *>();
QVERIFY(subMenu2);
QQuickMenu *subSubMenu1 = window->property("subSubMenu1").value<QQuickMenu *>();
QVERIFY(subSubMenu1);
mainMenu->open();
QVERIFY(mainMenu->isVisible());
QVERIFY(!subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
// open the sub-menu with mouse click
QQuickMenuItem *subMenu1Item = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(1));
QVERIFY(subMenu1Item);
QCOMPARE(subMenu1Item->subMenu(), subMenu1);
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, subMenu1Item->mapToScene(QPoint(1, 1)).toPoint());
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
// open the cascading sub-sub-menu with mouse hover
QQuickMenuItem *subSubMenu1Item = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(2));
QVERIFY(subSubMenu1Item);
QCOMPARE(subSubMenu1Item->subMenu(), subSubMenu1);
QTest::mouseMove(window, subSubMenu1Item->mapToScene(QPoint(1, 1)).toPoint());
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QQuickMenu: add a little delay for opening sub-menus on hover This improves the usability on desktop. When a menu has multiple sub- menu items, they don't all trigger a sub-menu (and close immediately) while moving mouse over the items. Change-Id: Ie4c9e409da8d6877e35506bffb94ed57f5985dcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 05:12:53 +00:00
QVERIFY(!subSubMenu1->isVisible());
if (cascade)
QTRY_VERIFY(subSubMenu1->isVisible());
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
// close the sub-sub-menu with mouse hover over another parent menu item
QQuickMenuItem *subMenuItem1 = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(0));
QVERIFY(subMenuItem1);
QVERIFY(!subMenuItem1->subMenu());
QTest::mouseMove(window, subMenuItem1->mapToScene(QPoint(1, 1)).toPoint());
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
// re-open the sub-sub-menu with mouse hover
QTest::mouseMove(window, subSubMenu1Item->mapToScene(QPoint(1, 1)).toPoint());
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QQuickMenu: add a little delay for opening sub-menus on hover This improves the usability on desktop. When a menu has multiple sub- menu items, they don't all trigger a sub-menu (and close immediately) while moving mouse over the items. Change-Id: Ie4c9e409da8d6877e35506bffb94ed57f5985dcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-08 05:12:53 +00:00
QVERIFY(!subSubMenu1->isVisible());
if (cascade)
QTRY_VERIFY(subSubMenu1->isVisible());
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
// close sub-menu and sub-sub-menu with mouse hover in the main menu
QQuickMenuItem *mainMenuItem1 = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(0));
QVERIFY(mainMenuItem1);
QTest::mouseMove(window, mainMenuItem1->mapToScene(QPoint(1, 1)).toPoint());
QCOMPARE(mainMenu->isVisible(), cascade);
QCOMPARE(subMenu1->isVisible(), !cascade);
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
// close all menus by click triggering an item
QQuickMenuItem *subSubMenuItem1 = qobject_cast<QQuickMenuItem *>(subSubMenu1->itemAt(0));
QVERIFY(subSubMenuItem1);
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, subSubMenuItem1->mapToScene(QPoint(1, 1)).toPoint());
QVERIFY(!mainMenu->isVisible());
QVERIFY(!subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::subMenuKeyboard_data()
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
{
QTest::addColumn<bool>("cascade");
QTest::addColumn<bool>("mirrored");
QTest::newRow("cascading") << true << false;
QTest::newRow("cascading,mirrored") << true << true;
QTest::newRow("non-cascading") << false << false;
QTest::newRow("non-cascading,mirrored") << false << true;
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::subMenuKeyboard()
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
{
QFETCH(bool, cascade);
QFETCH(bool, mirrored);
QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml"));
QQuickApplicationWindow *window = helper.appWindow;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
Fix failing tests in tst_menu and tst_qquickmenubar As mentioned in the bug report for the failing tst_qquickmenubar test, the window is sometimes opened at the bottom right corner of the screen on the Ubuntu CI machines. However, even after centering the window on the screen, the old setPos() call still caused the tests to fail. So, we position the cursor past a different corner of the window, which works.. though I don't know why. Task-number: QTBUG-62363 Task-number: QTBUG-62383 Change-Id: I3649230002eaac5a6391daff24427e6f9f58cfa5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-09 10:51:40 +00:00
centerOnScreen(window);
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
moveMouseAway(window);
if (mirrored)
window->setLocale(QLocale("ar_EG"));
QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>();
QVERIFY(mainMenu);
mainMenu->setCascade(cascade);
QCOMPARE(mainMenu->cascade(), cascade);
QQuickMenu *subMenu1 = window->property("subMenu1").value<QQuickMenu *>();
QVERIFY(subMenu1);
QQuickMenu *subMenu2 = window->property("subMenu2").value<QQuickMenu *>();
QVERIFY(subMenu2);
QQuickMenu *subSubMenu1 = window->property("subSubMenu1").value<QQuickMenu *>();
QVERIFY(subSubMenu1);
mainMenu->open();
QVERIFY(mainMenu->isVisible());
QVERIFY(!subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
// navigate to the sub-menu item and trigger it
QQuickMenuItem *subMenu1Item = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(1));
QVERIFY(subMenu1Item);
QVERIFY(!subMenu1Item->isHighlighted());
QCOMPARE(subMenu1Item->subMenu(), subMenu1);
QTest::keyClick(window, Qt::Key_Down);
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(subMenu1Item->isHighlighted());
QTest::keyClick(window, Qt::Key_Space);
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
// navigate to the sub-sub-menu item and open it with the arrow key
QQuickMenuItem *subSubMenu1Item = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(2));
QVERIFY(subSubMenu1Item);
QVERIFY(!subSubMenu1Item->isHighlighted());
QCOMPARE(subSubMenu1Item->subMenu(), subSubMenu1);
QTest::keyClick(window, Qt::Key_Down);
QTest::keyClick(window, Qt::Key_Down);
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(subSubMenu1Item->isHighlighted());
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
QTest::keyClick(window, mirrored ? Qt::Key_Left : Qt::Key_Right);
QCOMPARE(mainMenu->isVisible(), cascade);
QCOMPARE(subMenu1->isVisible(), cascade);
QVERIFY(!subMenu2->isVisible());
QVERIFY(subSubMenu1->isVisible());
// navigate within the sub-sub-menu
QQuickMenuItem *subSubMenuItem1 = qobject_cast<QQuickMenuItem *>(subSubMenu1->itemAt(0));
QVERIFY(subSubMenuItem1);
QQuickMenuItem *subSubMenuItem2 = qobject_cast<QQuickMenuItem *>(subSubMenu1->itemAt(1));
QVERIFY(subSubMenuItem2);
QVERIFY(subSubMenuItem1->isHighlighted());
QVERIFY(!subSubMenuItem2->isHighlighted());
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(!subSubMenuItem1->isHighlighted());
QVERIFY(subSubMenuItem2->isHighlighted());
// navigate to the parent menu with the arrow key
QTest::keyClick(window, mirrored ? Qt::Key_Right : Qt::Key_Left);
QVERIFY(subSubMenu1Item->isHighlighted());
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
// navigate within the sub-menu
QQuickMenuItem *subMenuItem1 = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(0));
QVERIFY(subMenuItem1);
QQuickMenuItem *subMenuItem2 = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(1));
QVERIFY(subMenuItem2);
QVERIFY(!subMenuItem1->isHighlighted());
QVERIFY(!subMenuItem2->isHighlighted());
QVERIFY(subSubMenu1Item->isHighlighted());
QTest::keyClick(window, Qt::Key_Up);
QVERIFY(!subMenuItem1->isHighlighted());
QVERIFY(subMenuItem2->isHighlighted());
QVERIFY(!subSubMenu1Item->isHighlighted());
// close the menus with esc
QTest::keyClick(window, Qt::Key_Escape);
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(!subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
QTest::keyClick(window, Qt::Key_Escape);
QVERIFY(!mainMenu->isVisible());
QVERIFY(!subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::subMenuPosition_data()
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
{
QTest::addColumn<bool>("cascade");
Menu: allow horizontal flip for cascading sub-menus Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-16 03:28:59 +00:00
QTest::addColumn<bool>("flip");
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
QTest::addColumn<bool>("mirrored");
QTest::addColumn<qreal>("overlap");
Menu: allow horizontal flip for cascading sub-menus Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-16 03:28:59 +00:00
QTest::newRow("cascading") << true << false << false << 0.0;
QTest::newRow("cascading,flip") << true << true << false << 0.0;
QTest::newRow("cascading,overlap") << true << false << false << 10.0;
QTest::newRow("cascading,flip,overlap") << true << true << false << 10.0;
QTest::newRow("cascading,mirrored") << true << false << true << 0.0;
QTest::newRow("cascading,mirrored,flip") << true << true << true << 0.0;
QTest::newRow("cascading,mirrored,overlap") << true << false << true << 10.0;
QTest::newRow("cascading,mirrored,flip,overlap") << true << true << true << 10.0;
QTest::newRow("non-cascading") << false << false << false << 0.0;
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::subMenuPosition()
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
{
QFETCH(bool, cascade);
Menu: allow horizontal flip for cascading sub-menus Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-16 03:28:59 +00:00
QFETCH(bool, flip);
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
QFETCH(bool, mirrored);
QFETCH(qreal, overlap);
QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml"));
QQuickApplicationWindow *window = helper.appWindow;
Menu: allow horizontal flip for cascading sub-menus Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-16 03:28:59 +00:00
// the default size of the window fits three menus side by side.
// when testing flipping, we resize the window so that the first
// sub-menu fits, but the second doesn't
if (flip)
window->setWidth(window->width() - 200);
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
Fix failing tests in tst_menu and tst_qquickmenubar As mentioned in the bug report for the failing tst_qquickmenubar test, the window is sometimes opened at the bottom right corner of the screen on the Ubuntu CI machines. However, even after centering the window on the screen, the old setPos() call still caused the tests to fail. So, we position the cursor past a different corner of the window, which works.. though I don't know why. Task-number: QTBUG-62363 Task-number: QTBUG-62383 Change-Id: I3649230002eaac5a6391daff24427e6f9f58cfa5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-09 10:51:40 +00:00
centerOnScreen(window);
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
moveMouseAway(window);
if (mirrored)
window->setLocale(QLocale("ar_EG"));
QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>();
QVERIFY(mainMenu);
mainMenu->setCascade(cascade);
QCOMPARE(mainMenu->cascade(), cascade);
mainMenu->setOverlap(overlap);
QCOMPARE(mainMenu->overlap(), overlap);
QQuickMenu *subMenu1 = window->property("subMenu1").value<QQuickMenu *>();
QVERIFY(subMenu1);
subMenu1->setCascade(cascade);
QCOMPARE(subMenu1->cascade(), cascade);
subMenu1->setOverlap(overlap);
QCOMPARE(subMenu1->overlap(), overlap);
QQuickMenu *subMenu2 = window->property("subMenu2").value<QQuickMenu *>();
QVERIFY(subMenu2);
subMenu2->setCascade(cascade);
QCOMPARE(subMenu2->cascade(), cascade);
subMenu2->setOverlap(overlap);
QCOMPARE(subMenu2->overlap(), overlap);
QQuickMenu *subSubMenu1 = window->property("subSubMenu1").value<QQuickMenu *>();
QVERIFY(subSubMenu1);
subSubMenu1->setCascade(cascade);
QCOMPARE(subSubMenu1->cascade(), cascade);
subSubMenu1->setOverlap(overlap);
QCOMPARE(subSubMenu1->overlap(), overlap);
Menu: allow horizontal flip for cascading sub-menus Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-16 03:28:59 +00:00
// choose the main menu position so that there's room for the
// sub-menus to cascade to the left when mirrored
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
if (mirrored)
Menu: allow horizontal flip for cascading sub-menus Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-16 03:28:59 +00:00
mainMenu->setX(window->width() - 200);
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
mainMenu->open();
QVERIFY(mainMenu->isVisible());
QVERIFY(!subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
Menu: allow horizontal flip for cascading sub-menus Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-16 03:28:59 +00:00
// open the sub-menu (never flips)
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
QQuickMenuItem *subMenu1Item = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(1));
QVERIFY(subMenu1Item);
QCOMPARE(subMenu1Item->subMenu(), subMenu1);
emit subMenu1Item->triggered();
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
if (cascade) {
QCOMPARE(subMenu1->parentItem(), subMenu1Item);
// vertically aligned to the parent menu item
QCOMPARE(subMenu1->popupItem()->y(), mainMenu->popupItem()->y() + subMenu1Item->y() - subMenu1->topPadding());
if (mirrored)
QCOMPARE(subMenu1->popupItem()->x(), mainMenu->popupItem()->x() - subMenu1->width() + overlap); // on the left of the parent menu
else
QCOMPARE(subMenu1->popupItem()->x(), mainMenu->popupItem()->x() + mainMenu->width() - overlap); // on the right of the parent menu
} else {
QCOMPARE(subMenu1->parentItem(), mainMenu->parentItem());
// centered over the parent menu
QCOMPARE(subMenu1->popupItem()->x(), mainMenu->popupItem()->x() + (mainMenu->width() - subMenu1->width()) / 2);
QCOMPARE(subMenu1->popupItem()->y(), mainMenu->popupItem()->y() + (mainMenu->height() - subMenu1->height()) / 2);
}
Menu: allow horizontal flip for cascading sub-menus Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-16 03:28:59 +00:00
// open the sub-sub-menu (can flip)
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
QQuickMenuItem *subSubMenu1Item = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(2));
QVERIFY(subSubMenu1Item);
QCOMPARE(subSubMenu1Item->subMenu(), subSubMenu1);
emit subSubMenu1Item->triggered();
QCOMPARE(mainMenu->isVisible(), cascade);
QCOMPARE(subMenu1->isVisible(), cascade);
QVERIFY(!subMenu2->isVisible());
QVERIFY(subSubMenu1->isVisible());
if (cascade) {
QCOMPARE(subSubMenu1->parentItem(), subSubMenu1Item);
// vertically aligned to the parent menu item
QCOMPARE(subSubMenu1->popupItem()->y(), subMenu1->popupItem()->y() + subSubMenu1Item->y() - subSubMenu1->topPadding());
Menu: allow horizontal flip for cascading sub-menus Allow sub-menus to open on the left side if there's more space than on the right side. This is the expected behavior on desktop. Change-Id: I915cb93e98a42bf50758d9e98fd98632e55c2cfa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-16 03:28:59 +00:00
if (mirrored != flip)
Add support for cascading sub-menus This commit adds initial support for cascading sub-menus by allowing one to nest declarative Menu declarations. A follow-up commit adds support for adding, inserting, and removing menus programmatically. [ChangeLog][Controls][Menu] Added support for cascading sub-menus. Task-number: QTBUG-60351 Change-Id: I0eee4f74d92a97c09333fcc4348b019782448535 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-01 21:36:57 +00:00
QCOMPARE(subSubMenu1->popupItem()->x(), subMenu1->popupItem()->x() - subSubMenu1->width() + overlap); // on the left of the parent menu
else
QCOMPARE(subSubMenu1->popupItem()->x(), subMenu1->popupItem()->x() + subMenu1->width() - overlap); // on the right of the parent menu
} else {
QCOMPARE(subSubMenu1->parentItem(), subMenu1->parentItem());
// centered over the parent menu
QCOMPARE(subSubMenu1->popupItem()->x(), subMenu1->popupItem()->x() + (subMenu1->width() - subSubMenu1->width()) / 2);
QCOMPARE(subSubMenu1->popupItem()->y(), subMenu1->popupItem()->y() + (subMenu1->height() - subSubMenu1->height()) / 2);
}
}
Merge remote-tracking branch 'origin/5.9' into 5.10 Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
2017-09-27 18:07:23 +00:00
void tst_QQuickMenu::addRemoveSubMenus()
Add QQuickMenu::add/insert/remove/takeMenu() [ChangeLog][Controls][Menu] Added addMenu(), insertMenu(), removeMenu(), and takeMenu() methods for adding and removing sub-menus programmatically. Change-Id: Ibf39448cdf528f64695b1ee5f0781384b754ba22 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-07 17:43:58 +00:00
{
QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml"));
QQuickWindow *window = helper.window;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>();
QVERIFY(mainMenu);
QQuickMenu: add actionAt() and menuAt() accessors This complements the add/insert/remove/take API that was added for actions and menus. Unlike for menu items, there was no convenient way to access a specific action or menu directly without accessing the respective item first. [ChangeLog][Controls][Menu] Added actionAt() and menuAt() accessors. Change-Id: I5515441626b3a04b05265d5b42afdaea8e256709 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-10 09:59:47 +00:00
QVERIFY(!mainMenu->menuAt(0));
Add QQuickMenu::add/insert/remove/takeMenu() [ChangeLog][Controls][Menu] Added addMenu(), insertMenu(), removeMenu(), and takeMenu() methods for adding and removing sub-menus programmatically. Change-Id: Ibf39448cdf528f64695b1ee5f0781384b754ba22 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-07 17:43:58 +00:00
QPointer<QQuickMenu> subMenu1 = window->property("subMenu1").value<QQuickMenu *>();
QVERIFY(!subMenu1.isNull());
QQuickMenu: add actionAt() and menuAt() accessors This complements the add/insert/remove/take API that was added for actions and menus. Unlike for menu items, there was no convenient way to access a specific action or menu directly without accessing the respective item first. [ChangeLog][Controls][Menu] Added actionAt() and menuAt() accessors. Change-Id: I5515441626b3a04b05265d5b42afdaea8e256709 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-10 09:59:47 +00:00
QCOMPARE(mainMenu->menuAt(1), subMenu1.data());
QVERIFY(!mainMenu->menuAt(2));
Add QQuickMenu::add/insert/remove/takeMenu() [ChangeLog][Controls][Menu] Added addMenu(), insertMenu(), removeMenu(), and takeMenu() methods for adding and removing sub-menus programmatically. Change-Id: Ibf39448cdf528f64695b1ee5f0781384b754ba22 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-07 17:43:58 +00:00
QPointer<QQuickMenu> subMenu2 = window->property("subMenu2").value<QQuickMenu *>();
QVERIFY(!subMenu2.isNull());
QQuickMenu: add actionAt() and menuAt() accessors This complements the add/insert/remove/take API that was added for actions and menus. Unlike for menu items, there was no convenient way to access a specific action or menu directly without accessing the respective item first. [ChangeLog][Controls][Menu] Added actionAt() and menuAt() accessors. Change-Id: I5515441626b3a04b05265d5b42afdaea8e256709 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-07-10 09:59:47 +00:00
QCOMPARE(mainMenu->menuAt(3), subMenu2.data());
QVERIFY(!mainMenu->menuAt(4));
Add QQuickMenu::add/insert/remove/takeMenu() [ChangeLog][Controls][Menu] Added addMenu(), insertMenu(), removeMenu(), and takeMenu() methods for adding and removing sub-menus programmatically. Change-Id: Ibf39448cdf528f64695b1ee5f0781384b754ba22 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-06-07 17:43:58 +00:00
QPointer<QQuickMenu> subSubMenu1 = window->property("subSubMenu1").value<QQuickMenu *>();
QVERIFY(!subSubMenu1.isNull());
// takeMenu(int) does not destroy the menu, but does destroy the respective item in the parent menu
QPointer<QQuickMenuItem> subSubMenu1Item = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(2));
QVERIFY(subSubMenu1Item);
QCOMPARE(subSubMenu1Item->subMenu(), subSubMenu1.data());
QCOMPARE(subMenu1->takeMenu(2), subSubMenu1.data());
QVERIFY(!subMenu1->itemAt(2));
QCoreApplication::sendPostedEvents(subSubMenu1, QEvent::DeferredDelete);
QVERIFY(!subSubMenu1.isNull());
QCoreApplication::sendPostedEvents(subSubMenu1Item, QEvent::DeferredDelete);
QVERIFY(subSubMenu1Item.isNull());
// takeMenu(int) does not destroy an item that doesn't present a menu
QPointer<QQuickMenuItem> subMenuItem1 = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(0));
QVERIFY(subMenuItem1);
QVERIFY(!subMenuItem1->subMenu());
QVERIFY(!subMenu1->takeMenu(0));
QCoreApplication::sendPostedEvents(subMenuItem1, QEvent::DeferredDelete);
QVERIFY(!subMenuItem1.isNull());
// addMenu(Menu) re-creates the respective item in the parent menu
subMenu1->addMenu(subSubMenu1);
subSubMenu1Item = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(2));
QVERIFY(!subSubMenu1Item.isNull());
// removeMenu(Menu) destroys both the menu and the respective item in the parent menu
subMenu1->removeMenu(subSubMenu1);
QVERIFY(!subMenu1->itemAt(2));
QCoreApplication::sendPostedEvents(subSubMenu1, QEvent::DeferredDelete);
QVERIFY(subSubMenu1.isNull());
QCoreApplication::sendPostedEvents(subSubMenu1Item, QEvent::DeferredDelete);
QVERIFY(subSubMenu1Item.isNull());
}
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
QTEST_MAIN(tst_QQuickMenu)
Add Menu An item-based menu derived from QQuickPanel. Eventually we'd like to make Panel itself a QQuickItem, as it makes both the implementation and the actual usage of Menu a lot easier. Change-Id: Ic1bf2a05ab98d9e17824c402ed8326ef65d26c69 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-16 15:06:07 +00:00
Rename tst_menu to tst_QQuickMenu Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-09-27 13:14:32 +00:00
#include "tst_qquickmenu.moc"