diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2018-06-18 11:38:40 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-06-25 13:51:16 +0000 |
commit | 38f8d09676717035382629f877d2e68ce5c54b83 (patch) | |
tree | 911008ee366fca4261ad1809efed97f723bdbe7a | |
parent | 020b80eef2c3c1175d33fa24cf154c5de54c87d7 (diff) |
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>
-rw-r--r-- | src/imports/controls/Menu.qml | 4 | ||||
-rw-r--r-- | src/imports/controls/fusion/Menu.qml | 4 | ||||
-rw-r--r-- | src/imports/controls/imagine/Menu.qml | 4 | ||||
-rw-r--r-- | src/imports/controls/material/Menu.qml | 4 | ||||
-rw-r--r-- | src/imports/controls/universal/Menu.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/applicationWindowScrollable.qml | 73 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/windowScrollable.qml | 74 | ||||
-rw-r--r-- | tests/auto/qquickmenu/tst_qquickmenu.cpp | 27 |
8 files changed, 184 insertions, 10 deletions
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml index deadc274..0545b9a1 100644 --- a/src/imports/controls/Menu.qml +++ b/src/imports/controls/Menu.qml @@ -38,6 +38,7 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Controls.impl 2.4 import QtQuick.Templates 2.4 as T +import QtQuick.Window 2.11 T.Menu { id: control @@ -55,8 +56,7 @@ T.Menu { contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex diff --git a/src/imports/controls/fusion/Menu.qml b/src/imports/controls/fusion/Menu.qml index dc8e2eb2..3c9d98a2 100644 --- a/src/imports/controls/fusion/Menu.qml +++ b/src/imports/controls/fusion/Menu.qml @@ -40,6 +40,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.impl 2.4 import QtQuick.Controls.Fusion 2.4 import QtQuick.Controls.Fusion.impl 2.4 +import QtQuick.Window 2.11 T.Menu { id: control @@ -58,8 +59,7 @@ T.Menu { contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml index 83953d05..74dc09de 100644 --- a/src/imports/controls/imagine/Menu.qml +++ b/src/imports/controls/imagine/Menu.qml @@ -39,6 +39,7 @@ import QtQuick.Controls 2.4 import QtQuick.Templates 2.4 as T import QtQuick.Controls.Imagine 2.4 import QtQuick.Controls.Imagine.impl 2.4 +import QtQuick.Window 2.11 T.Menu { id: control @@ -63,8 +64,7 @@ T.Menu { contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: T.ApplicationWindow.window ? contentHeight > T.ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 0f40380c..206ebd75 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -39,6 +39,7 @@ import QtQuick.Controls 2.4 import QtQuick.Templates 2.4 as T import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material.impl 2.4 +import QtQuick.Window 2.11 T.Menu { id: control @@ -74,8 +75,7 @@ T.Menu { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 36241f3a..ba998827 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -38,6 +38,7 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Templates 2.4 as T import QtQuick.Controls.Universal 2.4 +import QtQuick.Window 2.11 T.Menu { id: control @@ -55,8 +56,7 @@ T.Menu { contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex diff --git a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml new file mode 100644 index 00000000..1814356c --- /dev/null +++ b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.11 +import QtQuick.Controls 2.4 + +ApplicationWindow { + title: "Test Application Window" + width: 300 + height: 300 + + property alias menu: menu + + Menu { + id: menu + + Repeater { + model: 20 + + delegate: MenuItem { + objectName: text + text: (index + 1) + } + } + } +} diff --git a/tests/auto/qquickmenu/data/windowScrollable.qml b/tests/auto/qquickmenu/data/windowScrollable.qml new file mode 100644 index 00000000..d21289d3 --- /dev/null +++ b/tests/auto/qquickmenu/data/windowScrollable.qml @@ -0,0 +1,74 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.11 +import QtQuick.Controls 2.4 +import QtQuick.Window 2.11 + +Window { + title: "Test Window" + width: 300 + height: 300 + + property alias menu: menu + + Menu { + id: menu + + Repeater { + model: 20 + + delegate: MenuItem { + objectName: text + text: (index + 1) + } + } + } +} diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 1202072b..5a676c03 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -84,6 +84,8 @@ private slots: void subMenuPosition_data(); void subMenuPosition(); void addRemoveSubMenus(); + void scrollable_data(); + void scrollable(); }; void tst_QQuickMenu::defaults() @@ -1309,6 +1311,31 @@ void tst_QQuickMenu::addRemoveSubMenus() QVERIFY(subSubMenu1Item.isNull()); } +void tst_QQuickMenu::scrollable_data() +{ + QTest::addColumn<QString>("qmlFilePath"); + + QTest::addRow("Window") << QString::fromLatin1("windowScrollable.qml"); + QTest::addRow("ApplicationWindow") << QString::fromLatin1("applicationWindowScrollable.qml"); +} + +void tst_QQuickMenu::scrollable() +{ + QFETCH(QString, qmlFilePath); + + QQuickApplicationHelper helper(this, qmlFilePath); + QQuickWindow *window = helper.window; + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); + + QQuickMenu *menu = window->property("menu").value<QQuickMenu*>(); + menu->open(); + QVERIFY(menu->isVisible()); + + QQuickItem *contentItem = menu->contentItem(); + QCOMPARE(contentItem->property("interactive").toBool(), true); +} + QTEST_MAIN(tst_QQuickMenu) #include "tst_qquickmenu.moc" |