diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-04 11:09:38 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-04 11:54:23 +0100 |
| commit | 09b06552f98f8ee8be4d156049a6a37a4abed6bd (patch) | |
| tree | 92ecbf3d4a4cf87de721aafcc8f40a410ece800d /src/gui/text/qtextdocumentlayout.cpp | |
| parent | 254281dae38b932998eb8014a55177948842b78d (diff) | |
Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
Make some alterations to merge request 2305:
1. Rename enum for consistency with other APIs in Qt.
2. Correct documentation with actual version number of features.
3. Remove unstandard css syntax in line-height specification.
Reviewed-by: Jiang Jiang
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 5334ae8ca4..22c6b8c9da 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -2510,7 +2510,7 @@ static inline void getLineHeightParams(const QTextBlockFormat &blockFormat, cons QFixed *lineAdjustment, QFixed *lineBreakHeight, QFixed *lineHeight) { *lineHeight = QFixed::fromReal(blockFormat.lineHeight(line.height(), scaling)); - if (blockFormat.lineHeightType() == QTextBlockFormat::FixedHeight || blockFormat.lineHeightType() == QTextBlockFormat::AtLeastHeight) { + if (blockFormat.lineHeightType() == QTextBlockFormat::FixedHeight || blockFormat.lineHeightType() == QTextBlockFormat::MinimumHeight) { *lineBreakHeight = *lineHeight; if (blockFormat.lineHeightType() == QTextBlockFormat::FixedHeight) *lineAdjustment = QFixed::fromReal(line.ascent() + qMax(line.leading(), 0.0)) - ((*lineHeight * 4) / 5); |