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

dwrite: Properly report drawing effect in DrawGlyphRun()/DrawInlineObject().

Browse Source
This commit is contained in:
Nikolay Sivov 2015-05-31 00:01:45 +03:00 committed by Alexandre Julliard
parent 89e1a5fb75
commit fe2f6b77a8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/dwrite/layout.c
View File

@ -139,6 +139,7 @@ struct layout_run {
struct inline_object_run object; struct inline_object_run object;
struct regular_layout_run regular; struct regular_layout_run regular;
} u; } u;
IUnknown *effect;
}; };
struct layout_effective_run { struct layout_effective_run {
@ -556,6 +557,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout)
r->u.object.object = range->object; r->u.object.object = range->object;
r->u.object.length = range->range.length; r->u.object.length = range->range.length;
r->effect = range->effect;
list_add_tail(&layout->runs, &r->entry); list_add_tail(&layout->runs, &r->entry);
continue; continue;
} }
@ -615,6 +617,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout)
} }
range = get_layout_range_by_pos(layout, run->descr.textPosition); range = get_layout_range_by_pos(layout, run->descr.textPosition);
r->effect = range->effect;
hr = IDWriteFontCollection_FindFamilyName(range->collection, range->fontfamily, &index, &exists); hr = IDWriteFontCollection_FindFamilyName(range->collection, range->fontfamily, &index, &exists);
if (FAILED(hr) || !exists) { if (FAILED(hr) || !exists) {
@ -2091,7 +2094,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
DWRITE_MEASURING_MODE_NATURAL, DWRITE_MEASURING_MODE_NATURAL,
&glyph_run, &glyph_run,
&descr, &descr,
NULL /* FIXME */); run->run->effect);
} }
/* 2. Inline objects */ /* 2. Inline objects */
@ -2103,7 +2106,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
inlineobject->object, inlineobject->object,
inlineobject->is_sideways, inlineobject->is_sideways,
inlineobject->is_rtl, inlineobject->is_rtl,
NULL /* FIXME */); run->run->effect);
} }
/* TODO: 3. Underlines */ /* TODO: 3. Underlines */