diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-04 10:09:38 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-04 10:54:23 (GMT) |
| commit | 09b06552f98f8ee8be4d156049a6a37a4abed6bd (patch) | |
| tree | 92ecbf3d4a4cf87de721aafcc8f40a410ece800d /src/gui/text/qtextformat.h | |
| parent | 254281dae38b932998eb8014a55177948842b78d (diff) | |
| download | Qt-09b06552f98f8ee8be4d156049a6a37a4abed6bd.zip Qt-09b06552f98f8ee8be4d156049a6a37a4abed6bd.tar.gz Qt-09b06552f98f8ee8be4d156049a6a37a4abed6bd.tar.bz2 | |
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/qtextformat.h')
| -rw-r--r-- | src/gui/text/qtextformat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index 41cc1d9..81b053b 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -537,7 +537,7 @@ public: SingleHeight = 0, ProportionalHeight = 1, FixedHeight = 2, - AtLeastHeight = 3, + MinimumHeight = 3, LineDistanceHeight = 4 }; @@ -619,7 +619,7 @@ inline qreal QTextBlockFormat::lineHeight(qreal scriptLineHeight, qreal scaling return(scriptLineHeight * doubleProperty(LineHeight) / 100.0); case FixedHeight: return(doubleProperty(LineHeight) * scaling); - case AtLeastHeight: + case MinimumHeight: return(qMax(scriptLineHeight, doubleProperty(LineHeight) * scaling)); case LineDistanceHeight: return(scriptLineHeight + doubleProperty(LineHeight) * scaling); |