AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1617867356

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-08 10:10:06 +00:00
commit 1999e2adc1
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/text/qfontmetrics.cpp
View File

@ -261,9 +261,8 @@ bool QFontMetrics::operator ==(const QFontMetrics &other) const
The ascent of a font is the distance from the baseline to the The ascent of a font is the distance from the baseline to the
highest position characters extend to. In practice, some font highest position characters extend to. In practice, some font
designers break this rule, e.g. when they put more than one accent designers break this rule, e.g. when they put more than one accent
on top of a character, or to accommodate an unusual character in on top of a character, or to accommodate a certain character, so it
an exotic language, so it is possible (though rare) that this is possible (though rare) that this value will be too small.
value will be too small.
\sa descent() \sa descent()
*/ */
@ -298,8 +297,8 @@ int QFontMetrics::capHeight() const
The descent is the distance from the base line to the lowest point The descent is the distance from the base line to the lowest point
characters extend to. In practice, some font designers break this rule, characters extend to. In practice, some font designers break this rule,
e.g. to accommodate an unusual character in an exotic language, so e.g. to accommodate a certain character, so it is possible (though
it is possible (though rare) that this value will be too small. rare) that this value will be too small.
\sa ascent() \sa ascent()
*/ */
@ -1075,9 +1074,8 @@ bool QFontMetricsF::operator ==(const QFontMetricsF &other) const
The ascent of a font is the distance from the baseline to the The ascent of a font is the distance from the baseline to the
highest position characters extend to. In practice, some font highest position characters extend to. In practice, some font
designers break this rule, e.g. when they put more than one accent designers break this rule, e.g. when they put more than one accent
on top of a character, or to accommodate an unusual character in on top of a character, or to accommodate a certain character, so
an exotic language, so it is possible (though rare) that this it is possible (though rare) that this value will be too small.
value will be too small.
\sa descent() \sa descent()
*/ */
@ -1113,8 +1111,8 @@ qreal QFontMetricsF::capHeight() const
The descent is the distance from the base line to the lowest point The descent is the distance from the base line to the lowest point
characters extend to. (Note that this is different from X, which characters extend to. (Note that this is different from X, which
adds 1 pixel.) In practice, some font designers break this rule, adds 1 pixel.) In practice, some font designers break this rule,
e.g. to accommodate an unusual character in an exotic language, so e.g. to accommodate a certain character, so it is possible (though
it is possible (though rare) that this value will be too small. rare) that this value will be too small.
\sa ascent() \sa ascent()
*/ */