Merge r9217 (Jacob's underlining fix).

[originally from svn r9223]
[r9217 == 086764f5f4d0a50a87edfa1cff18b26edf36c94a]

diff --git a/windows/window.c b/windows/window.c
index c8c2b56d06be0dd1a83c54f66c05956ed8746d81..3f7721821159a54327d9acd26d78fb5563801722 100644 (file)
--- a/windows/window.c
+++ b/windows/window.c
@@ -3521,8 +3521,8 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
            dec = dec * 2 - font_height;
 
        oldpen = SelectObject(hdc, CreatePen(PS_SOLID, 0, fg));
-       MoveToEx(hdc, x, y + dec, NULL);
-       LineTo(hdc, x + len * char_width, y + dec);
+       MoveToEx(hdc, line_box.left, line_box.top + dec, NULL);
+       LineTo(hdc, line_box.right, line_box.top + dec);
        oldpen = SelectObject(hdc, oldpen);
        DeleteObject(oldpen);
     }