Add missing implicitBackground{Width|Height} to non-QQuickControls

Same as 5bd9d44b for QQuickControl.

[ChangeLog][Controls][Label] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.
[ChangeLog][Controls][TextArea] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.
[ChangeLog][Controls][TextField] Added implicitBackgroundWidth and
implicitBackgroundHeight properties that can be used to simplify
complex implicit size bindings.

Change-Id: Idcc2d9af8df086b41c15f352506fd8afdbb2e3e7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

2 files changed, 108 insertions, 14 deletions

diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index 38e810f7..719a1e0d 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -79,6 +79,11 @@ TestCase {
         SignalSpy { }
     }
 
+    Component {
+        id: rectangle
+        Rectangle { }
+    }
+
     function test_creation() {
         var control = createTemporaryObject(textArea, testCase)
         verify(control)
@@ -86,15 +91,69 @@ TestCase {
 
     function test_implicitSize() {
         var control = createTemporaryObject(textArea, testCase)
+        verify(control)
 
         var implicitWidthSpy = signalSpy.createObject(control, { target: control, signalName: "implicitWidthChanged"} )
+        verify(implicitWidthSpy.valid)
+
         var implicitHeightSpy = signalSpy.createObject(control, { target: control, signalName: "implicitHeightChanged"} )
-        control.background.implicitWidth = 400
-        control.background.implicitHeight = 200
+        verify(implicitHeightSpy.valid)
+
+        var implicitBackgroundWidthSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundWidthChanged"})
+        verify(implicitBackgroundWidthSpy.valid)
+
+        var implicitBackgroundHeightSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundHeightChanged"})
+        verify(implicitBackgroundHeightSpy.valid)
+
+        var implicitWidthChanges = 0
+        var implicitHeightChanges = 0
+        var implicitBackgroundWidthChanges = 0
+        var implicitBackgroundHeightChanges = 0
+
+        verify(control.implicitWidth >= control.leftPadding + control.rightPadding)
+        verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding)
+        compare(control.implicitBackgroundWidth, 0)
+        compare(control.implicitBackgroundHeight, 0)
+
+        control.background = rectangle.createObject(control, {implicitWidth: 400, implicitHeight: 200})
         compare(control.implicitWidth, 400)
         compare(control.implicitHeight, 200)
-        compare(implicitWidthSpy.count, 1)
-        compare(implicitHeightSpy.count, 1)
+        compare(control.implicitBackgroundWidth, 400)
+        compare(control.implicitBackgroundHeight, 200)
+        compare(implicitWidthSpy.count, ++implicitWidthChanges)
+        compare(implicitHeightSpy.count, ++implicitHeightChanges)
+        compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges)
+        compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges)
+
+        control.background = null
+        compare(control.implicitWidth, control.leftPadding + control.rightPadding)
+        verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding)
+        compare(control.implicitBackgroundWidth, 0)
+        compare(control.implicitBackgroundHeight, 0)
+        compare(implicitWidthSpy.count, ++implicitWidthChanges)
+        compare(implicitHeightSpy.count, ++implicitHeightChanges)
+        compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges)
+        compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges)
+
+        control.text = "TextArea"
+        compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding)
+        verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding)
+        compare(control.implicitBackgroundWidth, 0)
+        compare(control.implicitBackgroundHeight, 0)
+        compare(implicitWidthSpy.count, ++implicitWidthChanges)
+        compare(implicitHeightSpy.count, implicitHeightChanges)
+        compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges)
+        compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges)
+
+        control.placeholderText = "..."
+        compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding)
+        verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding)
+        compare(control.implicitBackgroundWidth, 0)
+        compare(control.implicitBackgroundHeight, 0)
+        compare(implicitWidthSpy.count, implicitWidthChanges)
+        compare(implicitHeightSpy.count, implicitHeightChanges)
+        compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges)
+        compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges)
     }
 
     function test_alignment_data() {
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 1bdf5151..8c1c523f 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -82,34 +82,69 @@ TestCase {
 
     function test_implicitSize() {
         var control = createTemporaryObject(textField, testCase)
-        verify(control.implicitWidth > control.leftPadding + control.rightPadding)
+        verify(control)
 
         var implicitWidthSpy = signalSpy.createObject(control, { target: control, signalName: "implicitWidthChanged"} )
+        verify(implicitWidthSpy.valid)
+
         var implicitHeightSpy = signalSpy.createObject(control, { target: control, signalName: "implicitHeightChanged"} )
+        verify(implicitHeightSpy.valid)
+
+        var implicitBackgroundWidthSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundWidthChanged"})
+        verify(implicitBackgroundWidthSpy.valid)
+
+        var implicitBackgroundHeightSpy = createTemporaryObject(signalSpy, testCase, {target: control, signalName: "implicitBackgroundHeightChanged"})
+        verify(implicitBackgroundHeightSpy.valid)
+
+        var implicitWidthChanges = 0
+        var implicitHeightChanges = 0
+        var implicitBackgroundWidthChanges = 0
+        var implicitBackgroundHeightChanges = 0
+
+        verify(control.implicitWidth >= control.leftPadding + control.rightPadding)
+        verify(control.implicitHeight >= control.contentHeight + control.topPadding + control.bottomPadding)
+        compare(control.implicitBackgroundWidth, control.background.implicitWidth)
+        compare(control.implicitBackgroundHeight, control.background.implicitHeight)
 
         control.background = rectangle.createObject(control, {implicitWidth: 400, implicitHeight: 200})
         compare(control.implicitWidth, 400)
         compare(control.implicitHeight, 200)
-        compare(implicitWidthSpy.count, 1)
-        compare(implicitHeightSpy.count, 1)
+        compare(control.implicitBackgroundWidth, 400)
+        compare(control.implicitBackgroundHeight, 200)
+        compare(implicitWidthSpy.count, ++implicitWidthChanges)
+        compare(implicitHeightSpy.count, ++implicitHeightChanges)
+        compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges)
+        compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges)
 
         control.background = null
         compare(control.implicitWidth, control.leftPadding + control.rightPadding)
         compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding)
-        compare(implicitWidthSpy.count, 2)
-        compare(implicitHeightSpy.count, 2)
+        compare(control.implicitBackgroundWidth, 0)
+        compare(control.implicitBackgroundHeight, 0)
+        compare(implicitWidthSpy.count, ++implicitWidthChanges)
+        compare(implicitHeightSpy.count, ++implicitHeightChanges)
+        compare(implicitBackgroundWidthSpy.count, ++implicitBackgroundWidthChanges)
+        compare(implicitBackgroundHeightSpy.count, ++implicitBackgroundHeightChanges)
 
         control.text = "TextField"
         compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding)
         compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding)
-        compare(implicitWidthSpy.count, 3)
-        compare(implicitHeightSpy.count, 2)
+        compare(control.implicitBackgroundWidth, 0)
+        compare(control.implicitBackgroundHeight, 0)
+        compare(implicitWidthSpy.count, ++implicitWidthChanges)
+        compare(implicitHeightSpy.count, implicitHeightChanges)
+        compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges)
+        compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges)
 
         control.placeholderText = "..."
-        verify(control.implicitWidth < control.contentWidth + control.leftPadding + control.rightPadding)
+        compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding)
         compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding)
-        compare(implicitWidthSpy.count, 4)
-        compare(implicitHeightSpy.count, 2)
+        compare(control.implicitBackgroundWidth, 0)
+        compare(control.implicitBackgroundHeight, 0)
+        compare(implicitWidthSpy.count, implicitWidthChanges)
+        compare(implicitHeightSpy.count, implicitHeightChanges)
+        compare(implicitBackgroundWidthSpy.count, implicitBackgroundWidthChanges)
+        compare(implicitBackgroundHeightSpy.count, implicitBackgroundHeightChanges)
     }
 
     function test_alignment_data() {