diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2017-03-03 05:15:14 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-07 16:05:17 +0000 |
commit | 4375eefb644d03ab4bafbc091436166a8494dc91 (patch) | |
tree | 67d336ed408dff18f0ee9c2ff04c12cceff28974 /vcl/win | |
parent | 69b89daa2c583d02da0eb04f9a388d86d87f6ed5 (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.
Reviewed-on: https://gerrit.libreoffice.org/34848
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
(cherry picked from commit a51b7a1c3a7e7cf7b0c733e1dec40288278c1884)
Change-Id: I87b85796a29e3acce782e01b4c629fec6f1a9e25
Reviewed-on: https://gerrit.libreoffice.org/34862
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
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 5cfa9b71425f..482cbd7a460c 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -103,26 +103,6 @@ bool WinFontInstance::CacheGlyphToAtlas(bool bRealGlyphIndices, HDC hDC, HFONT h 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); // Fetch the ink boxes and calculate the size of the atlas. if (!bRealGlyphIndices) @@ -3872,13 +3852,18 @@ void WinSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout, HDC hDC, boo void WinSalGraphics::DrawSalLayout(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 @@ -3945,7 +3930,7 @@ void WinSalGraphics::DrawSalLayout(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) |