QQuickDisplayLayout: test that spacing is correct with only icon/text

The effective spacing when either the icon or the text is null is 0.

Change-Id: I5ce2388a17be5e86d3461b5c23f1c3996779b52f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/quickcontrols2/qquickdisplaylayout.cpp b/src/quickcontrols2/qquickdisplaylayout.cpp
index dba5d604..21fb4915 100644
--- a/src/quickcontrols2/qquickdisplaylayout.cpp
+++ b/src/quickcontrols2/qquickdisplaylayout.cpp
@@ -122,13 +122,16 @@ void QQuickDisplayLayoutPrivate::layout()
             icon->setHeight(qMin(icon->implicitHeight(), availableHeight));
             iconWidth = icon->width();
         }
+        qreal effectiveSpacing = 0;
         if (text) {
-            text->setWidth(qMin(text->implicitWidth(), availableWidth - iconWidth - spacing));
+            if (icon)
+                effectiveSpacing = spacing;
+            text->setWidth(qMin(text->implicitWidth(), availableWidth - iconWidth - effectiveSpacing));
             text->setHeight(qMin(text->implicitHeight(), availableHeight));
             textWidth = text->width();
         }
 
-        const qreal combinedWidth = iconWidth + spacing + textWidth;
+        const qreal combinedWidth = iconWidth + effectiveSpacing + textWidth;
         const qreal contentX = horizontalCenter - combinedWidth / 2;
         if (icon) {
             icon->setX(mirrored ? contentX + combinedWidth - iconWidth : contentX);