Nikolay Sivov : d2d1: Use drawing effect for underlines.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ec1957c359d7bd96aa996d9689587d974b59e06e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ec1957c359d7bd96aa996d9689587d974b59e06e

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Jan 27 23:34:00 2016 +0300

d2d1: Use drawing effect for underlines.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d2d1/render_target.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c
index 7cfbdfa..8353c09 100644
--- a/dlls/d2d1/render_target.c
+++ b/dlls/d2d1/render_target.c
@@ -1679,6 +1679,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend
     const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform;
     struct d2d_draw_text_layout_ctx *context = ctx;
     float min_thickness;
+    ID2D1Brush *brush;
     D2D1_RECT_F rect;
 
     TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p\n",
@@ -1692,7 +1693,12 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend
     rect.right  = baseline_origin_x + underline->width;
     rect.bottom = baseline_origin_y + underline->offset + max(underline->thickness, min_thickness);
 
-    ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, context->brush);
+    brush = d2d_draw_get_text_brush(context, effect);
+
+    ID2D1RenderTarget_FillRectangle(&render_target->ID2D1RenderTarget_iface, &rect, brush);
+
+    ID2D1Brush_Release(brush);
+
     return S_OK;
 }