Refactor Popup

Added relevant properties to make it almost like a Control: x, y,
width, height, padding, background... This change makes popup use
an internal item where the style/user-supplied contentItem and
background are re-parented. This way we can provide a default style
(background) for Popup.

Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

4 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/material/data/tst_material.qml b/tests/auto/material/data/tst_material.qml
index 58360df4..6cd704eb 100644
--- a/tests/auto/material/data/tst_material.qml
+++ b/tests/auto/material/data/tst_material.qml
@@ -304,7 +304,7 @@ TestCase {
         verify(window.combo.activeFocus)
         keyClick(Qt.Key_Space)
         verify(window.combo.popup.visible)
-        var listView = window.combo.popup.contentItem.children[0]
+        var listView = window.combo.popup.contentItem
         verify(listView)
         var child = listView.contentItem.children[0]
         verify(child)
diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/menu/tst_menu.cpp
index 3a2d9c61..d072af4b 100644
--- a/tests/auto/menu/tst_menu.cpp
+++ b/tests/auto/menu/tst_menu.cpp
@@ -86,7 +86,7 @@ void tst_menu::mouse()
     QQuickMenu *menu = window->property("menu").value<QQuickMenu*>();
     menu->open();
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()));
+    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
 
     QQuickItem *firstItem = menu->itemAt(0);
     QSignalSpy clickedSpy(firstItem, SIGNAL(clicked(QQuickMouseEvent*)));
@@ -111,7 +111,7 @@ void tst_menu::mouse()
     menu->open();
     QCOMPARE(visibleSpy.count(), 2);
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()));
+    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
 
     // Ensure that we have enough space to click outside of the menu.
     QVERIFY(window->width() > menu->contentItem()->width());
@@ -120,12 +120,12 @@ void tst_menu::mouse()
         QPoint(menu->contentItem()->width() + 1, menu->contentItem()->height() + 1));
     QCOMPARE(visibleSpy.count(), 3);
     QVERIFY(!menu->isVisible());
-    QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()));
+    QVERIFY(!window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
 
     menu->open();
     QCOMPARE(visibleSpy.count(), 4);
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()));
+    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
 
     // Try pressing within the menu and releasing outside of it; it should close.
     // TODO: won't work until QQuickPopup::releasedOutside() actually gets emitted
@@ -167,7 +167,7 @@ void tst_menu::contextMenuKeyboard()
     menu->open();
     QCOMPARE(visibleSpy.count(), 1);
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()));
+    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
     QVERIFY(!firstItem->hasActiveFocus());
     QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
 
@@ -194,7 +194,7 @@ void tst_menu::contextMenuKeyboard()
     menu->open();
     QCOMPARE(visibleSpy.count(), 3);
     QVERIFY(menu->isVisible());
-    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()));
+    QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem()));
     QVERIFY(!firstItem->hasActiveFocus());
     QVERIFY(!secondItem->hasActiveFocus());
     QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1));
diff --git a/tests/auto/universal/data/tst_universal.qml b/tests/auto/universal/data/tst_universal.qml
index af70ad0e..36e8b0b2 100644
--- a/tests/auto/universal/data/tst_universal.qml
+++ b/tests/auto/universal/data/tst_universal.qml
@@ -276,7 +276,7 @@ TestCase {
         verify(window.combo.activeFocus)
         keyClick(Qt.Key_Space)
         verify(window.combo.popup.visible)
-        var listView = window.combo.popup.contentItem.children[0]
+        var listView = window.combo.popup.contentItem
         verify(listView)
         var child = listView.contentItem.children[0]
         verify(child)
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index edf0aa49..275c5f08 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -116,8 +116,8 @@ ApplicationWindow {
 
     Menu {
         id: menu
-        contentItem.x: 1
-        contentItem.y: header.height
+        x: 1
+        y: header.height
 
         MenuItem {
             text: "Option 1"