diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
| commit | 0bf14044178d7aa212ac7e28530f9077790a3df4 (patch) | |
| tree | 4c403571abbc5e18c6962ba67d9cb584d8e121c4 /src/quick/items/qquicktext.cpp | |
| parent | 0aea009425242417bffdb171c8eca02ff52f4a7b (diff) | |
| parent | 79cfc8788d6267eeb263983466ba21758f618dcd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I241cd418bb7e7b95e0a0a2ee4c465d48be2a5582
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 8288554028..80321cf5d1 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -897,11 +897,11 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline) // If the width of the item has changed and it's possible the result of wrapping, // eliding, scaling has changed, or the text is not left aligned do another layout. - if ((lineWidth < qMin(oldWidth, naturalWidth) || (widthExceeded && lineWidth > oldWidth)) + if ((!qFuzzyCompare(lineWidth, oldWidth) || (widthExceeded && lineWidth > oldWidth)) && (singlelineElide || multilineElide || canWrap || horizontalFit || q->effectiveHAlign() != QQuickText::AlignLeft)) { widthChanged = true; - widthExceeded = false; + widthExceeded = lineWidth >= qMin(oldWidth, naturalWidth); heightExceeded = false; continue; } @@ -936,7 +936,7 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline) bool wasInLayout = internalWidthUpdate; internalWidthUpdate = true; - q->setImplicitHeight(naturalHeight); + q->setImplicitHeight(naturalHeight + q->topPadding() + q->bottomPadding()); internalWidthUpdate = wasInLayout; multilineElide = elideMode == QQuickText::ElideRight |