diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-09 01:52:41 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-09 02:04:03 (GMT) |
| commit | 0d6ce63ea84b076efbebfae0f6f39f492d8d7bcf (patch) | |
| tree | fbfdc7cae04be6e6e064f10dc466f266fb84f9c7 /src | |
| parent | bd528156fe69188957f00bd33fa96b9dd6688820 (diff) | |
| download | Qt-0d6ce63ea84b076efbebfae0f6f39f492d8d7bcf.zip Qt-0d6ce63ea84b076efbebfae0f6f39f492d8d7bcf.tar.gz Qt-0d6ce63ea84b076efbebfae0f6f39f492d8d7bcf.tar.bz2 | |
Revert to previous lineHeight behavior.
f47f01fd34d08f6152c9053c0d6928fc359aa0f9 changed the height of the
Text to not include the extra spacing at the end of the block. This
is different to what QDextDocument does. Revert back to the old
behavior.
Change-Id: Ie43dea4dd5a0e9ba179f44c246fb834322db11e3
Reviewed-by: Joona Petrell
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetext.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index 6bcd2fa..3b5be9e 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -452,6 +452,7 @@ QRect QDeclarativeTextPrivate::setupTextLayout() br = br.united(line.naturalTextRect()); height += (lineHeightMode == QDeclarativeText::FixedHeight) ? lineHeight : line.height() * lineHeight; } + br.setHeight(height); if (!q->widthValid()) naturalWidth = br.width(); |