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

2086 lines
82 KiB
C++
Raw Normal View History

Use SPDX license identifiers Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2022-05-13 13:12:05 +00:00
// Copyright (C) 2017 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.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
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
#include <QtTest/qtest.h>
#include <QtTest/qsignalspy.h>
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>
Fix sub-menu shortcuts not being triggered When QQuickShortcutContext::matcher is checking who should get a shortcut, it starts with the object that registered the shortcut and climbs up its parent hierarchy until it finds a window. Sub-menus, unlike top-level menus, will not have an associated window until their parent menu is opened. So, check if the popup is a sub-menu so that actions within it can grab shortcuts. Change-Id: I07172b1038af1e9fffd9983f7bf0a155b11bb1c3 Fixes: QTBUG-101034 Pick-to: 6.2 6.3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-03-10 08:47:34 +00:00
#if QT_CONFIG(shortcut)
#include <QtGui/qkeysequence.h>
#endif
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>
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
#include <QtGui/qpa/qplatformintegration.h>
#include <QtGui/private/qguiapplication_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
#include <QtQml/qqmlengine.h>
#include <QtQml/qqmlcomponent.h>
#include <QtQml/qqmlcontext.h>
#include <QtQuick/qquickview.h>
#include <QtQuick/private/qquickitem_p.h>
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
#include <QtQuickTestUtils/private/qmlutils_p.h>
#include <QtQuickTestUtils/private/visualtestutils_p.h>
#include <QtQuickControlsTestUtils/private/controlstestutils_p.h>
#include <QtQuickControlsTestUtils/private/qtest_quickcontrols_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
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
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
using namespace QQuickVisualTestUtils;
using namespace QQuickControlsTestUtils;
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
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:
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
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
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: don't give focus to disabled menu items Change-Id: I7eb394ca3991eae585fbbd8e665c46b11ef64a07 Fixes: QTBUG-70181 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-02-01 12:53:06 +00:00
void disabledMenuItemKeyNavigation();
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();
tst_QQuickMenu: skip entire popup() test where necessary If the cursor configure feature is not enabled, don't build the code. If the platform is Android or Wayland, skip the test. Pick-to: 6.2 6.3 6.4 Change-Id: Ic60771decf7f2e0bd7db77c112925147015af5a6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2022-06-28 08:05:18 +00:00
#if QT_CONFIG(cursor)
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();
tst_QQuickMenu: skip entire popup() test where necessary If the cursor configure feature is not enabled, don't build the code. If the platform is Android or Wayland, skip the test. Pick-to: 6.2 6.3 6.4 Change-Id: Ic60771decf7f2e0bd7db77c112925147015af5a6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2022-06-28 08:05:18 +00:00
#endif
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();
Fix sub-menu shortcuts not being triggered When QQuickShortcutContext::matcher is checking who should get a shortcut, it starts with the object that registered the shortcut and climbs up its parent hierarchy until it finds a window. Sub-menus, unlike top-level menus, will not have an associated window until their parent menu is opened. So, check if the popup is a sub-menu so that actions within it can grab shortcuts. Change-Id: I07172b1038af1e9fffd9983f7bf0a155b11bb1c3 Fixes: QTBUG-101034 Pick-to: 6.2 6.3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-03-10 08:47:34 +00:00
#if QT_CONFIG(shortcut)
void actionShortcuts();
#endif
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();
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
void subMenuDisabledMouse_data();
void subMenuDisabledMouse();
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 subMenuKeyboard_data();
void subMenuKeyboard();
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
void subMenuDisabledKeyboard_data();
void subMenuDisabledKeyboard();
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 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();
Menu: fix items not being scrollable when using Window Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-06-18 09:38:40 +00:00
void scrollable_data();
void scrollable();
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
void disableWhenTriggered_data();
void disableWhenTriggered();
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
void menuItemWidth_data();
void menuItemWidth();
void menuItemWidthAfterMenuWidthChanged_data();
void menuItemWidthAfterMenuWidthChanged();
void menuItemWidthAfterImplicitWidthChanged_data();
void menuItemWidthAfterImplicitWidthChanged();
void menuItemWidthAfterRetranslate();
QQuickAbstractButton: don't accept key release if we're not pressed A control should have been pressed if it's going to accept a release. This prevents an issue where a menu opened by pressing enter (handled via attached Keys property) would instantly trigger the first menu item. Pick-to: 5.15 5.12 Fixes: QTBUG-83698 Change-Id: I6b1afbb76f37623012472b2b1148b4862c159239 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-10-20 08:34:53 +00:00
void giveMenuItemFocusOnButtonPress();
Menu: cull non-visible items when `contentItem` inherits Item For a custom menu control, when the contentItem does not inherit from ItemView, the text overlaps. A related bug is QTBUG-53262, but this problem is only fixed for the ItemView control. Since the contentItem control can accept the Item control, I think the repair only for ItemView has limitations. Therefore, this submission cancels the restriction on the type of contentitem. Pick-to: 6.3 6.4 Fixes: QTBUG-104470 Change-Id: I7e697e3cb993475d157a92f37d9512e4a9872387 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-21 03:10:00 +00:00
void customMenuCullItems();
Repeater: uncull items that come from ObjectModel After 6173fc0e4be93604286b9a424f1aa3ff5896082a, Menu will unconditionally cull items as they are inserted. This behavior relies on the fact that ListView will uncull the items as necessary. However, when implementing Menu with a Repeater as the contentItem (which is unusual but not unreasonable), the items will never be unculled and hence will be invisible. We can't fix this in Menu by checking its contentItem, because when items are inserted, their parent item is the root contentItem, not the Repeater, and there's no nice, efficient way to check if the item belongs to a Repeater. This patch fixes the issue in Repeater by unculling the item if it came from an ObjectModel. Done-with: Mitch Curtis <mitch.curtis@qt.io> Pick-to: 6.3 6.4 Fixes: QTBUG-104544 Change-Id: Ib37d2d49d3608156a3f1e3652b63ccdd5dfd0f41 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 02:38:51 +00:00
void customMenuUseRepeaterAsTheContentItem();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
private:
static bool hasWindowActivation();
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
};
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
tst_QQuickMenu::tst_QQuickMenu()
: QQmlDataTest(QT_QMLTEST_DATADIR)
{
}
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
bool tst_QQuickMenu::hasWindowActivation()
{
return (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation));
}
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
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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);
Give Dialogs and Menus focus by default Dialogs and Menus should always have focus when they're opened, especially now that the cancel key handling in QQuickPopup/QQuickPopupItem is done via regular key events and not shortcuts, as popups will now require focus in order to be cancelled via keyboard. [ChangeLog][Controls][Important Behavior Changes] Dialogs and Menus now have their focus property set to true by default. Popups are unchanged, meaning that popups that should be interacted with via keyboard (including cancelling) should have focus set to true or forceActiveFocus() called on them after opening. Task-number: QTBUG-79280 Change-Id: Idd070f2b1e8180a34a0dadb6e11dc56e531df211 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-02-25 08:43:45 +00:00
QVERIFY(emptyMenu->hasFocus());
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
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
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);
tst_qquickmenu: fix memory leak takeItem() unparents the item, so we need to make sure it gets deleted. The leak was caught by valgrind: ==10039== 832 (32 direct, 800 indirect) bytes in 1 blocks are definitely lost in loss record 6,465 of 6,706 ==10039== at 0x4C3017F: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==10039== by 0x112C1E: tst_QQuickMenu::count() (tst_qquickmenu.cpp:121) ==10039== by 0x12F313: tst_QQuickMenu::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) (tst_qquickmenu.moc:156) ==10039== by 0x612B6B2: QMetaMethod::invoke(QObject*, Qt::ConnectionType, QGenericReturnArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument, QGenericArgument) const (qmetaobject.cpp:2305) ==10039== by 0x41B07CD: invoke (qmetaobject.h:123) ==10039== by 0x41B07CD: QTest::TestMethods::invokeTestOnData(int) const (qtestcase.cpp:915) ==10039== by 0x41B15BF: QTest::TestMethods::invokeTest(int, char const*, QTest::WatchDog*) const (qtestcase.cpp:1114) ==10039== by 0x41B1D07: QTest::TestMethods::invokeTests(QObject*) const (qtestcase.cpp:1456) ==10039== by 0x41B2381: QTest::qRun() (qtestcase.cpp:1896) ==10039== by 0x41B24E1: QTest::qExec(QObject*, int, char**) (qtestcase.cpp:1783) ==10039== by 0x12F468: main (tst_qquickmenu.cpp:1505) Change-Id: I459c7897c1088c8b58152d2e0b5ceb8f3684e589 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-10-12 13:17:41 +00:00
QScopedPointer<QQuickItem> item(menu->takeItem(0));
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
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 window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
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");
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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;
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);
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
window->show();
QVERIFY(QTest::qWaitForWindowActive(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*>();
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QVERIFY(menu);
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());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QQuickOverlay *overlay = window->property("overlay").value<QQuickOverlay*>();
QVERIFY(overlay);
QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
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.
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier,
tst_qquickmenu: Fix click position and wait for menu opened() signal - When clicking on the menu, take into account the menu's coordinates as this may not always be (0,0) depending on the style-specific margins. - Wait for the menu enter transitions to finish before trying to interact with it, otherwise it leads to flakiness. - Explicitly set the overlap property to 0 when testing the submenus as the test relies on the menuItem to be clickable and not hidden by an overlapping subMenu item. Pick-to: 6.2 6.3 6.4 Change-Id: I561f47e69b2c9ee12c46f6accacd06e22b448df5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-07-20 15:55:21 +00:00
QPoint(menu->x() + menu->leftPadding() + firstItem->width() / 2, menu->y() + menu->topPadding() + firstItem->height() / 2));
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());
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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier,
tst_qquickmenu: Fix click position and wait for menu opened() signal - When clicking on the menu, take into account the menu's coordinates as this may not always be (0,0) depending on the style-specific margins. - Wait for the menu enter transitions to finish before trying to interact with it, otherwise it leads to flakiness. - Explicitly set the overlap property to 0 when testing the submenus as the test relies on the menuItem to be clickable and not hidden by an overlapping subMenu item. Pick-to: 6.2 6.3 6.4 Change-Id: I561f47e69b2c9ee12c46f6accacd06e22b448df5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-07-20 15:55:21 +00:00
QPoint(menu->x() + menu->leftPadding() + firstItem->width() / 2, menu->y() + menu->topPadding() + firstItem->height() / 2));
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(clickedSpy.count(), 1);
QCOMPARE(triggeredSpy.count(), 1);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(visibleSpy.count(), 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
QVERIFY(!menu->isVisible());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QVERIFY(!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());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
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,
Be sure to click outside the menu in tst_QQuickMenu::mouse() It seems that with Fusion style, the menu is somehow larger. Pick-to: 6.2 Change-Id: I2270d5db3cdb89da36f31d5b49225c16e34f114f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-07-06 16:07:47 +00:00
QPoint(menu->contentItem()->x() + menu->contentItem()->width() + 1,
menu->contentItem()->y() + menu->contentItem()->height() + 1));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(visibleSpy.count(), 3);
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());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QVERIFY(!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());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
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
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
// Hover-highlighting does not work on Android
#ifndef Q_OS_ANDROID
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();
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
for (int y = menu->topPadding(); y < listView->height(); ++y) {
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
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;
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTest::mouseMove(window, QPoint(
tst_qquickmenu: Fix click position and wait for menu opened() signal - When clicking on the menu, take into account the menu's coordinates as this may not always be (0,0) depending on the style-specific margins. - Wait for the menu enter transitions to finish before trying to interact with it, otherwise it leads to flakiness. - Explicitly set the overlap property to 0 when testing the submenus as the test relies on the menuItem to be clickable and not hidden by an overlapping subMenu item. Pick-to: 6.2 6.3 6.4 Change-Id: I561f47e69b2c9ee12c46f6accacd06e22b448df5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-07-20 15:55:21 +00:00
menu->x() + menu->leftPadding() + hoverItem->x() + hoverItem->width() / 2,
menu->y() + menu->topPadding() + hoverItem->y() + hoverItem->height() / 2));
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
QTRY_VERIFY(hoverItem->property("highlighted").toBool());
if (prevHoverItem)
QVERIFY(!prevHoverItem->property("highlighted").toBool());
prevHoverItem = hoverItem;
}
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#endif
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
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());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
// QVERIFY(!overlay->childItems().contains(menu->contentItem()));
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));
}
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
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("pressAndHold.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
QQuickWindow *window = helper.window;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
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
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
{
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
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");
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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;
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
centerOnScreen(window);
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
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window));
QVERIFY(QGuiApplication::focusWindow() == window);
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()));
Give Dialogs and Menus focus by default Dialogs and Menus should always have focus when they're opened, especially now that the cancel key handling in QQuickPopup/QQuickPopupItem is done via regular key events and not shortcuts, as popups will now require focus in order to be cancelled via keyboard. [ChangeLog][Controls][Important Behavior Changes] Dialogs and Menus now have their focus property set to true by default. Popups are unchanged, meaning that popups that should be interacted with via keyboard (including cancelling) should have focus set to true or forceActiveFocus() called on them after opening. Task-number: QTBUG-79280 Change-Id: Idd070f2b1e8180a34a0dadb6e11dc56e531df211 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-02-25 08:43:45 +00:00
QVERIFY(menu->hasFocus());
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());
Give Dialogs and Menus focus by default Dialogs and Menus should always have focus when they're opened, especially now that the cancel key handling in QQuickPopup/QQuickPopupItem is done via regular key events and not shortcuts, as popups will now require focus in order to be cancelled via keyboard. [ChangeLog][Controls][Important Behavior Changes] Dialogs and Menus now have their focus property set to true by default. Popups are unchanged, meaning that popups that should be interacted with via keyboard (including cancelling) should have focus set to true or forceActiveFocus() called on them after opening. Task-number: QTBUG-79280 Change-Id: Idd070f2b1e8180a34a0dadb6e11dc56e531df211 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-02-25 08:43:45 +00:00
QVERIFY(menu->hasActiveFocus());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QQuickOverlay *overlay = window->property("overlay").value<QQuickOverlay*>();
QVERIFY(overlay);
QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
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);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(visibleSpy.count(), 2);
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());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QVERIFY(!overlay->childItems().contains(menu->contentItem()));
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));
QQuickMenu: allow enter/return to be used to activate items Before this patch, only space was allowed. Windows 10 and macOS 10.14.2 both allow using enter to activate menu items. Change-Id: I64476347669ff73f233efd129563a18ba51618a5 Fixes: QTBUG-73354 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-02-01 15:03:56 +00:00
// Enter/return should also work.
// Open the menu.
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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
QQuickMenu: allow enter/return to be used to activate items Before this patch, only space was allowed. Windows 10 and macOS 10.14.2 both allow using enter to activate menu items. Change-Id: I64476347669ff73f233efd129563a18ba51618a5 Fixes: QTBUG-73354 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-02-01 15:03:56 +00:00
// Give the first item focus.
QTest::keyClick(window, Qt::Key_Tab);
QVERIFY(firstItem->hasActiveFocus());
QVERIFY(firstItem->hasVisualFocus());
QVERIFY(firstItem->isHighlighted());
QCOMPARE(firstItem->focusReason(), Qt::TabFocusReason);
QCOMPARE(menu->currentIndex(), 0);
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(0));
// Press enter.
QSignalSpy firstTriggeredSpy(firstItem, SIGNAL(triggered()));
QTest::keyClick(window, Qt::Key_Return);
QCOMPARE(firstTriggeredSpy.count(), 1);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(visibleSpy.count(), 4);
QQuickMenu: allow enter/return to be used to activate items Before this patch, only space was allowed. Windows 10 and macOS 10.14.2 both allow using enter to activate menu items. Change-Id: I64476347669ff73f233efd129563a18ba51618a5 Fixes: QTBUG-73354 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-02-01 15:03:56 +00:00
QVERIFY(!menu->isVisible());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QVERIFY(!overlay->childItems().contains(menu->contentItem()));
QQuickMenu: allow enter/return to be used to activate items Before this patch, only space was allowed. Windows 10 and macOS 10.14.2 both allow using enter to activate menu items. Change-Id: I64476347669ff73f233efd129563a18ba51618a5 Fixes: QTBUG-73354 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-02-01 15:03:56 +00:00
QVERIFY(!firstItem->hasActiveFocus());
QVERIFY(!firstItem->hasVisualFocus());
QVERIFY(!firstItem->isHighlighted());
QVERIFY(!secondItem->hasActiveFocus());
QVERIFY(!secondItem->hasVisualFocus());
QVERIFY(!secondItem->isHighlighted());
QCOMPARE(menu->currentIndex(), -1);
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
menu->open();
QCOMPARE(visibleSpy.count(), 5);
QVERIFY(menu->isVisible());
ApplicationWindow: remove deprecated overlay API [ChangeLog][Controls][ApplicationWindow] The deprecated overlay properties and attached API were removed. Use the Overlay attached type instead. Task-number: QTBUG-84715 Change-Id: I0781ea55ea502ffe5277385e82492291724d2090 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 11:31:53 +00:00
QVERIFY(overlay->childItems().contains(menu->contentItem()->parentItem()));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
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);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(visibleSpy.count(), 6);
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
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
}
QQuickMenu: don't give focus to disabled menu items Change-Id: I7eb394ca3991eae585fbbd8e665c46b11ef64a07 Fixes: QTBUG-70181 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-02-01 12:53:06 +00:00
// QTBUG-70181
void tst_QQuickMenu::disabledMenuItemKeyNavigation()
{
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
QQuickMenu: don't give focus to disabled menu items Change-Id: I7eb394ca3991eae585fbbd8e665c46b11ef64a07 Fixes: QTBUG-70181 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-02-01 12:53:06 +00:00
if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls)
QSKIP("This platform only allows tab focus for text controls");
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("disabledMenuItemKeyNavigation.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
QQuickMenu: don't give focus to disabled menu items Change-Id: I7eb394ca3991eae585fbbd8e665c46b11ef64a07 Fixes: QTBUG-70181 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-02-01 12:53:06 +00:00
QQuickApplicationWindow *window = helper.appWindow;
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
centerOnScreen(window);
moveMouseAway(window);
QQuickMenu: don't give focus to disabled menu items Change-Id: I7eb394ca3991eae585fbbd8e665c46b11ef64a07 Fixes: QTBUG-70181 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-02-01 12:53:06 +00:00
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window));
QVERIFY(QGuiApplication::focusWindow() == window);
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QCOMPARE(menu->currentIndex(), -1);
QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
QQuickMenuItem *firstItem = qobject_cast<QQuickMenuItem *>(menu->itemAt(0));
QVERIFY(firstItem);
QQuickMenuItem *secondItem = qobject_cast<QQuickMenuItem *>(menu->itemAt(1));
QVERIFY(secondItem);
QQuickMenuItem *thirdItem = qobject_cast<QQuickMenuItem *>(menu->itemAt(2));
QVERIFY(thirdItem);
menu->setFocus(true);
menu->open();
QVERIFY(menu->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
QQuickMenu: don't give focus to disabled menu items Change-Id: I7eb394ca3991eae585fbbd8e665c46b11ef64a07 Fixes: QTBUG-70181 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-02-01 12:53:06 +00:00
QVERIFY(!firstItem->hasActiveFocus());
QVERIFY(!firstItem->property("highlighted").toBool());
QCOMPARE(menu->currentIndex(), -1);
QTest::keyClick(window, Qt::Key_Tab);
QVERIFY(firstItem->hasActiveFocus());
QVERIFY(firstItem->hasVisualFocus());
QVERIFY(firstItem->isHighlighted());
QCOMPARE(firstItem->focusReason(), Qt::TabFocusReason);
QCOMPARE(menu->currentIndex(), 0);
// Shouldn't be possible to give focus to a disabled menu item.
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(!secondItem->hasActiveFocus());
QVERIFY(!secondItem->hasVisualFocus());
QVERIFY(!secondItem->isHighlighted());
QVERIFY(thirdItem->hasActiveFocus());
QVERIFY(thirdItem->hasVisualFocus());
QVERIFY(thirdItem->isHighlighted());
QCOMPARE(thirdItem->focusReason(), Qt::TabFocusReason);
QTest::keyClick(window, Qt::Key_Up);
QVERIFY(firstItem->hasActiveFocus());
QVERIFY(firstItem->hasVisualFocus());
QVERIFY(firstItem->isHighlighted());
QCOMPARE(firstItem->focusReason(), Qt::BacktabFocusReason);
QTest::keyClick(window, Qt::Key_Escape);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(!menu->isVisible());
QQuickMenu: don't give focus to disabled menu items Change-Id: I7eb394ca3991eae585fbbd8e665c46b11ef64a07 Fixes: QTBUG-70181 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-02-01 12:53:06 +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
{
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
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
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("mnemonics.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
QQuickWindow *window = helper.window;
window->show();
window->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window));
Menu: Close menu by Alt key on platforms supporting mnemonic shortcuts This is close to what the widget QMenu (and Windows native menu) do. Before, the active menu was left open and Alt+<key> shortcut would be delivered to one of the matching items, which might be an item shadowed by the active menu popup. With this patch, the active menu is closed on Alt key pressed so the subsequent shortcut event will (likely) be delivered to the matching MenuBar item. Since I'm going to fix the issue of &mnemonic key conflict resolution, I need to first change the way of delivering a shortcut event to the parent MenuBar. The test cases use the undocumented function to simulate low-level behavior of Alt itself and Alt+<key> events. Apparently, there's no public QTest function to send multiple key events without releasing Alt modifier. Task-number: QTBUG-86276 Pick-to: 5.15 Change-Id: I0ed6ea94f0fee7983a5cb6352d388036d3a1f8df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-28 09:32:20 +00:00
MnemonicKeySimulator keySim(window);
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
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: Close menu by Alt key on platforms supporting mnemonic shortcuts This is close to what the widget QMenu (and Windows native menu) do. Before, the active menu was left open and Alt+<key> shortcut would be delivered to one of the matching items, which might be an item shadowed by the active menu popup. With this patch, the active menu is closed on Alt key pressed so the subsequent shortcut event will (likely) be delivered to the matching MenuBar item. Since I'm going to fix the issue of &mnemonic key conflict resolution, I need to first change the way of delivering a shortcut event to the parent MenuBar. The test cases use the undocumented function to simulate low-level behavior of Alt itself and Alt+<key> events. Apparently, there's no public QTest function to send multiple key events without releasing Alt modifier. Task-number: QTBUG-86276 Pick-to: 5.15 Change-Id: I0ed6ea94f0fee7983a5cb6352d388036d3a1f8df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-28 09:32:20 +00:00
keySim.press(Qt::Key_Alt);
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
menu->open();
QTRY_VERIFY(menu->isOpened());
QSignalSpy actionSpy(action, &QQuickAction::triggered);
QVERIFY(actionSpy.isValid());
Menu: Close menu by Alt key on platforms supporting mnemonic shortcuts This is close to what the widget QMenu (and Windows native menu) do. Before, the active menu was left open and Alt+<key> shortcut would be delivered to one of the matching items, which might be an item shadowed by the active menu popup. With this patch, the active menu is closed on Alt key pressed so the subsequent shortcut event will (likely) be delivered to the matching MenuBar item. Since I'm going to fix the issue of &mnemonic key conflict resolution, I need to first change the way of delivering a shortcut event to the parent MenuBar. The test cases use the undocumented function to simulate low-level behavior of Alt itself and Alt+<key> events. Apparently, there's no public QTest function to send multiple key events without releasing Alt modifier. Task-number: QTBUG-86276 Pick-to: 5.15 Change-Id: I0ed6ea94f0fee7983a5cb6352d388036d3a1f8df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-28 09:32:20 +00:00
keySim.click(Qt::Key_A); // "&Action"
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
QCOMPARE(actionSpy.count(), 1);
menu->open();
QTRY_VERIFY(menu->isOpened());
QSignalSpy menuItemSpy(menuItem, &QQuickMenuItem::triggered);
QVERIFY(menuItemSpy.isValid());
Menu: Close menu by Alt key on platforms supporting mnemonic shortcuts This is close to what the widget QMenu (and Windows native menu) do. Before, the active menu was left open and Alt+<key> shortcut would be delivered to one of the matching items, which might be an item shadowed by the active menu popup. With this patch, the active menu is closed on Alt key pressed so the subsequent shortcut event will (likely) be delivered to the matching MenuBar item. Since I'm going to fix the issue of &mnemonic key conflict resolution, I need to first change the way of delivering a shortcut event to the parent MenuBar. The test cases use the undocumented function to simulate low-level behavior of Alt itself and Alt+<key> events. Apparently, there's no public QTest function to send multiple key events without releasing Alt modifier. Task-number: QTBUG-86276 Pick-to: 5.15 Change-Id: I0ed6ea94f0fee7983a5cb6352d388036d3a1f8df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-28 09:32:20 +00:00
keySim.click(Qt::Key_I); // "Menu &Item"
keySim.release(Qt::Key_Alt);
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
QCOMPARE(menuItemSpy.count(), 1);
Menu: Close menu by Alt key on platforms supporting mnemonic shortcuts This is close to what the widget QMenu (and Windows native menu) do. Before, the active menu was left open and Alt+<key> shortcut would be delivered to one of the matching items, which might be an item shadowed by the active menu popup. With this patch, the active menu is closed on Alt key pressed so the subsequent shortcut event will (likely) be delivered to the matching MenuBar item. Since I'm going to fix the issue of &mnemonic key conflict resolution, I need to first change the way of delivering a shortcut event to the parent MenuBar. The test cases use the undocumented function to simulate low-level behavior of Alt itself and Alt+<key> events. Apparently, there's no public QTest function to send multiple key events without releasing Alt modifier. Task-number: QTBUG-86276 Pick-to: 5.15 Change-Id: I0ed6ea94f0fee7983a5cb6352d388036d3a1f8df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-28 09:32:20 +00:00
keySim.press(Qt::Key_Alt);
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
menu->open();
QTRY_VERIFY(menu->isOpened());
Menu: Close menu by Alt key on platforms supporting mnemonic shortcuts This is close to what the widget QMenu (and Windows native menu) do. Before, the active menu was left open and Alt+<key> shortcut would be delivered to one of the matching items, which might be an item shadowed by the active menu popup. With this patch, the active menu is closed on Alt key pressed so the subsequent shortcut event will (likely) be delivered to the matching MenuBar item. Since I'm going to fix the issue of &mnemonic key conflict resolution, I need to first change the way of delivering a shortcut event to the parent MenuBar. The test cases use the undocumented function to simulate low-level behavior of Alt itself and Alt+<key> events. Apparently, there's no public QTest function to send multiple key events without releasing Alt modifier. Task-number: QTBUG-86276 Pick-to: 5.15 Change-Id: I0ed6ea94f0fee7983a5cb6352d388036d3a1f8df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-28 09:32:20 +00:00
keySim.click(Qt::Key_M); // "Sub &Menu"
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
QTRY_VERIFY(subMenu->isOpened());
QSignalSpy subMenuItemSpy(subMenuItem, &QQuickMenuItem::triggered);
QVERIFY(subMenuItemSpy.isValid());
Menu: Close menu by Alt key on platforms supporting mnemonic shortcuts This is close to what the widget QMenu (and Windows native menu) do. Before, the active menu was left open and Alt+<key> shortcut would be delivered to one of the matching items, which might be an item shadowed by the active menu popup. With this patch, the active menu is closed on Alt key pressed so the subsequent shortcut event will (likely) be delivered to the matching MenuBar item. Since I'm going to fix the issue of &mnemonic key conflict resolution, I need to first change the way of delivering a shortcut event to the parent MenuBar. The test cases use the undocumented function to simulate low-level behavior of Alt itself and Alt+<key> events. Apparently, there's no public QTest function to send multiple key events without releasing Alt modifier. Task-number: QTBUG-86276 Pick-to: 5.15 Change-Id: I0ed6ea94f0fee7983a5cb6352d388036d3a1f8df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-28 09:32:20 +00:00
keySim.click(Qt::Key_S); // "&Sub Menu Item"
keySim.release(Qt::Key_Alt);
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
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
{
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
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");
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("applicationwindow.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
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);
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
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("addItem.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
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
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
{
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("menuSeparator.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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;
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);
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
window->show();
QVERIFY(QTest::qWaitForWindowActive(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
tst_qquickmenu: Fix click position and wait for menu opened() signal - When clicking on the menu, take into account the menu's coordinates as this may not always be (0,0) depending on the style-specific margins. - Wait for the menu enter transitions to finish before trying to interact with it, otherwise it leads to flakiness. - Explicitly set the overlap property to 0 when testing the submenus as the test relies on the menuItem to be clickable and not hidden by an overlapping subMenu item. Pick-to: 6.2 6.3 6.4 Change-Id: I561f47e69b2c9ee12c46f6accacd06e22b448df5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-07-20 15:55:21 +00:00
QTRY_VERIFY(menu->isOpened());
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
// 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();
tst_qquickmenu: Fix click position and wait for menu opened() signal - When clicking on the menu, take into account the menu's coordinates as this may not always be (0,0) depending on the style-specific margins. - Wait for the menu enter transitions to finish before trying to interact with it, otherwise it leads to flakiness. - Explicitly set the overlap property to 0 when testing the submenus as the test relies on the menuItem to be clickable and not hidden by an overlapping subMenu item. Pick-to: 6.2 6.3 6.4 Change-Id: I561f47e69b2c9ee12c46f6accacd06e22b448df5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-07-20 15:55:21 +00:00
QTRY_VERIFY(menu->isOpened());
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
// 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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
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
// 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
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("repeater.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
QQuickWindow *window = helper.window;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
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
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);
Revert all Menu delegate patches This reverts the following commits: d5cb26bc56a3b6f6e99c88654d4f7a65f43551ac - Menu: ensure the correct delegates are used when created via Component d923dd467c1aeb3e195a09949b04862084002f88 - MenuBar: ensure the correct delegates are used when created via Component d56c193eb4ceb640611d66f22e1f26aae91cd7d1 - QQuickPopupPositioner: avoid adding duplicate item change listeners 567a2de8cd493aabe0055d6dbc367b39447e70dd - Stabilize tst_qquickmenubar 953fbac6131823e4fce0eb4707a854469c4c04ff - Fix Instantiator-created MenuItems disappearing 936d31179d44220571ded15840bedeccb581c83b - tst_qquickmenu: add a test for MenuItems before and after a Repeater fc1832810f6c09505d9413685ed0b2d6295bea4a - QQuickMenuBar: fix menu not opening The fix for QTBUG-67559 has caused lots of issues, with the latest being a crash right before the 5.12 release. The bug that they fix is a P2, so it's not worth the hassle. The patches might be able to be resubmitted to dev after the crash is fixed. Change-Id: Ic192c7a302176bcdb2503b636b3462b10898a2ba Fixes: QTBUG-71770 Reviewed-by: J-P Nurmi <jpnurmi@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2018-11-14 10:13:15 +00:00
QVERIFY(item);
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
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
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("order.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
QQuickWindow *window = helper.window;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
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
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));
}
}
tst_QQuickMenu: skip entire popup() test where necessary If the cursor configure feature is not enabled, don't build the code. If the platform is Android or Wayland, skip the test. Pick-to: 6.2 6.3 6.4 Change-Id: Ic60771decf7f2e0bd7db77c112925147015af5a6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2022-06-28 08:05:18 +00:00
#if QT_CONFIG(cursor)
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
{
tst_QQuickMenu: skip entire popup() test where necessary If the cursor configure feature is not enabled, don't build the code. If the platform is Android or Wayland, skip the test. Pick-to: 6.2 6.3 6.4 Change-Id: Ic60771decf7f2e0bd7db77c112925147015af5a6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2022-06-28 08:05:18 +00:00
#if defined(Q_OS_ANDROID)
QSKIP("Setting cursor position is not supported on Android");
#endif
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland")))
QSKIP("Setting cursor position is not supported on Wayland");
tst_qquickmenu: Unblacklist some test cases on macOS - SKIP instead of blacklist the popup test on macOS as the cursor position can't be controlled on this platform. - Use the TRY variant with isOpened() instead of isVisible() in order to make sure that all enter/exit transitions are finished before interacting with the menu. Otherwise, the test can be flaky. - The subMenuDisabledMouse test expects currentIndex to be set on mainMenu when the click happens. As we set the currentIndex on a hover or keyboard navigation event, explicitly generate a hover event with mouseMove before clicking. Pick-to: 6.2 6.3 6.4 Change-Id: I7eba20a6b25f2e48a66145774539523def7142e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-21 15:44:03 +00:00
// Try moving the cursor from the current position
// Skip if it fails since the test relies on moving the cursor
const QPoint point = QCursor::pos() + QPoint(1, 1);
QCursor::setPos(point);
if (!QTest::qWaitFor([point]{ return QCursor::pos() == point; }))
QSKIP("Setting cursor position is not supported on this platform");
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("popup.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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;
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);
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(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);
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);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
const qreal elevenOrLeftMargin = qMax(qreal(11), menu->leftMargin());
const qreal twentyTwoOrTopMargin = qMax(qreal(22), menu->topMargin());
// If the Menu has large margins, it may be moved to stay within them.
// QTBUG-75503: QTRY_COMPARE doesn't use qFuzzyCompare() in all cases,
// meaning a lot of these comparisons could trigger a 10 second wait;
// use QTRY_VERIFY and qFuzzyCompare instead.
QTRY_VERIFY(qFuzzyCompare(menu->x(), elevenOrLeftMargin));
QTRY_VERIFY(qFuzzyCompare(menu->y(), twentyTwoOrTopMargin));
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);
tst_qquickmenu: Take into account menu margins when checking coordinates Pick-to: 6.2 6.3 6.4 Change-Id: I416de281882a2ad94d03567d12dbb1491ffa801c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-08-01 16:26:48 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), qMax(qreal(33), menu->leftMargin())));
QTRY_VERIFY(qFuzzyCompare(menu->y(), qMax(qreal(44), menu->topMargin())));
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);
tst_qquickmenu: Take into account menu margins when checking coordinates Pick-to: 6.2 6.3 6.4 Change-Id: I416de281882a2ad94d03567d12dbb1491ffa801c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-08-01 16:26:48 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), qMax(qreal(55), menu->leftMargin())));
QTRY_VERIFY(qFuzzyCompare(menu->y(), qMax(qreal(66), menu->topMargin())));
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->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);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), button->mapFromScene(QPointF(elevenOrLeftMargin, twentyTwoOrTopMargin)).x()));
QTRY_VERIFY(qFuzzyCompare(menu->y(), button->mapFromScene(QPointF(elevenOrLeftMargin, twentyTwoOrTopMargin)).y()));
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->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);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
// Don't need to worry about margins here because we're opening close
// to the center of the window.
QTRY_VERIFY(qFuzzyCompare(menu->x(), -11));
QTRY_VERIFY(qFuzzyCompare(menu->y(), -22));
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->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);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), -33));
QTRY_VERIFY(qFuzzyCompare(menu->y(), -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->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();
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
const qreal twelveOrLeftMargin = qMax(qreal(12), menu->leftMargin());
cursorPos = window->mapToGlobal(QPoint(twelveOrLeftMargin, window->height() / 2));
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
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));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), twelveOrLeftMargin));
QTRY_VERIFY(qFuzzyCompare(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));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), 33));
QTRY_VERIFY(qFuzzyCompare(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));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), 55));
QTRY_COMPARE_WITH_TIMEOUT(menu->y(), window->height() / 3 * 2 - menu->topPadding() - menuItem->y(), 500);
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->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));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), button->mapFromScene(QPoint(twelveOrLeftMargin, window->height() / 2)).x()));
QTRY_VERIFY(qFuzzyCompare(menu->y(), button->mapFromScene(QPoint(twelveOrLeftMargin, window->height() / 2)).y() - menu->topPadding() - menuItem->y()));
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->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));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), -11));
QTRY_VERIFY(qFuzzyCompare(menu->y(), -22 - menu->topPadding() - menuItem->y()));
QCOMPARE(menu->popupItem()->position(), button->mapToScene(QPointF(-11, -22 - menu->topPadding() - menuItem->y())));
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->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));
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(qFuzzyCompare(menu->x(), -33));
QTRY_VERIFY(qFuzzyCompare(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
}
tst_QQuickMenu: skip entire popup() test where necessary If the cursor configure feature is not enabled, don't build the code. If the platform is Android or Wayland, skip the test. Pick-to: 6.2 6.3 6.4 Change-Id: Ic60771decf7f2e0bd7db77c112925147015af5a6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2022-06-28 08:05:18 +00:00
#endif // QT_CONFIG(cursor)
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
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
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("actions.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
QQuickWindow *window = helper.window;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
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
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
}
Fix sub-menu shortcuts not being triggered When QQuickShortcutContext::matcher is checking who should get a shortcut, it starts with the object that registered the shortcut and climbs up its parent hierarchy until it finds a window. Sub-menus, unlike top-level menus, will not have an associated window until their parent menu is opened. So, check if the popup is a sub-menu so that actions within it can grab shortcuts. Change-Id: I07172b1038af1e9fffd9983f7bf0a155b11bb1c3 Fixes: QTBUG-101034 Pick-to: 6.2 6.3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-03-10 08:47:34 +00:00
#if QT_CONFIG(shortcut)
void tst_QQuickMenu::actionShortcuts()
{
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
Fix sub-menu shortcuts not being triggered When QQuickShortcutContext::matcher is checking who should get a shortcut, it starts with the object that registered the shortcut and climbs up its parent hierarchy until it finds a window. Sub-menus, unlike top-level menus, will not have an associated window until their parent menu is opened. So, check if the popup is a sub-menu so that actions within it can grab shortcuts. Change-Id: I07172b1038af1e9fffd9983f7bf0a155b11bb1c3 Fixes: QTBUG-101034 Pick-to: 6.2 6.3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2022-03-10 08:47:34 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("actionShortcuts.qml"));
QVERIFY2(helper.ready, helper.failureMessage());
QQuickWindow *window = helper.window;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
// Try the menu's shortcut.
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QVERIFY(menu);
QPointer<QQuickAction> action1 = menu->actionAt(0);
QVERIFY(action1);
QCOMPARE(action1->shortcut(), QKeySequence(Qt::Key_A));
QSignalSpy action1TriggeredSpy(action1, SIGNAL(triggered()));
QVERIFY(action1TriggeredSpy.isValid());
QTest::keyClick(window, Qt::Key_A);
QCOMPARE(action1TriggeredSpy.count(), 1);
// Try the sub-menu.
QQuickMenu *subMenu = window->property("subMenu").value<QQuickMenu *>();
QVERIFY(subMenu);
QPointer<QQuickAction> subMenuAction1 = subMenu->actionAt(0);
QVERIFY(subMenuAction1);
QCOMPARE(subMenuAction1->shortcut(), QKeySequence(Qt::Key_B));
QSignalSpy subMenuAction1TriggeredSpy(subMenuAction1, SIGNAL(triggered()));
QVERIFY(subMenuAction1TriggeredSpy.isValid());
QTest::keyClick(window, Qt::Key_B);
QCOMPARE(subMenuAction1TriggeredSpy.count(), 1);
// Try the button menu.
QQuickMenu *buttonMenu = window->property("buttonMenu").value<QQuickMenu *>();
QVERIFY(buttonMenu);
QPointer<QQuickAction> buttonMenuAction1 = buttonMenu->actionAt(0);
QVERIFY(buttonMenuAction1);
QCOMPARE(buttonMenuAction1->shortcut(), QKeySequence(Qt::Key_C));
QSignalSpy buttonMenuAction1TriggeredSpy(buttonMenuAction1, SIGNAL(triggered()));
QVERIFY(buttonMenuAction1TriggeredSpy.isValid());
QTest::keyClick(window, Qt::Key_C);
QCOMPARE(buttonMenuAction1TriggeredSpy.count(), 1);
}
#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::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
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("removeTakeItem.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
QQuickWindow *window = helper.window;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
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
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());
}
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);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("subMenus.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
QQuickApplicationWindow *window = helper.appWindow;
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);
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(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
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);
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
subMenu1->setCascade(cascade);
QCOMPARE(subMenu1->cascade(), cascade);
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
QQuickMenu *subMenu2 = window->property("subMenu2").value<QQuickMenu *>();
QVERIFY(subMenu2);
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
subMenu2->setCascade(cascade);
QCOMPARE(subMenu2->cascade(), cascade);
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
QQuickMenu *subSubMenu1 = window->property("subSubMenu1").value<QQuickMenu *>();
QVERIFY(subSubMenu1);
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
subSubMenu1->setCascade(cascade);
QCOMPARE(subSubMenu1->cascade(), cascade);
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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(mainMenu->isOpened());
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
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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(mainMenu->isVisible(), cascade);
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
QVERIFY(subMenu1->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(subMenu1->isOpened());
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
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
// on Android mouse hover will not open and close sub-menus
#ifndef Q_OS_ANDROID
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
// 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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
if (cascade) {
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
QTRY_VERIFY(subSubMenu1->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(subSubMenu1->isOpened());
}
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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
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
// 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());
Fix flaky tst_qquickmenu test The important part of the "cascading" test is checking that the sub-sub menu eventually opens, so move the !visible check to the non-cascading branch of the if statement. Change-Id: I5a09bf0b5d45832f7b75c3e8c397fdb9e6fcc011 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
2019-05-06 15:04:27 +00:00
if (!cascade) {
QVERIFY(!subSubMenu1->isVisible());
} else {
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
QTRY_VERIFY(subSubMenu1->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(subSubMenu1->isOpened());
}
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);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(subMenu1->isVisible(), !cascade);
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
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#else
QQuickMenuItem *mainMenuItem1 = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(0));
QVERIFY(mainMenuItem1);
#endif // !Q_OS_ANDROID
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 all menus by click triggering an item
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, mainMenuItem1->mapToScene(QPoint(1, 1)).toPoint());
QTRY_VERIFY(!mainMenu->isVisible());
QTRY_VERIFY(!subMenu1->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
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
}
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
void tst_QQuickMenu::subMenuDisabledMouse_data()
{
subMenuMouse_data();
}
// QTBUG-69540
void tst_QQuickMenu::subMenuDisabledMouse()
{
if ((QGuiApplication::platformName() == QLatin1String("offscreen"))
|| (QGuiApplication::platformName() == QLatin1String("minimal")))
QSKIP("Mouse hovering not functional on offscreen/minimal platforms");
QFETCH(bool, cascade);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("subMenuDisabled.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
QQuickApplicationWindow *window = helper.appWindow;
centerOnScreen(window);
moveMouseAway(window);
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>();
QVERIFY(mainMenu);
mainMenu->setCascade(cascade);
QCOMPARE(mainMenu->cascade(), cascade);
QQuickMenuItem *menuItem1 = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(0));
QVERIFY(menuItem1);
QQuickMenu *subMenu = window->property("subMenu").value<QQuickMenu *>();
QVERIFY(subMenu);
mainMenu->open();
tst_qquickmenu: Unblacklist some test cases on macOS - SKIP instead of blacklist the popup test on macOS as the cursor position can't be controlled on this platform. - Use the TRY variant with isOpened() instead of isVisible() in order to make sure that all enter/exit transitions are finished before interacting with the menu. Otherwise, the test can be flaky. - The subMenuDisabledMouse test expects currentIndex to be set on mainMenu when the click happens. As we set the currentIndex on a hover or keyboard navigation event, explicitly generate a hover event with mouseMove before clicking. Pick-to: 6.2 6.3 6.4 Change-Id: I7eba20a6b25f2e48a66145774539523def7142e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-21 15:44:03 +00:00
QTRY_VERIFY(mainMenu->isOpened());
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
QVERIFY(!menuItem1->isHighlighted());
QVERIFY(!subMenu->isVisible());
tst_qquickmenu: Unblacklist some test cases on macOS - SKIP instead of blacklist the popup test on macOS as the cursor position can't be controlled on this platform. - Use the TRY variant with isOpened() instead of isVisible() in order to make sure that all enter/exit transitions are finished before interacting with the menu. Otherwise, the test can be flaky. - The subMenuDisabledMouse test expects currentIndex to be set on mainMenu when the click happens. As we set the currentIndex on a hover or keyboard navigation event, explicitly generate a hover event with mouseMove before clicking. Pick-to: 6.2 6.3 6.4 Change-Id: I7eba20a6b25f2e48a66145774539523def7142e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-21 15:44:03 +00:00
// Hover-highlighting does not work on Android
#ifndef Q_OS_ANDROID
// Generate a hover event to set the current index
QTest::mouseMove(window, menuItem1->mapToScene(QPoint(2, 2)).toPoint());
QTRY_VERIFY(menuItem1->isHighlighted());
#endif
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
// Open the sub-menu with a mouse click.
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, menuItem1->mapToScene(QPoint(1, 1)).toPoint());
tst_qquickmenu: Unblacklist some test cases on macOS - SKIP instead of blacklist the popup test on macOS as the cursor position can't be controlled on this platform. - Use the TRY variant with isOpened() instead of isVisible() in order to make sure that all enter/exit transitions are finished before interacting with the menu. Otherwise, the test can be flaky. - The subMenuDisabledMouse test expects currentIndex to be set on mainMenu when the click happens. As we set the currentIndex on a hover or keyboard navigation event, explicitly generate a hover event with mouseMove before clicking. Pick-to: 6.2 6.3 6.4 Change-Id: I7eba20a6b25f2e48a66145774539523def7142e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-21 15:44:03 +00:00
// Need to use the TRY variant here,
// as e.g. Material, iOS style menus have transitions and don't open/close immediately.
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(mainMenu->isVisible(), cascade);
tst_qquickmenu: Unblacklist some test cases on macOS - SKIP instead of blacklist the popup test on macOS as the cursor position can't be controlled on this platform. - Use the TRY variant with isOpened() instead of isVisible() in order to make sure that all enter/exit transitions are finished before interacting with the menu. Otherwise, the test can be flaky. - The subMenuDisabledMouse test expects currentIndex to be set on mainMenu when the click happens. As we set the currentIndex on a hover or keyboard navigation event, explicitly generate a hover event with mouseMove before clicking. Pick-to: 6.2 6.3 6.4 Change-Id: I7eba20a6b25f2e48a66145774539523def7142e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-21 15:44:03 +00:00
QTRY_VERIFY(subMenu->isOpened());
tst_qquickmenu: fix flaky test The included test fails every now and then for Imagine, Fusion and Mac style. By using QTRY_VERIFY to wait a bit before we check if the menu is highlighted, it seems to pass each time. Change-Id: Ib8b207e1b5f81b3086595bb8ad7dc6881272def1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-09-03 20:54:36 +00:00
QTRY_VERIFY(menuItem1->isHighlighted());
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
// Now the sub-menu is open. The current behavior is that the first menu item
// in the new menu is highlighted; make sure that we choose the next item if
// the first is disabled.
QQuickMenuItem *subMenuItem1 = qobject_cast<QQuickMenuItem *>(subMenu->itemAt(0));
QVERIFY(subMenuItem1);
QQuickMenuItem *subMenuItem2 = qobject_cast<QQuickMenuItem *>(subMenu->itemAt(1));
QVERIFY(subMenuItem2);
QVERIFY(!subMenuItem1->isHighlighted());
QVERIFY(subMenuItem2->isHighlighted());
// Close all menus by clicking on the item that isn't disabled.
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, subMenuItem2->mapToScene(QPoint(1, 1)).toPoint());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(!mainMenu->isVisible());
QTRY_VERIFY(!subMenu->isVisible());
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +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::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
{
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
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);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("subMenus.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
QQuickApplicationWindow *window = helper.appWindow;
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);
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
window->show();
QVERIFY(QTest::qWaitForWindowActive(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
Fix layout is always RTL when locale is RTL isMirrored() will always return true when locale is RTL, so that we cannot change the layout. To fix this, remove out the relation between LayoutMirroring.enabled and locale's text direction. [ChangeLog][Controls][Important Behavior Changes] Control's locale property no longer affects layout direction. Use LayoutMirroring instead. Fixes: QTBUG-91227 Change-Id: Ibedd3f09828f81f1889077892452a27c90e21533 Reviewed-by: Hyunkook Khang <hyunkook.khang@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-02-23 01:51:31 +00:00
if (mirrored) {
QQmlExpression mirroringExpression(qmlContext(window), window,
"LayoutMirroring.childrenInherit = true; LayoutMirroring.enabled = true");
QVERIFY2(mirroringExpression.evaluate().isValid(), qPrintable(mirroringExpression.error().toString()));
}
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
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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(mainMenu->isOpened());
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
QVERIFY(!subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
// navigate to the sub-menu item and trigger it to open the sub-menu
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);
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);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(mainMenu->isVisible(), cascade);
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
QVERIFY(subMenu1->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(subMenu1->isOpened());
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
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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(mainMenu->isVisible(), cascade);
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
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
QTest::keyClick(window, mirrored ? Qt::Key_Left : Qt::Key_Right);
QCOMPARE(mainMenu->isVisible(), cascade);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(subMenu1->isVisible(), cascade);
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
QVERIFY(!subMenu2->isVisible());
QVERIFY(subSubMenu1->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(subSubMenu1->isOpened());
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
// 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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
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
// 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);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(!subMenu1->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
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
QTest::keyClick(window, Qt::Key_Escape);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(!mainMenu->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
QVERIFY(!subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
}
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
void tst_QQuickMenu::subMenuDisabledKeyboard_data()
{
subMenuKeyboard_data();
}
// QTBUG-69540
void tst_QQuickMenu::subMenuDisabledKeyboard()
{
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
QFETCH(bool, cascade);
QFETCH(bool, mirrored);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("subMenuDisabled.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
QQuickApplicationWindow *window = helper.appWindow;
centerOnScreen(window);
moveMouseAway(window);
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
Fix layout is always RTL when locale is RTL isMirrored() will always return true when locale is RTL, so that we cannot change the layout. To fix this, remove out the relation between LayoutMirroring.enabled and locale's text direction. [ChangeLog][Controls][Important Behavior Changes] Control's locale property no longer affects layout direction. Use LayoutMirroring instead. Fixes: QTBUG-91227 Change-Id: Ibedd3f09828f81f1889077892452a27c90e21533 Reviewed-by: Hyunkook Khang <hyunkook.khang@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-02-23 01:51:31 +00:00
if (mirrored) {
QQmlExpression mirroringExpression(qmlContext(window), window,
"LayoutMirroring.childrenInherit = true; LayoutMirroring.enabled = true");
QVERIFY2(mirroringExpression.evaluate().isValid(), qPrintable(mirroringExpression.error().toString()));
}
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>();
QVERIFY(mainMenu);
mainMenu->setCascade(cascade);
QCOMPARE(mainMenu->cascade(), cascade);
QQuickMenuItem *menuItem1 = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(0));
QVERIFY(menuItem1);
QQuickMenu *subMenu = window->property("subMenu").value<QQuickMenu *>();
QVERIFY(subMenu);
mainMenu->open();
QVERIFY(mainMenu->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(mainMenu->isOpened());
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
QVERIFY(!menuItem1->isHighlighted());
QVERIFY(!subMenu->isVisible());
// Highlight the top-level menu item.
QTest::keyClick(window, Qt::Key_Down);
QVERIFY(menuItem1->isHighlighted());
QQuickMenuItem *subMenuItem1 = qobject_cast<QQuickMenuItem *>(subMenu->itemAt(0));
QVERIFY(subMenuItem1);
QQuickMenuItem *subMenuItem2 = qobject_cast<QQuickMenuItem *>(subMenu->itemAt(1));
QVERIFY(subMenuItem2);
// Open the sub-menu.
QTest::keyClick(window, mirrored ? Qt::Key_Left : Qt::Key_Right);
// The first sub-menu item is disabled, so it should highlight the second one.
QVERIFY(!subMenuItem1->isHighlighted());
QVERIFY(subMenuItem2->isHighlighted());
// Close the menus with escape.
QTest::keyClick(window, Qt::Key_Escape);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(mainMenu->isVisible(), cascade);
QTRY_VERIFY(!subMenu->isVisible());
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
QTest::keyClick(window, Qt::Key_Escape);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(!mainMenu->isVisible());
Menu: fix disabled sub-menu items being highlighted When a menu item with a sub-menu was triggered by key or mouse, it would open the sub-menu with the first menu item highlighted. This doesn't make sense for disabled menu items, so this patch makes it find the first enabled item. Change-Id: I9df1c750749e5a77b027b6f476b8ae1f5ea035bd Fixes: QTBUG-69540 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-01-28 12:14:30 +00:00
QVERIFY(!subMenu->isVisible());
}
Fix tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
/*
QCOMPARE() compares doubles with 1-in-1e12 precision, which is too fine for these tests.
Casting to floats, compared with 1-in-1e5 precision, gives more robust results.
*/
#define FLOAT_EQ(u, v) QCOMPARE(float(u), float(v))
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);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("subMenus.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
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
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
// Ensure that the default size of the window fits three menus side by side.
QQuickMenu *mainMenu = window->property("mainMenu").value<QQuickMenu *>();
QVERIFY(mainMenu);
window->setWidth(mainMenu->width() * 3 + mainMenu->leftMargin() + mainMenu->rightMargin());
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)
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
window->setWidth(window->width() - mainMenu->width());
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
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);
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#ifndef Q_OS_ANDROID
Fix Flaky tests These tests where failing sometimes in our CI, because centerOnScreen() was invoked which asks the window manager to move the window, but does not wait for the event's completion. The solution is to do all that *before* the initial qWaitForWindowActive(). Fixes: QTBUG-73128 Change-Id: I06c1f85d5ff9657dccab50f29084f7624cd7e194 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2019-07-18 17:02:40 +00:00
window->show();
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#else
// On Android the desired size does not fit into the screen, so we just
// call showNormal. This will make the window larger than the screen, but
// all the geometry calculations will be correct. Otherwise we'll get
// unpredictable results
window->showNormal();
#endif
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(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
Fix layout is always RTL when locale is RTL isMirrored() will always return true when locale is RTL, so that we cannot change the layout. To fix this, remove out the relation between LayoutMirroring.enabled and locale's text direction. [ChangeLog][Controls][Important Behavior Changes] Control's locale property no longer affects layout direction. Use LayoutMirroring instead. Fixes: QTBUG-91227 Change-Id: Ibedd3f09828f81f1889077892452a27c90e21533 Reviewed-by: Hyunkook Khang <hyunkook.khang@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-02-23 01:51:31 +00:00
if (mirrored) {
QQmlExpression mirroringExpression(qmlContext(window), window,
"LayoutMirroring.childrenInherit = true; LayoutMirroring.enabled = true");
QVERIFY2(mirroringExpression.evaluate().isValid(), qPrintable(mirroringExpression.error().toString()));
}
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->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)
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
mainMenu->setX(window->width() - mainMenu->width());
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());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(mainMenu->isOpened());
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
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();
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(mainMenu->isVisible(), cascade);
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
QVERIFY(subMenu1->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(subMenu1->isOpened());
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
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
if (cascade) {
QCOMPARE(subMenu1->parentItem(), subMenu1Item);
// vertically aligned to the parent menu item
Fix tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
// We cast to float here because we want to use its larger tolerance for equality (because it has less precision than double).
FLOAT_EQ(subMenu1->popupItem()->y(), mainMenu->popupItem()->y() + subMenu1Item->y());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
if (mirrored) {
// on the left of the parent menu
Fix tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
FLOAT_EQ(subMenu1->popupItem()->x(), mainMenu->popupItem()->x() - subMenu1->width() + overlap);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
} else {
// on the right of the parent menu
Fix tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
FLOAT_EQ(subMenu1->popupItem()->x(), mainMenu->popupItem()->x() + mainMenu->width() - overlap);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
}
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
} else {
QCOMPARE(subMenu1->parentItem(), mainMenu->parentItem());
// centered over the parent menu
Fix tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
FLOAT_EQ(subMenu1->popupItem()->x(), mainMenu->popupItem()->x() + (mainMenu->width() - subMenu1->width()) / 2);
FLOAT_EQ(subMenu1->popupItem()->y(), mainMenu->popupItem()->y() + (mainMenu->height() - subMenu1->height()) / 2);
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
}
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();
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_COMPARE(mainMenu->isVisible(), cascade);
QTRY_COMPARE(subMenu1->isVisible(), cascade);
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
QVERIFY(!subMenu2->isVisible());
QVERIFY(subSubMenu1->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(subSubMenu1->isOpened());
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 (cascade) {
QCOMPARE(subSubMenu1->parentItem(), subSubMenu1Item);
// vertically aligned to the parent menu item
Fix tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
FLOAT_EQ(subSubMenu1->popupItem()->y(), subMenu1->popupItem()->y() + subSubMenu1Item->y());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
if (mirrored != flip) {
// on the left of the parent menu
Fix tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
FLOAT_EQ(subSubMenu1->popupItem()->x(), subMenu1->popupItem()->x() - subSubMenu1->width() + overlap);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
} else {
// on the right of the parent menu
Fix tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
FLOAT_EQ(subSubMenu1->popupItem()->x(), subMenu1->popupItem()->x() + subMenu1->width() - overlap);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
}
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
} else {
QCOMPARE(subSubMenu1->parentItem(), subMenu1->parentItem());
// centered over the parent menu
Fix tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
FLOAT_EQ(subSubMenu1->popupItem()->x(), subMenu1->popupItem()->x() + (subMenu1->width() - subSubMenu1->width()) / 2);
FLOAT_EQ(subSubMenu1->popupItem()->y(), subMenu1->popupItem()->y() + (subMenu1->height() - subSubMenu1->height()) / 2);
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 tst_QQuickMenu::subMenuPosition() We're still getting failures after QCOMPARE was fixed (in c78a960198d59fb9a9ddd83ad7098b1db396edfd): FAIL! : tst_QQuickMenu::Material::subMenuPosition(cascading,flip) Compared doubles are not the same (fuzzy compare) Actual (subSubMenu1->popupItem()->x()) : 3.88240550819e-11 Expected (subMenu1->popupItem()->x() - subSubMenu1->width() + overlap): 0 tst_qquickmenu.cpp(1532) : failure location Quoting Eddy: "[...] the threshold for double equality is one part in 1e12; the threshold for fuzzy-is-zero is likewise 1e-12; so 3e-11 is non-zero. One work-around, of course, would be to cast float(each operand) so as to get float's wider tolerance (one part in 100,000, null if less than 1e-5)." So that's what we do in this patch. Change-Id: Iecf1b6f4b2cf2c81eb652bb0f565ac682b024dae Pick-to: 5.15 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-07-14 12:18:29 +00:00
#undef FLOAT_EQ
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
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("subMenus.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
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
QQuickWindow *window = helper.window;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
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
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());
}
Menu: fix items not being scrollable when using Window Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-06-18 09:38:40 +00:00
void tst_QQuickMenu::scrollable_data()
{
QTest::addColumn<QString>("qmlFilePath");
QTest::addRow("Window") << QString::fromLatin1("windowScrollable.qml");
QTest::addRow("ApplicationWindow") << QString::fromLatin1("applicationWindowScrollable.qml");
Account for the padding around a menu when checking if it is interactive If there is padding around the menu then it will mean the available height is smaller than the containing item and as such should be interactive. Fixes: QTBUG-82473 Change-Id: Ie3e7568ab66aa3da93e5448c1a27c9bd2a5e486a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-03-17 19:19:41 +00:00
QTest::addRow("WithPadding") << QString::fromLatin1("scrollableWithPadding.qml");
Menu: fix items not being scrollable when using Window Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-06-18 09:38:40 +00:00
}
void tst_QQuickMenu::scrollable()
{
QFETCH(QString, qmlFilePath);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, qmlFilePath);
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
Menu: fix items not being scrollable when using Window Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-06-18 09:38:40 +00:00
QQuickWindow *window = helper.window;
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#ifndef Q_OS_ANDROID
Menu: fix items not being scrollable when using Window Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-06-18 09:38:40 +00:00
window->show();
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#else
window->showNormal();
#endif
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
Menu: fix items not being scrollable when using Window Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-06-18 09:38:40 +00:00
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
menu->open();
QVERIFY(menu->isVisible());
QQuickItem *contentItem = menu->contentItem();
QCOMPARE(contentItem->property("interactive").toBool(), true);
}
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
void tst_QQuickMenu::disableWhenTriggered_data()
{
QTest::addColumn<int>("menuItemIndex");
QTest::addColumn<int>("subMenuItemIndex");
QTest::addRow("Action") << 0 << -1;
QTest::addRow("MenuItem with Action") << 1 << -1;
QTest::addRow("MenuItem with Action declared outside menu") << 2 << -1;
QTest::addRow("MenuItem with no Action") << 3 << -1;
QTest::addRow("Sub-Action") << 4 << 0;
QTest::addRow("Sub-MenuItem with Action declared inside") << 4 << 1;
QTest::addRow("Sub-MenuItem with Action declared outside menu") << 4 << 2;
QTest::addRow("Sub-MenuItem with no Action") << 4 << 3;
}
// Tests that the menu is dismissed when a menu item sets "enabled = false" in onTriggered().
void tst_QQuickMenu::disableWhenTriggered()
{
if ((QGuiApplication::platformName() == QLatin1String("offscreen"))
|| (QGuiApplication::platformName() == QLatin1String("minimal")))
QSKIP("Mouse hovering not functional on offscreen/minimal platforms");
QFETCH(int, menuItemIndex);
QFETCH(int, subMenuItemIndex);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("disableWhenTriggered.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
QQuickWindow *window = helper.window;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
QQuickMenu *menu = window->findChild<QQuickMenu*>("Menu");
QVERIFY(menu);
menu->open();
QVERIFY(menu->isVisible());
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(menu->isOpened());
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
QPointer<QQuickMenuItem> menuItem = qobject_cast<QQuickMenuItem*>(menu->itemAt(menuItemIndex));
QVERIFY(menuItem);
if (subMenuItemIndex == -1) {
// Click a top-level menu item.
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
menuItem->mapToScene(QPointF(menuItem->width() / 2, menuItem->height() / 2)).toPoint());
QCOMPARE(menuItem->isEnabled(), false);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(!menu->isVisible());
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
} else {
// Click a sub-menu item.
QPointer<QQuickMenu> subMenu = menuItem->subMenu();
QVERIFY(subMenu);
QPointer<QQuickMenuItem> subMenuItem = qobject_cast<QQuickMenuItem*>(subMenu->itemAt(subMenuItemIndex));
QVERIFY(subMenuItem);
// First, open the sub-menu.
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#ifndef Q_OS_ANDROID
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
QTest::mouseMove(window, menuItem->mapToScene(QPoint(1, 1)).toPoint());
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#else
// On Android mouseHover does not open sub-menu, so just click on it
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
menuItem->mapToScene(QPointF(menuItem->width() / 2, menuItem->height() / 2)).toPoint());
#endif
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
QTRY_VERIFY(subMenu->isVisible());
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#ifndef Q_OS_ANDROID
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
QVERIFY(menuItem->isHovered());
QTRY_VERIFY(subMenu->contentItem()->property("contentHeight").toReal() > 0.0);
Android: fix tst_QQuickMenu There were several reasons for the test failures: - Difference in default behavior on Android and Desktop systems. On Android the menus are not cascading by default, so some tests failed because they were expecting cascading menus. That is fixed by explicitly specifying cascade flag in QML files. - Mouse hovering does not open/close sub-menus on Android, because Android has no cursor support. So parts of the tests that rely on this behavior are simply skipped. Same for the parts of the tests that try to explicitly set cursor position. - Some of the tests expect certain window size. On Android calling QQuickWindow::show() shows the window fullscreen, which can be larger or smaller than an expected size. As a result the tests fail because various assumptions are broken. That is fixed by using showNormal(), which shows the window with the desired size. This makes little sense in real applications, because it can result in some information being "hidden" behind the screen border, but seems to be fine for tests. - The previously skipped tst_QQuickMenu::disableWhenTriggered() is now enabled, because it does not crash and needed just some minor adjustments. Fixes: QTBUG-100256 Pick-to: 6.3 6.2 Change-Id: I53832f52071d5c2495a97058a968775d3f89598e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-04-22 15:01:14 +00:00
#endif
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
// Click the item.
QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
subMenuItem->mapToScene(QPointF(subMenuItem->width() / 2, subMenuItem->height() / 2)).toPoint());
QCOMPARE(subMenuItem->isEnabled(), false);
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTRY_VERIFY(!menu->isVisible());
Fix Menu not being dismissed when the triggered item disables itself Problem Consider the following code: Menu { title: "Menu" Action { text: "Item" onTriggered: enabled = false } } A MenuItem (AbstractButton) is created for the Action, and when it is clicked, this function is called: void QQuickAbstractButtonPrivate::trigger() { Q_Q(QQuickAbstractButton); if (action && action->isEnabled()) QQuickActionPrivate::get(action)->trigger(q, false); else if (effectiveEnable) emit q->clicked(); } QQuickActionPrivate::get(action)->trigger(q, false) results in this function being called: void QQuickAbstractButtonPrivate::click() { Q_Q(QQuickAbstractButton); if (effectiveEnable) emit q->clicked(); } Since the action (and hence the menu item) was disabled in the signal handler, the effectiveEnable check fails and clicked() is not emitted. This causes the menu to not be dismissed. Solution Before calling QQuickActionPrivate::get(action)->trigger(), store the button's enabled state. If triggering the action causes the action to be disabled (due to the signal handler), we can then choose whether or not we emit QQuickAbstractButton::clicked(). Specifically, we emit clicked() if: - we were enabled before triggering the action, and - we have no associated action, or it's no longer enabled Task-number: QTBUG-69682 Change-Id: Ib4e3c313b776decc74089a6beffe415605c430be Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2018-07-30 12:28:44 +00:00
}
}
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
void tst_QQuickMenu::menuItemWidth_data()
{
QTest::addColumn<bool>("mirrored");
QTest::newRow("non-mirrored") << false;
QTest::newRow("mirrored") << true;
}
void tst_QQuickMenu::menuItemWidth()
{
QFETCH(bool, mirrored);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("menuItemWidths.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
QQuickApplicationWindow *window = helper.appWindow;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
Fix layout is always RTL when locale is RTL isMirrored() will always return true when locale is RTL, so that we cannot change the layout. To fix this, remove out the relation between LayoutMirroring.enabled and locale's text direction. [ChangeLog][Controls][Important Behavior Changes] Control's locale property no longer affects layout direction. Use LayoutMirroring instead. Fixes: QTBUG-91227 Change-Id: Ibedd3f09828f81f1889077892452a27c90e21533 Reviewed-by: Hyunkook Khang <hyunkook.khang@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-02-23 01:51:31 +00:00
if (mirrored) {
QQmlExpression mirroringExpression(qmlContext(window), window,
"LayoutMirroring.childrenInherit = true; LayoutMirroring.enabled = true");
QVERIFY2(mirroringExpression.evaluate().isValid(), qPrintable(mirroringExpression.error().toString()));
}
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QVERIFY(menu);
menu->open();
QTRY_VERIFY(menu->isOpened());
for (int i = 0; i < menu->count(); ++i)
QCOMPARE(menu->itemAt(i)->width(), menu->availableWidth());
}
void tst_QQuickMenu::menuItemWidthAfterMenuWidthChanged_data()
{
QTest::addColumn<bool>("mirrored");
QTest::newRow("non-mirrored") << false;
QTest::newRow("mirrored") << true;
}
void tst_QQuickMenu::menuItemWidthAfterMenuWidthChanged()
{
QFETCH(bool, mirrored);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("menuItemWidths.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
QQuickApplicationWindow *window = helper.appWindow;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
Fix layout is always RTL when locale is RTL isMirrored() will always return true when locale is RTL, so that we cannot change the layout. To fix this, remove out the relation between LayoutMirroring.enabled and locale's text direction. [ChangeLog][Controls][Important Behavior Changes] Control's locale property no longer affects layout direction. Use LayoutMirroring instead. Fixes: QTBUG-91227 Change-Id: Ibedd3f09828f81f1889077892452a27c90e21533 Reviewed-by: Hyunkook Khang <hyunkook.khang@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-02-23 01:51:31 +00:00
if (mirrored) {
QQmlExpression mirroringExpression(qmlContext(window), window,
"LayoutMirroring.childrenInherit = true; LayoutMirroring.enabled = true");
QVERIFY2(mirroringExpression.evaluate().isValid(), qPrintable(mirroringExpression.error().toString()));
}
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QVERIFY(menu);
menu->open();
QTRY_VERIFY(menu->isOpened());
for (int i = 0; i < menu->count(); ++i) {
// Check that the width of menu items is correct before we resize the menu.
const QQuickItem *item = menu->itemAt(i);
QVERIFY2(qFuzzyCompare(item->width(), menu->availableWidth()),
qPrintable(QString::fromLatin1("Expected width of %1 to be %2, but it's %3")
.arg(item->objectName()).arg(menu->availableWidth()).arg(item->width())));
}
menu->setWidth(menu->width() + 10);
// Check that the width of menu items is correct after we resize the menu.
for (int i = 0; i < menu->count(); ++i) {
// Check that the width of menu items is correct after we resize the menu.
const QQuickItem *item = menu->itemAt(i);
QVERIFY2(qFuzzyCompare(item->width(), menu->availableWidth()),
qPrintable(QString::fromLatin1("Expected width of %1 to be %2, but it's %3")
.arg(item->objectName()).arg(menu->availableWidth()).arg(item->width())));
}
}
void tst_QQuickMenu::menuItemWidthAfterImplicitWidthChanged_data()
{
QTest::addColumn<bool>("mirrored");
QTest::newRow("non-mirrored") << false;
QTest::newRow("mirrored") << true;
}
void tst_QQuickMenu::menuItemWidthAfterImplicitWidthChanged()
{
QFETCH(bool, mirrored);
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("menuItemWidths.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
QQuickApplicationWindow *window = helper.appWindow;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
Fix layout is always RTL when locale is RTL isMirrored() will always return true when locale is RTL, so that we cannot change the layout. To fix this, remove out the relation between LayoutMirroring.enabled and locale's text direction. [ChangeLog][Controls][Important Behavior Changes] Control's locale property no longer affects layout direction. Use LayoutMirroring instead. Fixes: QTBUG-91227 Change-Id: Ibedd3f09828f81f1889077892452a27c90e21533 Reviewed-by: Hyunkook Khang <hyunkook.khang@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2021-02-23 01:51:31 +00:00
if (mirrored) {
QQmlExpression mirroringExpression(qmlContext(window), window,
"LayoutMirroring.childrenInherit = true; LayoutMirroring.enabled = true");
QVERIFY2(mirroringExpression.evaluate().isValid(), qPrintable(mirroringExpression.error().toString()));
}
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QVERIFY(menu);
menu->open();
QTRY_VERIFY(menu->isOpened());
// Check that the width of the menu item is correct before we change its font size.
QQuickMenuItem *menuItem = qobject_cast<QQuickMenuItem*>(menu->itemAt(0));
QCOMPARE(menuItem->width(), menu->availableWidth());
// Add some text to increase the implicitWidth of the MenuItem.
const qreal oldImplicitWidth = menuItem->implicitWidth();
for (int i = 0; menuItem->implicitWidth() <= oldImplicitWidth; ++i) {
menuItem->setText(menuItem->text() + QLatin1String("---"));
if (i == 100)
QFAIL("Shouldn't need 100 iterations to increase MenuItem's implicitWidth; something is wrong here");
}
// Check that the width of the menu item is correct after we change its font size.
QCOMPARE(menuItem->width(), menu->availableWidth());
}
void tst_QQuickMenu::menuItemWidthAfterRetranslate()
{
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("menuItemWidths.qml"));
QQuickApplicationHelper: don't use QTest macros outside test functions This has no effect. Task-number: QTBUG-66320 Pick-to: 5.15 5.12 Change-Id: Ie6efb26243178c4044ac0bc721c21ad89769c982 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-06-05 08:28:16 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
QQuickApplicationWindow *window = helper.appWindow;
window->show();
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
QVERIFY(QTest::qWaitForWindowExposed(window));
Fix MenuItem width not matching Menu's available width Short version: There are currently two problems with MenuItems: - Mirrored MenuItems don't fill the Menu's available width. - MenuItem does not fill the Menu's available width when changed after Component completion. This patch fixes both of them by listening to geometry changes in both the contentItem and individual menu items, and setting the explicit width of those menu items when either changes. Longer version: The first problem can be seen whenever the MenuItem's implicitWidth changes: - QQmlEngine::retranslate() is called, causing all bindings to be re-evaluated - The MenuItem's font size changes - The MenuItem's icon size changes - etc. We fix this by making Menu listen to the width of each of its MenuItems and call resizeItem() if it doesn't have an explicit width. The second problem can be seen when e.g. resizing a Menu to account for new items that are wider and hence require more space. This can be fixed by listening to width changes in Menu's contentItem, which was actually done in earlier versions but (probably accidentally) removed in 482ecb0f. I had tried to solve both issues by setting the explicit width of MenuItem to the width of its Menu, or undefined if it has none (which means it reverts to its implicit width). However, this does not account for e.g. MenuSeparator and custom items that can be added to Menu - they should also have their width fill the Menu automatically if they don't have an explicit width set. Change-Id: I95dd0da0919a1e297f2e2030da746ff1f1a17644 Fixes: QTBUG-75051 Fixes: QTBUG-75142 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-12 13:21:42 +00:00
QQuickMenu *menu = window->property("menu").value<QQuickMenu *>();
QVERIFY(menu);
menu->open();
QTRY_VERIFY(menu->isOpened());
for (int i = 0; i < menu->count(); ++i) {
// Check that the width of each menu item is correct before we retranslate.
const QQuickItem *item = menu->itemAt(i);
QVERIFY2(qFuzzyCompare(item->width(), menu->availableWidth()),
qPrintable(QString::fromLatin1("Expected width of %1 to be %2, but it's %3")
.arg(item->objectName()).arg(menu->availableWidth()).arg(item->width())));
}
// Call retranslate() and cause all bindings to be re-evaluated.
helper.engine.retranslate();
for (int i = 0; i < menu->count(); ++i) {
// Check that the width of each menu item is correct after we retranslate.
const QQuickItem *item = menu->itemAt(i);
QVERIFY2(qFuzzyCompare(item->width(), menu->availableWidth()),
qPrintable(QString::fromLatin1("Expected width of %1 to be %2, but it's %3")
.arg(item->objectName()).arg(menu->availableWidth()).arg(item->width())));
}
}
QQuickAbstractButton: don't accept key release if we're not pressed A control should have been pressed if it's going to accept a release. This prevents an issue where a menu opened by pressing enter (handled via attached Keys property) would instantly trigger the first menu item. Pick-to: 5.15 5.12 Fixes: QTBUG-83698 Change-Id: I6b1afbb76f37623012472b2b1148b4862c159239 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-10-20 08:34:53 +00:00
void tst_QQuickMenu::giveMenuItemFocusOnButtonPress()
{
Fix window activation usage in QQuickMenu(Bar) - Skip tests that depend on programmatic window activation on platforms where this is not supported, such as Wayland. - Change tests that don't rely on the window being activated to use qWaitForWindowExposed() instead. Pick-to: 6.2 6.3 6.4 Fixes: QTBUG-104257 Change-Id: If99721a223b328869af86fddf6565002a19e987a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 10:39:41 +00:00
if (!hasWindowActivation())
QSKIP("Window activation is not supported");
Consolidate test helpers into private libraries Previously each test would include and build sources from the shared folder. Now we make those sources a library, build it once, then have each test link to it instead. We also take the opportunity to move some helpers that qtquickcontrols2 had added into the quicktestutils library where it makes sense, and for the helpers that don't make sense to be there, move them into quickcontrolstestutils. We add the libraries to src/ so that they are internal modules built as part of Qt, rather than tests. That way we can use them in a standalone test outside of qtdeclarative. Task-number: QTBUG-95621 Pick-to: 6.2 Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-08-06 10:27:35 +00:00
QQuickControlsApplicationHelper helper(this, QLatin1String("giveMenuItemFocusOnButtonPress.qml"));
QQuickAbstractButton: don't accept key release if we're not pressed A control should have been pressed if it's going to accept a release. This prevents an issue where a menu opened by pressing enter (handled via attached Keys property) would instantly trigger the first menu item. Pick-to: 5.15 5.12 Fixes: QTBUG-83698 Change-Id: I6b1afbb76f37623012472b2b1148b4862c159239 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2020-10-20 08:34:53 +00:00
QVERIFY2(helper.ready, helper.failureMessage());
QQuickApplicationWindow *window = helper.appWindow;
window->show();
QVERIFY(QTest::qWaitForWindowActive(window));
// Press enter on the button to open the menu.
QQuickButton *menuButton = window->property("menuButton").value<QQuickButton*>();
QVERIFY(menuButton);
menuButton->forceActiveFocus();
QVERIFY(menuButton->hasActiveFocus());
QSignalSpy clickedSpy(window, SIGNAL(menuButtonClicked()));
QVERIFY(clickedSpy.isValid());
QTest::keyClick(window, Qt::Key_Return);
QCOMPARE(clickedSpy.count(), 1);
// The menu should still be open.
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QVERIFY(menu);
QTRY_VERIFY(menu->isOpened());
}
Menu: cull non-visible items when `contentItem` inherits Item For a custom menu control, when the contentItem does not inherit from ItemView, the text overlaps. A related bug is QTBUG-53262, but this problem is only fixed for the ItemView control. Since the contentItem control can accept the Item control, I think the repair only for ItemView has limitations. Therefore, this submission cancels the restriction on the type of contentitem. Pick-to: 6.3 6.4 Fixes: QTBUG-104470 Change-Id: I7e697e3cb993475d157a92f37d9512e4a9872387 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-21 03:10:00 +00:00
void tst_QQuickMenu::customMenuCullItems()
{
QQuickControlsApplicationHelper helper(this, QLatin1String("customMenuCullItems.qml"));
QVERIFY2(helper.ready, helper.failureMessage());
QQuickApplicationWindow *window = helper.appWindow;
window->show();
QVERIFY(QTest::qWaitForWindowExposed(window));
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QVERIFY(menu);
menu->open();
QTRY_VERIFY(menu->isOpened());
QQuickItem *menuItemFirst = menu->itemAt(0);
QQuickItem *menuItemLast = menu->itemAt(menu->count() - 1);
QVERIFY(menuItemFirst);
QVERIFY(menuItemLast);
QTRY_VERIFY(!QQuickItemPrivate::get(menuItemFirst)->culled);
QTRY_VERIFY(QQuickItemPrivate::get(menuItemLast)->culled);
}
Repeater: uncull items that come from ObjectModel After 6173fc0e4be93604286b9a424f1aa3ff5896082a, Menu will unconditionally cull items as they are inserted. This behavior relies on the fact that ListView will uncull the items as necessary. However, when implementing Menu with a Repeater as the contentItem (which is unusual but not unreasonable), the items will never be unculled and hence will be invisible. We can't fix this in Menu by checking its contentItem, because when items are inserted, their parent item is the root contentItem, not the Repeater, and there's no nice, efficient way to check if the item belongs to a Repeater. This patch fixes the issue in Repeater by unculling the item if it came from an ObjectModel. Done-with: Mitch Curtis <mitch.curtis@qt.io> Pick-to: 6.3 6.4 Fixes: QTBUG-104544 Change-Id: Ib37d2d49d3608156a3f1e3652b63ccdd5dfd0f41 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2022-06-24 02:38:51 +00:00
void tst_QQuickMenu::customMenuUseRepeaterAsTheContentItem()
{
QQuickControlsApplicationHelper helper(this, QLatin1String("customMenuUseRepeaterAsTheContentItem.qml"));
QVERIFY2(helper.ready, helper.failureMessage());
QQuickApplicationWindow *window = helper.appWindow;
window->show();
QVERIFY(QTest::qWaitForWindowExposed(window));
QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
QVERIFY(menu);
menu->open();
QTRY_VERIFY(menu->isVisible());
QQuickItem *menuItemFirst = menu->itemAt(0);
QQuickItem *menuItemLast = menu->itemAt(menu->count() - 1);
QTRY_VERIFY(!QQuickItemPrivate::get(menuItemFirst)->culled);
QTRY_VERIFY(!QQuickItemPrivate::get(menuItemLast)->culled);
}
Make tst_qquickmenu run with all styles This is a prerequisite for ensuring that an Imagine-style-specific fix works. Fixes: QTBUG-75141 Change-Id: Iafef3bf947151cb35b88a1230e3541d8e4e15fd9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
2019-04-29 11:03:25 +00:00
QTEST_QUICKCONTROLS_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"