Merge remote-tracking branch 'origin/5.7' into 5.8

Change-Id: I37aab846346692fd4bff08b0dbab66db3a8e2716

1 files changed, 85 insertions, 5 deletions

diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index a86e800e..5609d47f 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -355,6 +355,48 @@ TestCase {
         control.destroy()
     }
 
+    function test_resetSize() {
+        var control = popupControl.createObject(testCase, {visible: true, margins: 0})
+        verify(control)
+
+        control.width = control.implicitWidth = testCase.width + 10
+        control.height = control.implicitHeight = testCase.height + 10
+
+        compare(control.width, testCase.width + 10)
+        compare(control.height, testCase.height + 10)
+
+        control.width = undefined
+        control.height = undefined
+        compare(control.width, testCase.width)
+        compare(control.height, testCase.height)
+
+        control.destroy()
+    }
+
+    function test_negativeMargins() {
+        var control = popupControl.createObject(testCase, {implicitWidth: testCase.width, implicitHeight: testCase.height})
+        verify(control)
+
+        control.open()
+        verify(control.visible)
+
+        compare(control.x, 0)
+        compare(control.y, 0)
+
+        compare(control.margins, -1)
+        compare(control.topMargin, -1)
+        compare(control.leftMargin, -1)
+        compare(control.rightMargin, -1)
+        compare(control.bottomMargin, -1)
+
+        control.x = -10
+        control.y = -10
+        compare(control.x, 0)
+        compare(control.y, 0)
+
+        control.destroy()
+    }
+
     function test_margins() {
         var control = popupControl.createObject(testCase, {width: 100, height: 100})
         verify(control)
@@ -975,14 +1017,52 @@ TestCase {
         var control = popupControl.createObject(testCase)
         verify(control)
 
-        control.width = 200
-        control.height = 200
-
         control.open()
         waitForRendering(control.contentItem)
 
-        compare(control.width, 200)
-        compare(control.height, 200)
+        // implicit size of the content
+        control.contentItem.implicitWidth = 10
+        compare(control.implicitWidth, 10 + control.leftPadding + control.rightPadding)
+        compare(control.width, control.implicitWidth)
+        compare(control.contentItem.width, control.width - control.leftPadding - control.rightPadding)
+
+        control.contentItem.implicitHeight = 20
+        compare(control.implicitHeight, 20 + control.topPadding + control.bottomPadding)
+        compare(control.height, control.implicitHeight)
+        compare(control.contentItem.height, control.height - control.topPadding - control.bottomPadding)
+
+        // implicit size of the popup
+        control.implicitWidth = 30
+        compare(control.implicitWidth, 30)
+        compare(control.width, 30)
+        compare(control.contentItem.width, control.width - control.leftPadding - control.rightPadding)
+
+        control.implicitHeight = 40
+        compare(control.implicitHeight, 40)
+        compare(control.height, 40)
+        compare(control.contentItem.height, control.height - control.topPadding - control.bottomPadding)
+
+        // set explicit size
+        control.width = 50
+        compare(control.implicitWidth, 30)
+        compare(control.width, 50)
+        compare(control.contentItem.width, control.width - control.leftPadding - control.rightPadding)
+
+        control.height = 60
+        compare(control.implicitHeight, 40)
+        compare(control.height, 60)
+        compare(control.contentItem.height, control.height - control.topPadding - control.bottomPadding)
+
+        // reset explicit size
+        control.width = undefined
+        compare(control.implicitWidth, 30)
+        compare(control.width, 30)
+        compare(control.contentItem.width, control.width - control.leftPadding - control.rightPadding)
+
+        control.height = undefined
+        compare(control.implicitHeight, 40)
+        compare(control.height, 40)
+        compare(control.contentItem.height, control.height - control.topPadding - control.bottomPadding)
 
         control.destroy()
     }