ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Make position snapping more compact. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-01-11 16:15:54 +03:00 committed by Alexandre Julliard
parent 74f00fa17d
commit f6862b13b7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/dwrite/layout.c
View File

@ -2904,7 +2904,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
skiptransform = should_skip_transform(&m, &det); skiptransform = should_skip_transform(&m, &det);
} }
#define SNAP_COORD(x) renderer_apply_snapping((x), skiptransform, ppdip, det, &m) #define SNAP_COORD(x) (disabled ? (x) : renderer_apply_snapping((x), skiptransform, ppdip, det, &m))
/* 1. Regular runs */ /* 1. Regular runs */
LIST_FOR_EACH_ENTRY(run, &This->eruns, struct layout_effective_run, entry) { LIST_FOR_EACH_ENTRY(run, &This->eruns, struct layout_effective_run, entry) {
const struct regular_layout_run *regular = &run->run->u.regular; const struct regular_layout_run *regular = &run->run->u.regular;
@ -2934,7 +2934,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
IDWriteTextRenderer_DrawGlyphRun(renderer, IDWriteTextRenderer_DrawGlyphRun(renderer,
context, context,
run->origin_x + run->align_dx + origin_x, run->origin_x + run->align_dx + origin_x,
disabled ? run->origin_y + origin_y : SNAP_COORD(run->origin_y + origin_y), SNAP_COORD(run->origin_y + origin_y),
This->measuringmode, This->measuringmode,
&glyph_run, &glyph_run,
&descr, &descr,
@ -2946,7 +2946,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
IDWriteTextRenderer_DrawInlineObject(renderer, IDWriteTextRenderer_DrawInlineObject(renderer,
context, context,
inlineobject->origin_x + inlineobject->align_dx + origin_x, inlineobject->origin_x + inlineobject->align_dx + origin_x,
disabled ? inlineobject->origin_y + origin_y : SNAP_COORD(inlineobject->origin_y + origin_y), SNAP_COORD(inlineobject->origin_y + origin_y),
inlineobject->object, inlineobject->object,
inlineobject->is_sideways, inlineobject->is_sideways,
inlineobject->is_rtl, inlineobject->is_rtl,
@ -2960,7 +2960,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
IDWriteTextRenderer_DrawStrikethrough(renderer, IDWriteTextRenderer_DrawStrikethrough(renderer,
context, context,
s->run->origin_x, s->run->origin_x,
disabled ? s->run->origin_y : SNAP_COORD(s->run->origin_y), SNAP_COORD(s->run->origin_y),
&s->s, &s->s,
NULL); NULL);
} }