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

dwrite: Properly set run origin in DWRITE_READING_DIRECTION_RIGHT_TO_LEFT case.

This commit is contained in:
Nikolay Sivov 2015-07-09 12:29:09 +03:00 committed by Alexandre Julliard
parent 8201fa14c9
commit 0dcc9ead9e
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/dwrite/layout.c
View File

@ -942,11 +942,17 @@ static inline IUnknown *layout_get_effect_from_pos(struct dwrite_textlayout *lay
return ((struct layout_range_effect*)h)->effect; return ((struct layout_range_effect*)h)->effect;
} }
static inline BOOL layout_is_erun_rtl(const struct layout_effective_run *erun)
{
return erun->run->u.regular.run.bidiLevel & 1;
}
/* Effective run is built from consecutive clusters of a single nominal run, 'first_cluster' is 0 based cluster index, /* Effective run is built from consecutive clusters of a single nominal run, 'first_cluster' is 0 based cluster index,
'cluster_count' indicates how many clusters to add, including first one. */ 'cluster_count' indicates how many clusters to add, including first one. */
static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const struct layout_run *r, UINT32 first_cluster, static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const struct layout_run *r, UINT32 first_cluster,
UINT32 cluster_count, UINT32 line, FLOAT origin_x, BOOL strikethrough) UINT32 cluster_count, UINT32 line, FLOAT origin_x, BOOL strikethrough)
{ {
BOOL is_rtl = layout->format.readingdir == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT;
UINT32 i, start, length, last_cluster; UINT32 i, start, length, last_cluster;
struct layout_effective_run *run; struct layout_effective_run *run;
@ -958,10 +964,11 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
inlineobject->object = r->u.object.object; inlineobject->object = r->u.object.object;
inlineobject->origin_x = origin_x;
inlineobject->origin_y = 0.0; /* FIXME */
inlineobject->align_dx = 0.0;
inlineobject->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count); inlineobject->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count);
inlineobject->origin_x = is_rtl ? origin_x - inlineobject->width : origin_x;
inlineobject->origin_y = 0.0; /* set after line is built */
inlineobject->align_dx = 0.0;
/* It's not clear how these two are set, possibly directionality /* It's not clear how these two are set, possibly directionality
is derived from surrounding text (replaced text could have is derived from surrounding text (replaced text could have
different ranges which differ in reading direction). */ different ranges which differ in reading direction). */
@ -995,10 +1002,17 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const
run->run = r; run->run = r;
run->start = start = layout->clusters[first_cluster].position; run->start = start = layout->clusters[first_cluster].position;
run->length = length; run->length = length;
run->origin_x = origin_x; run->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count);
/* Check if run direction matches paragraph direction, if it doesn't adjust by
run width */
if (layout_is_erun_rtl(run) ^ is_rtl)
run->origin_x = is_rtl ? origin_x - run->width : origin_x + run->width;
else
run->origin_x = origin_x;
run->origin_y = 0.0; /* set after line is built */ run->origin_y = 0.0; /* set after line is built */
run->align_dx = 0.0; run->align_dx = 0.0;
run->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count);
run->line = line; run->line = line;
if (r->u.regular.run.glyphCount) { if (r->u.regular.run.glyphCount) {
@ -1304,7 +1318,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout)
return hr; return hr;
layout->metrics.lineCount = 0; layout->metrics.lineCount = 0;
origin_x = 0.0; origin_x = is_rtl ? layout->metrics.layoutWidth : 0.0;
line = 0; line = 0;
run = layout->clusters[0].run; run = layout->clusters[0].run;
memset(&metrics, 0, sizeof(metrics)); memset(&metrics, 0, sizeof(metrics));
@ -1321,7 +1335,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout)
hr = layout_add_effective_run(layout, run, start, i - start, line, origin_x, s[0]); hr = layout_add_effective_run(layout, run, start, i - start, line, origin_x, s[0]);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
origin_x += get_cluster_range_width(layout, start, i); origin_x += is_rtl ? -get_cluster_range_width(layout, start, i) :
get_cluster_range_width(layout, start, i);
run = layout->clusters[i].run; run = layout->clusters[i].run;
start = i; start = i;
} }
@ -1409,7 +1424,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout)
width = layout->clustermetrics[i].width; width = layout->clustermetrics[i].width;
memset(&metrics, 0, sizeof(metrics)); memset(&metrics, 0, sizeof(metrics));
origin_x = 0.0; origin_x = is_rtl ? layout->metrics.layoutWidth : 0.0;
start = i; start = i;
} }
else { else {