diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-11-17 16:37:50 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-11-18 00:51:06 +0100 |
| commit | b5dd21e11fd5f27527bdd70c4aab400561c77305 (patch) | |
| tree | 9a056c4190d5c564ccba298af3aa958fdd3da900 /vcl/win/source | |
| parent | 66b170230d41a9b35a86962b953d898d78a9a324 (diff) | |
windows opengl: Use the updated DrawMask to get nice text with OpenGL.
Change-Id: Ie4f08575848e76159af86d44e10f24fa383930fb
Diffstat (limited to 'vcl/win/source')
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 3321d0d6a2da..1d461e6049bf 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -243,13 +243,11 @@ void WinLayout::DrawText(SalGraphics& rGraphics) const aRects.mnDestWidth = width; aRects.mnDestHeight = height; + COLORREF color = GetTextColor(hDC); + SalColor salColor = MAKE_SALCOLOR(GetRValue(color), GetGValue(color), GetBValue(color)); + pImpl->PreDraw(); - // TODO when we have it: - // COLORREF color = GetTextColor(hDC); - // SalColor salColor = MAKE_SALCOLOR(GetRValue(color), GetGValue(color), GetBValue(color)); - // pImpl->DrawSolidColorWithMask(salColor, aTexture, aRects); - // and kill the following interim thing: - pImpl->DrawTexture(aTexture, aRects); + pImpl->DrawMask(aTexture, salColor, aRects); pImpl->PostDraw(); } |