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>

2 files changed, 118 insertions, 0 deletions

diff --git a/tests/auto/menu/data/menuSeparator.qml b/tests/auto/menu/data/menuSeparator.qml
new file mode 100644
index 00000000..913e8e98
--- /dev/null
+++ b/tests/auto/menu/data/menuSeparator.qml
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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.6
+import QtQuick.Controls 2.1
+
+ApplicationWindow {
+    width: 200
+    height: 200
+
+    property alias menu: menu
+
+    MenuItem {
+        id: newMenuItem
+        text: qsTr("New")
+    }
+
+    MenuSeparator {
+        id: menuSeparator
+    }
+
+    MenuItem {
+        id: saveMenuItem
+        text: qsTr("Save")
+    }
+
+    Menu {
+        id: menu
+
+        Component.onCompleted: {
+            addItem(newMenuItem)
+            addItem(menuSeparator)
+            addItem(saveMenuItem)
+        }
+    }
+}
diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/menu/tst_menu.cpp
index dc9c296a..28882f04 100644
--- a/tests/auto/menu/tst_menu.cpp
+++ b/tests/auto/menu/tst_menu.cpp
@@ -50,6 +50,7 @@
 #include <QtQuickTemplates2/private/qquickbutton_p.h>
 #include <QtQuickTemplates2/private/qquickmenu_p.h>
 #include <QtQuickTemplates2/private/qquickmenuitem_p.h>
+#include <QtQuickTemplates2/private/qquickmenuseparator_p.h>
 
 using namespace QQuickVisualTestUtil;
 
@@ -65,6 +66,7 @@ private slots:
     void contextMenuKeyboard();
     void menuButton();
     void addItem();
+    void menuSeparator();
 };
 
 void tst_menu::defaults()
@@ -272,6 +274,49 @@ void tst_menu::addItem()
     QTRY_VERIFY(!menu->isVisible());
 }
 
+void tst_menu::menuSeparator()
+{
+    QQuickApplicationHelper helper(this, QLatin1String("menuSeparator.qml"));
+    QQuickApplicationWindow *window = helper.window;
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window));
+
+    QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
+    QVERIFY(menu);
+    menu->open();
+    QVERIFY(menu->isVisible());
+
+    QQuickMenuItem *newMenuItem = qobject_cast<QQuickMenuItem*>(menu->itemAt(0));
+    QVERIFY(newMenuItem);
+    QCOMPARE(newMenuItem->text(), QStringLiteral("New"));
+
+    QQuickMenuSeparator *menuSeparator = qobject_cast<QQuickMenuSeparator*>(menu->itemAt(1));
+    QVERIFY(menuSeparator);
+
+    QQuickMenuItem *saveMenuItem = qobject_cast<QQuickMenuItem*>(menu->itemAt(2));
+    QVERIFY(saveMenuItem);
+    QCOMPARE(saveMenuItem->text(), QStringLiteral("Save"));
+    QTRY_VERIFY(!QQuickItemPrivate::get(saveMenuItem)->culled); // QTBUG-53262
+
+    // Clicking on items should still close the menu.
+    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
+        newMenuItem->mapToScene(QPointF(newMenuItem->width() / 2, newMenuItem->height() / 2)).toPoint());
+    QTRY_VERIFY(!menu->isVisible());
+
+    menu->open();
+    QVERIFY(menu->isVisible());
+
+    // Clicking on a separator shouldn't close the menu.
+    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
+        menuSeparator->mapToScene(QPointF(menuSeparator->width() / 2, menuSeparator->height() / 2)).toPoint());
+    QVERIFY(menu->isVisible());
+
+    // Clicking on items should still close the menu.
+    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
+        saveMenuItem->mapToScene(QPointF(saveMenuItem->width() / 2, saveMenuItem->height() / 2)).toPoint());
+    QTRY_VERIFY(!menu->isVisible());
+}
+
 QTEST_MAIN(tst_menu)
 
 #include "tst_menu.moc"