diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 05:55:57 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-30 05:55:57 (GMT) |
| commit | e925d5ebed4b319c57c1a3097a0e25c9cd562bcb (patch) | |
| tree | cf84a523c4a327dc142394c9c0617d4047eb1d33 /src/gui/text/qfontengine_win.cpp | |
| parent | 4da9590140c063551f261b883fb275cafe986b60 (diff) | |
| parent | 864ace14e12cedd8e8f78841249e5309eb0a0795 (diff) | |
| download | Qt-e925d5ebed4b319c57c1a3097a0e25c9cd562bcb.zip Qt-e925d5ebed4b319c57c1a3097a0e25c9cd562bcb.tar.gz Qt-e925d5ebed4b319c57c1a3097a0e25c9cd562bcb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/text/qfontengine_win.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_win.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index 55e93bd..a805612 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -39,6 +39,11 @@ ** ****************************************************************************/ +#if _WIN32_WINNT < 0x0500 +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0500 +#endif + #include "qfontengine_p.h" #include "qtextengine_p.h" #include <qglobal.h> @@ -649,6 +654,32 @@ static const ushort char_table[] = { static const int char_table_entries = sizeof(char_table)/sizeof(ushort); +#ifndef Q_CC_MINGW +void QFontEngineWin::getGlyphBearings(glyph_t glyph, qreal *leftBearing, qreal *rightBearing) +{ + HDC hdc = shared_dc(); + SelectObject(hdc, hfont); + +#ifndef Q_WS_WINCE + if (ttf) +#endif + + { + ABC abcWidths; + GetCharABCWidthsI(hdc, glyph, 1, 0, &abcWidths); + if (leftBearing) + *leftBearing = abcWidths.abcA; + if (rightBearing) + *rightBearing = abcWidths.abcC; + } + +#ifndef Q_WS_WINCE + else { + QFontEngine::getGlyphBearings(glyph, leftBearing, rightBearing); + } +#endif +} +#endif // Q_CC_MINGW qreal QFontEngineWin::minLeftBearing() const { |