From 19e7fb3911c2032d2bdf05e2d37da0a0967d419a Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Wed, 30 Aug 2017 11:28:17 +0200
Subject: Add ApplicationWindow::menuBar

A follow-up commit to 66faa149.

Change-Id: I94c92752d54ae0ca4878da72915b3d83461a4124
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 tests/auto/applicationwindow/data/layout.qml           |  3 ++-
 tests/auto/applicationwindow/tst_applicationwindow.cpp | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/applicationwindow/data/layout.qml b/tests/auto/applicationwindow/data/layout.qml
index a80b2d48..5bcffdf1 100644
--- a/tests/auto/applicationwindow/data/layout.qml
+++ b/tests/auto/applicationwindow/data/layout.qml
@@ -49,13 +49,14 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.3
 
 ApplicationWindow {
     width: 200
     height: 200
     visible: true
 
+    menuBar: MenuBar { }
     header: ToolBar { }
     footer: ToolBar { }
 }
diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp
index dd50caf0..81cd9886 100644
--- a/tests/auto/applicationwindow/tst_applicationwindow.cpp
+++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp
@@ -827,11 +827,18 @@ void tst_applicationwindow::layout()
 
     QQuickItem *content = window->contentItem();
     QVERIFY(content);
+    QQuickItem *menuBar = window->menuBar();
+    QVERIFY(menuBar);
     QQuickItem *header = window->header();
     QVERIFY(header);
     QQuickItem *footer = window->footer();
     QVERIFY(footer);
 
+    QCOMPARE(menuBar->x(), 0.0);
+    QCOMPARE(menuBar->y(), -menuBar->height() - header->height());
+    QCOMPARE(header->width(), qreal(window->width()));
+    QVERIFY(menuBar->height() > 0);
+
     QCOMPARE(header->x(), 0.0);
     QCOMPARE(header->y(), -header->height());
     QCOMPARE(header->width(), qreal(window->width()));
@@ -842,6 +849,12 @@ void tst_applicationwindow::layout()
     QCOMPARE(footer->width(), qreal(window->width()));
     QVERIFY(footer->height() > 0.0);
 
+    QCOMPARE(content->x(), 0.0);
+    QCOMPARE(content->y(), menuBar->height() + header->height());
+    QCOMPARE(content->width(), qreal(window->width()));
+    QCOMPARE(content->height(), window->height() - menuBar->height() - header->height() - footer->height());
+
+    menuBar->setVisible(false);
     QCOMPARE(content->x(), 0.0);
     QCOMPARE(content->y(), header->height());
     QCOMPARE(content->width(), qreal(window->width()));
-- 
cgit v1.2.3