diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-05 17:30:34 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-06 15:22:10 +0000 |
| commit | ea4dc11ce772d34ee71e4dca0b09f329e2953c68 (patch) | |
| tree | 29157a824063f161c44c751de449af06903c7a5a /src/quicktemplates2/qquickpane.cpp | |
| parent | f447493bf9a8cf3490da0f5409d76e7f7fc98759 (diff) | |
QQuickPopupItem: inherit QQuickPane
Change-Id: Ia32f3004cf540f995344286683d754558369f279
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpane.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpane.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp index 7721704a..cf89822a 100644 --- a/src/quicktemplates2/qquickpane.cpp +++ b/src/quicktemplates2/qquickpane.cpp @@ -220,7 +220,11 @@ qreal QQuickPanePrivate::getContentHeight() const void QQuickPanePrivate::updateContentWidth() { Q_Q(QQuickPane); - if (hasContentWidth || !componentComplete) + if (hasContentWidth) + return; + + // a special case for width<->height dependent content (wrapping text) in ScrollView + if (contentWidth < 0 && !componentComplete) return; qreal oldContentWidth = contentWidth; @@ -235,7 +239,11 @@ void QQuickPanePrivate::updateContentWidth() void QQuickPanePrivate::updateContentHeight() { Q_Q(QQuickPane); - if (hasContentHeight || !componentComplete) + if (hasContentHeight) + return; + + // a special case for width<->height dependent content (wrapping text) in ScrollView + if (contentWidth < 0 && !componentComplete) return; qreal oldContentHeight = contentHeight; |