Nikolay Sivov : dwrite: Underline origin is always at the left run boundary.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jan 20 10:50:01 CST 2016
Module: wine
Branch: master
Commit: adfd1ad2ce17f651274b49b848f2ec7119cca2df
URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfd1ad2ce17f651274b49b848f2ec7119cca2df
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Jan 19 23:23:00 2016 +0300
dwrite: Underline origin is always at the left run boundary.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dwrite/layout.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index f765dc6..6b5bec7 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -428,6 +428,11 @@ static HRESULT format_set_optical_alignment(struct dwrite_textformat_data *forma
return S_OK;
}
+static BOOL is_run_rtl(const struct layout_effective_run *run)
+{
+ return run->run->u.regular.run.bidiLevel & 1;
+}
+
static struct layout_run *alloc_layout_run(enum layout_run_kind kind)
{
struct layout_run *ret;
@@ -3144,7 +3149,8 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
LIST_FOR_EACH_ENTRY(u, &This->underlines, struct layout_underline, entry) {
IDWriteTextRenderer_DrawUnderline(renderer,
context,
- u->run->origin_x + run->align_dx + origin_x,
+ /* horizontal underline always grows from left to right, width is always added to origin regardless of run direction */
+ (is_run_rtl(u->run) ? u->run->origin_x - u->run->width : u->run->origin_x) + run->align_dx + origin_x,
SNAP_COORD(u->run->origin_y + origin_y),
&u->u,
u->run->effect);
More information about the wine-cvs
mailing list