Add Popup::font

Change-Id: I66feeb597e9f4a6176d6462640b3e26823a3d761
Task-number: QTBUG-50984
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 98 insertions, 47 deletions

diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index 67d9ceac..95934f54 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -349,38 +349,52 @@ TestCase {
     Component {
         id: component
         ApplicationWindow {
+            id: _window
             width: 400
             height: 400
             visible: true
             font.pixelSize: 40
             property alias pane: _pane
+            property alias popup: _popup
+            property SignalSpy fontspy: SignalSpy { target: _window; signalName: "fontChanged" }
             Pane {
                 id: _pane
-                property alias button: _button;
-                property alias popup: _popup;
-                property alias listview: _listview
+                property alias button: _button
                 font.pixelSize: 30
+                property SignalSpy fontspy: SignalSpy { target: _pane; signalName: "fontChanged" }
                 Column {
                     Button {
                         id: _button
                         text: "Button"
                         font.pixelSize: 20
-
+                        property SignalSpy fontspy: SignalSpy { target: _button; signalName: "fontChanged" }
                         Popup {
                             id: _popup
+                            property alias button: _button2
+                            property alias listview: _listview
                             y: _button.height
                             implicitHeight: Math.min(396, _listview.contentHeight)
-                            contentItem: ListView {
-                                id: _listview
-                                height: _button.height * 20
-                                model: 2
-                                delegate: Button {
-                                    objectName: "delegate"
-                                    width: _button.width
-                                    height: _button.height
-                                    text: "N: " + index
-                                    checkable: true
-                                    autoExclusive: true
+                            property SignalSpy fontspy: SignalSpy { target: _popup; signalName: "fontChanged" }
+                            contentItem: Column {
+                                Button {
+                                    id: _button2
+                                    text: "Button"
+                                    property SignalSpy fontspy: SignalSpy { target: _button2; signalName: "fontChanged" }
+                                }
+                                ListView {
+                                    id: _listview
+                                    height: _button.height * 20
+                                    model: 2
+                                    delegate: Button {
+                                        id: _button3
+                                        objectName: "delegate"
+                                        width: _button.width
+                                        height: _button.height
+                                        text: "N: " + index
+                                        checkable: true
+                                        autoExclusive: true
+                                        property SignalSpy fontspy: SignalSpy { target: _button3; signalName: "fontChanged" }
+                                    }
                                 }
                             }
                         }
@@ -394,43 +408,80 @@ TestCase {
         var window = component.createObject(testCase)
         verify(window)
 
-        window.requestActivate()
-        tryCompare(window, "active", true)
-
-        var control = window.pane
-        waitForRendering(control)
-
-        control.forceActiveFocus()
-        verify(control.activeFocus)
-
         compare(window.font.pixelSize, 40)
-        compare(control.font.pixelSize, 30)
-        compare(control.button.font.pixelSize, 20)
-
-        var popup = control.popup
-        popup.open()
+        compare(window.pane.font.pixelSize, 30)
+        compare(window.pane.button.font.pixelSize, 20)
+        compare(window.popup.font.pixelSize, 40)
+        compare(window.popup.button.font.pixelSize, 40)
 
-        verify(popup.contentItem)
+        var idx1 = getChild(window.popup.listview.contentItem, "delegate", -1)
+        compare(window.popup.listview.contentItem.children[idx1].font.pixelSize, 40)
+        var idx2 = getChild(window.popup.listview.contentItem, "delegate", idx1)
+        compare(window.popup.listview.contentItem.children[idx2].font.pixelSize, 40)
 
-        var listview = popup.contentItem
-        verify(listview.contentItem)
-        waitForRendering(listview)
-
-        var idx1 = getChild(listview.contentItem, "delegate", -1)
-        compare(listview.contentItem.children[idx1].font.pixelSize, 40)
-        var idx2 = getChild(listview.contentItem, "delegate", idx1)
-        compare(listview.contentItem.children[idx2].font.pixelSize, 40)
-
-        control.button.font.pixelSize = 30
-        compare(control.button.font.pixelSize, 30)
-        waitForRendering(listview)
-        compare(listview.contentItem.children[idx1].font.pixelSize, 40)
-        compare(listview.contentItem.children[idx2].font.pixelSize, 40)
+        window.pane.button.font.pixelSize = 30
+        compare(window.font.pixelSize, 40)
+        compare(window.fontspy.count, 0)
+        compare(window.pane.font.pixelSize, 30)
+        compare(window.pane.fontspy.count, 0)
+        compare(window.pane.button.font.pixelSize, 30)
+        compare(window.pane.button.fontspy.count, 1)
+        compare(window.popup.font.pixelSize, 40)
+        compare(window.popup.fontspy.count, 0)
+        compare(window.popup.button.font.pixelSize, 40)
+        compare(window.popup.button.fontspy.count, 0)
+        compare(window.popup.listview.contentItem.children[idx1].font.pixelSize, 40)
+        compare(window.popup.listview.contentItem.children[idx1].fontspy.count, 0)
+        compare(window.popup.listview.contentItem.children[idx2].font.pixelSize, 40)
+        compare(window.popup.listview.contentItem.children[idx2].fontspy.count, 0)
 
         window.font.pixelSize = 50
-        waitForRendering(listview)
-        compare(listview.contentItem.children[idx1].font.pixelSize, 50)
-        compare(listview.contentItem.children[idx2].font.pixelSize, 50)
+        compare(window.font.pixelSize, 50)
+        compare(window.fontspy.count, 1)
+        compare(window.pane.font.pixelSize, 30)
+        compare(window.pane.fontspy.count, 0)
+        compare(window.pane.button.font.pixelSize, 30)
+        compare(window.pane.button.fontspy.count, 1)
+        compare(window.popup.font.pixelSize, 50)
+        compare(window.popup.fontspy.count, 1)
+        compare(window.popup.button.font.pixelSize, 50)
+        compare(window.popup.button.fontspy.count, 1)
+        compare(window.popup.listview.contentItem.children[idx1].font.pixelSize, 50)
+        compare(window.popup.listview.contentItem.children[idx1].fontspy.count, 1)
+        compare(window.popup.listview.contentItem.children[idx2].font.pixelSize, 50)
+        compare(window.popup.listview.contentItem.children[idx2].fontspy.count, 1)
+
+        window.popup.button.font.pixelSize = 10
+        compare(window.font.pixelSize, 50)
+        compare(window.fontspy.count, 1)
+        compare(window.pane.font.pixelSize, 30)
+        compare(window.pane.fontspy.count, 0)
+        compare(window.pane.button.font.pixelSize, 30)
+        compare(window.pane.button.fontspy.count, 1)
+        compare(window.popup.font.pixelSize, 50)
+        compare(window.popup.fontspy.count, 1)
+        compare(window.popup.button.font.pixelSize, 10)
+        compare(window.popup.button.fontspy.count, 2)
+        compare(window.popup.listview.contentItem.children[idx1].font.pixelSize, 50)
+        compare(window.popup.listview.contentItem.children[idx1].fontspy.count, 1)
+        compare(window.popup.listview.contentItem.children[idx2].font.pixelSize, 50)
+        compare(window.popup.listview.contentItem.children[idx2].fontspy.count, 1)
+
+        window.popup.font.pixelSize = 60
+        compare(window.font.pixelSize, 50)
+        compare(window.fontspy.count, 1)
+        compare(window.pane.font.pixelSize, 30)
+        compare(window.pane.fontspy.count, 0)
+        compare(window.pane.button.font.pixelSize, 30)
+        compare(window.pane.button.fontspy.count, 1)
+        compare(window.popup.font.pixelSize, 60)
+        compare(window.popup.fontspy.count, 2)
+        compare(window.popup.button.font.pixelSize, 10)
+        compare(window.popup.button.fontspy.count, 2)
+        compare(window.popup.listview.contentItem.children[idx1].font.pixelSize, 60)
+        compare(window.popup.listview.contentItem.children[idx1].fontspy.count, 2)
+        compare(window.popup.listview.contentItem.children[idx2].font.pixelSize, 60)
+        compare(window.popup.listview.contentItem.children[idx2].fontspy.count, 2)
 
         window.destroy()
     }