summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-11-17 16:37:50 +0100
committerJan Holesovsky <kendy@collabora.com>2014-11-17 23:20:43 +0100
commit9368d7474263460e33d2047ffa9f6cc97f3b997d (patch)
tree27574208f48f5b2ea8af5ecc0c8c1cc9872538db
parentbb92f43374d09206151c9640811bc28dfb2d94e4 (diff)
windows opengl: Use the updated DrawMask to get nice text with OpenGL.
Change-Id: Ie4f08575848e76159af86d44e10f24fa383930fb
-rw-r--r--vcl/win/source/gdi/winlayout.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 7f6fdc9729e2..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;
- pImpl->PreDraw();
COLORREF color = GetTextColor(hDC);
SalColor salColor = MAKE_SALCOLOR(GetRValue(color), GetGValue(color), GetBValue(color));
- // TODO when we have it:
- // pImpl->DrawSolidColorWithMask(salColor, aTexture, aRects);
- // and kill the following interim thing:
- pImpl->DrawTexture(aTexture, aRects);
+
+ pImpl->PreDraw();
+ pImpl->DrawMask(aTexture, salColor, aRects);
pImpl->PostDraw();
}