diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2017-03-03 05:15:14 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2017-03-03 13:22:53 +0000 |
| commit | a51b7a1c3a7e7cf7b0c733e1dec40288278c1884 (patch) | |
| tree | 6452088195b6c0ad617e7a6b9f97ecc8672d321e /vcl/win | |
| parent | 5742868ccf030b2c0f03538d030bd18bd5666bdb (diff) | |
tdf#103831, tdf#100986: Force using GDI when needed
Our DirectWrite renderer is incomplete and can’t handle rotated text or text
with horizontal scaling, so route these two through GDI for now.
Change-Id: I87b85796a29e3acce782e01b4c629fec6f1a9e25
Reviewed-on: https://gerrit.libreoffice.org/34848
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 54c00afe3af6..193d4b6b9459 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -77,26 +77,6 @@ bool WinFontInstance::CacheGlyphToAtlas(HDC hDC, HFONT hFont, int nGlyphIndex, S return false; } - // Bail for non-horizontal text. - { - wchar_t sFaceName[200]; - int nFaceNameLen = GetTextFaceW(hNewDC, SAL_N_ELEMENTS(sFaceName), sFaceName); - - if (!nFaceNameLen) - SAL_WARN("vcl.gdi", "GetTextFace failed: " << WindowsErrorString(GetLastError())); - - LOGFONTW aLogFont; - GetObjectW(hFont, sizeof(LOGFONTW), &aLogFont); - - SelectObject(hNewDC, hOrigFont); - DeleteDC(hNewDC); - - if (sFaceName[0] == '@' || aLogFont.lfOrientation != 0 || aLogFont.lfEscapement != 0) - { - pTxt->ReleaseFont(); - return false; - } - } std::vector<WORD> aGlyphIndices(1); aGlyphIndices[0] = nGlyphIndex; // Fetch the ink boxes and calculate the size of the atlas. @@ -725,13 +705,18 @@ void WinSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout, HDC hDC, boo void WinSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout) { HDC hDC = getHDC(); + + // Our DirectWrite renderer is incomplete, skip it for non-horizontal or + // stretched text. + bool bForceGDI = rLayout.GetOrientation() || rLayout.hasHScale(); + bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled() && !mbPrinter; if (!bUseOpenGL) { // no OpenGL, just classic rendering - DrawTextLayout(rLayout, hDC, false); + DrawTextLayout(rLayout, hDC, !bForceGDI); } - else if (CacheGlyphs(rLayout) && + else if (!bForceGDI && CacheGlyphs(rLayout) && DrawCachedGlyphs(rLayout)) { // Nothing @@ -798,7 +783,7 @@ void WinSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout) SalColor salColor = MAKE_SALCOLOR(GetRValue(color), GetGValue(color), GetBValue(color)); // the actual drawing - DrawTextLayout(rLayout, aDC.getCompatibleHDC(), true); + DrawTextLayout(rLayout, aDC.getCompatibleHDC(), !bForceGDI); std::unique_ptr<OpenGLTexture> xTexture(aDC.getTexture()); if (xTexture) |