diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-06-03 11:25:03 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-06-08 15:04:19 +0200 |
| commit | 078c3b7d686c3dfb584f5df57b5ed5c4cb624592 (patch) | |
| tree | 2777bfb727a790405f36204f09b35dc913fb2e58 /src/gui/text/qfontengine.cpp | |
| parent | 18e8519dcdf36b211b39c131c0d6e08b5921a03c (diff) | |
Remove deprecated text-related enums
Fixes: QTBUG-82367
Change-Id: Iff2645759657f8e350754e90e791dbd583017671
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 88499b32b8..b931de1945 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -495,7 +495,7 @@ QFixed QFontEngine::leading() const if (!m_heightMetricsQueried) initializeHeightMetrics(); - return (fontDef.styleStrategy & QFont::ForceIntegerMetrics) ? m_leading.round() : m_leading; + return m_leading; } QFixed QFontEngine::ascent() const @@ -503,7 +503,7 @@ QFixed QFontEngine::ascent() const if (!m_heightMetricsQueried) initializeHeightMetrics(); - return (fontDef.styleStrategy & QFont::ForceIntegerMetrics) ? m_ascent.round() : m_ascent; + return m_ascent; } QFixed QFontEngine::descent() const @@ -511,7 +511,7 @@ QFixed QFontEngine::descent() const if (!m_heightMetricsQueried) initializeHeightMetrics(); - return (fontDef.styleStrategy & QFont::ForceIntegerMetrics) ? m_descent.round() : m_descent; + return m_descent; } qreal QFontEngine::minLeftBearing() const @@ -1483,13 +1483,13 @@ bool QFontEngine::hasUnreliableGlyphOutline() const return glyphFormat == QFontEngine::Format_ARGB; } -QFixed QFontEngine::lastRightBearing(const QGlyphLayout &glyphs, bool round) +QFixed QFontEngine::lastRightBearing(const QGlyphLayout &glyphs) { if (glyphs.numGlyphs >= 1) { glyph_t glyph = glyphs.glyphs[glyphs.numGlyphs - 1]; glyph_metrics_t gi = boundingBox(glyph); if (gi.isValid()) - return round ? qRound(gi.rightBearing()) : gi.rightBearing(); + return gi.rightBearing(); } return 0; } |