From 9368d7474263460e33d2047ffa9f6cc97f3b997d Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Mon, 17 Nov 2014 16:37:50 +0100
Subject: windows opengl: Use the updated DrawMask to get nice text with
 OpenGL.

Change-Id: Ie4f08575848e76159af86d44e10f24fa383930fb
---
 vcl/win/source/gdi/winlayout.cxx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'vcl')

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();
         }
 
-- 
cgit v1.2.3