From 04f4de502cd420da870b83e062a50833be63bde5 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Sun, 8 Apr 2018 19:58:03 +0200
Subject: QQuickLabel: fix background resizing

setBackground() must resize the item if component construction is
already complete.

Change-Id: I76cada5b37257473a9c0146ee1f6de8de6c10218
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 159599e97750ad1a9208a66303552aa8b4f2cdc7)
---
 src/quicktemplates2/qquicklabel.cpp    | 30 +++++++++++++++++++-----------
 src/quicktemplates2/qquicklabel_p_p.h  |  2 ++
 tests/auto/controls/data/tst_label.qml | 24 ++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index c8b125ca..44baf1c3 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -95,6 +95,22 @@ QQuickLabelPrivate::~QQuickLabelPrivate()
 #endif
 }
 
+void QQuickLabelPrivate::resizeBackground()
+{
+    Q_Q(QQuickLabel);
+    if (background) {
+        QQuickItemPrivate *p = QQuickItemPrivate::get(background);
+        if (!p->widthValid) {
+            background->setWidth(q->width());
+            p->widthValid = false;
+        }
+        if (!p->heightValid) {
+            background->setHeight(q->height());
+            p->heightValid = false;
+        }
+    }
+}
+
 /*!
     \internal
 
@@ -232,6 +248,8 @@ void QQuickLabel::setBackground(QQuickItem *background)
         background->setParentItem(this);
         if (qFuzzyIsNull(background->z()))
             background->setZ(-1);
+        if (isComponentComplete())
+            d->resizeBackground();
     }
     if (!d->background.isExecuting())
         emit backgroundChanged();
@@ -267,17 +285,7 @@ void QQuickLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGe
 {
     Q_D(QQuickLabel);
     QQuickText::geometryChanged(newGeometry, oldGeometry);
-    if (d->background) {
-        QQuickItemPrivate *p = QQuickItemPrivate::get(d->background);
-        if (!p->widthValid) {
-            d->background->setWidth(newGeometry.width());
-            p->widthValid = false;
-        }
-        if (!p->heightValid) {
-            d->background->setHeight(newGeometry.height());
-            p->heightValid = false;
-        }
-    }
+    d->resizeBackground();
 }
 
 QT_END_NAMESPACE
diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h
index f612434b..2e60a96d 100644
--- a/src/quicktemplates2/qquicklabel_p_p.h
+++ b/src/quicktemplates2/qquicklabel_p_p.h
@@ -75,6 +75,8 @@ public:
         return static_cast<QQuickLabelPrivate *>(QObjectPrivate::get(item));
     }
 
+    void resizeBackground();
+
     void resolveFont();
     void inheritFont(const QFont &f);
 
diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml
index 5618fe07..69d273a7 100644
--- a/tests/auto/controls/data/tst_label.qml
+++ b/tests/auto/controls/data/tst_label.qml
@@ -65,6 +65,18 @@ TestCase {
         Label { }
     }
 
+    Component {
+        id: backgroundLabel
+        Label {
+            background: Rectangle { }
+        }
+    }
+
+    Component {
+        id: rectangle
+        Rectangle { }
+    }
+
     Component {
         id: signalSpy
         SignalSpy { }
@@ -115,4 +127,16 @@ TestCase {
         compare(child.font[data.tag], defaultValue)
         compare(childSpy.count, 0)
     }
+
+    function test_background() {
+        var control = createTemporaryObject(backgroundLabel, testCase, {text: "Label"})
+        verify(control)
+
+        compare(control.background.width, control.width)
+        compare(control.background.height, control.height)
+
+        control.background = rectangle.createObject(control)
+        compare(control.background.width, control.width)
+        compare(control.background.height, control.height)
+    }
 }
-- 
cgit v1.2.3