From ec6cc9921f4b804ed309b7dbfae6ee3b1cf3d8a7 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Wed, 21 Feb 2018 23:11:25 +0100
Subject: Control: add implicitContentWidth|Height properties

[ChangeLog][Controls][Control] Added implicitContentWidth and
implicitContentHeight properties that can be used to simplify
complex implicit size bindings.

Change-Id: I6ccef572c013605058808ce2ad17f8bd82f49ef0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/quicktemplates2/qquickscrollview.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'src/quicktemplates2/qquickscrollview.cpp')

diff --git a/src/quicktemplates2/qquickscrollview.cpp b/src/quicktemplates2/qquickscrollview.cpp
index 2b348272..c4ca2caa 100644
--- a/src/quicktemplates2/qquickscrollview.cpp
+++ b/src/quicktemplates2/qquickscrollview.cpp
@@ -135,6 +135,8 @@ public:
     static QQuickItem *contentChildren_at(QQmlListProperty<QQuickItem> *prop, int index);
     static void contentChildren_clear(QQmlListProperty<QQuickItem> *prop);
 
+    void itemImplicitWidthChanged(QQuickItem *item) override;
+
     bool wasTouched;
     QQuickFlickable *flickable;
 };
@@ -223,11 +225,11 @@ void QQuickScrollViewPrivate::updateContentWidth()
         return;
 
     const qreal cw = flickable->contentWidth();
-    if (qFuzzyCompare(cw, contentWidth))
+    if (qFuzzyCompare(cw, implicitContentWidth))
         return;
 
-    contentWidth = cw;
-    emit q->contentWidthChanged();
+    implicitContentWidth = cw;
+    emit q->implicitContentWidthChanged();
 }
 
 void QQuickScrollViewPrivate::updateContentHeight()
@@ -237,11 +239,11 @@ void QQuickScrollViewPrivate::updateContentHeight()
         return;
 
     const qreal ch = flickable->contentHeight();
-    if (qFuzzyCompare(ch, contentHeight))
+    if (qFuzzyCompare(ch, implicitContentHeight))
         return;
 
-    contentHeight = ch;
-    emit q->contentHeightChanged();
+    implicitContentHeight = ch;
+    emit q->implicitContentHeightChanged();
 }
 
 QQuickScrollBar *QQuickScrollViewPrivate::verticalScrollBar() const
@@ -363,6 +365,15 @@ void QQuickScrollViewPrivate::contentChildren_clear(QQmlListProperty<QQuickItem>
     children.clear(&children);
 }
 
+void QQuickScrollViewPrivate::itemImplicitWidthChanged(QQuickItem *item)
+{
+    // a special case for width<->height dependent content (wrapping text) in ScrollView
+    if (contentWidth < 0 && !componentComplete)
+        return;
+
+    QQuickPanePrivate::itemImplicitWidthChanged(item);
+}
+
 QQuickScrollView::QQuickScrollView(QQuickItem *parent)
     : QQuickPane(*(new QQuickScrollViewPrivate), parent)
 {
-- 
cgit v1.2.3