Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
2b5928b2
Commit
2b5928b2
authored
Jan 12, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 13, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Pass drawing effect to renderer in DrawGlyphRun().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c0fb6f43
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
layout.c
dlls/dwrite/layout.c
+3
-1
layout.c
dlls/dwrite/tests/layout.c
+1
-1
No files found.
dlls/dwrite/layout.c
View file @
2b5928b2
...
@@ -184,6 +184,7 @@ struct layout_effective_run {
...
@@ -184,6 +184,7 @@ struct layout_effective_run {
UINT32
start
;
/* relative text position, 0 means first text position of a nominal run */
UINT32
start
;
/* relative text position, 0 means first text position of a nominal run */
UINT32
length
;
/* length in codepoints that this run covers */
UINT32
length
;
/* length in codepoints that this run covers */
UINT32
glyphcount
;
/* total glyph count in this run */
UINT32
glyphcount
;
/* total glyph count in this run */
IUnknown
*
effect
;
/* original reference is kept only at range level */
FLOAT
origin_x
;
/* baseline X position */
FLOAT
origin_x
;
/* baseline X position */
FLOAT
origin_y
;
/* baseline Y position */
FLOAT
origin_y
;
/* baseline Y position */
FLOAT
align_dx
;
/* adjustment from text alignment */
FLOAT
align_dx
;
/* adjustment from text alignment */
...
@@ -1106,6 +1107,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const
...
@@ -1106,6 +1107,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const
for
(
i
=
0
;
i
<
length
;
i
++
)
for
(
i
=
0
;
i
<
length
;
i
++
)
run
->
clustermap
[
i
]
=
r
->
u
.
regular
.
clustermap
[
start
+
i
]
-
r
->
u
.
regular
.
clustermap
[
start
];
run
->
clustermap
[
i
]
=
r
->
u
.
regular
.
clustermap
[
start
+
i
]
-
r
->
u
.
regular
.
clustermap
[
start
];
run
->
effect
=
params
->
effect
;
list_add_tail
(
&
layout
->
eruns
,
&
run
->
entry
);
list_add_tail
(
&
layout
->
eruns
,
&
run
->
entry
);
/* Strikethrough style is guaranteed to be consistent within effective run,
/* Strikethrough style is guaranteed to be consistent within effective run,
...
@@ -2979,7 +2981,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
...
@@ -2979,7 +2981,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
This
->
measuringmode
,
This
->
measuringmode
,
&
glyph_run
,
&
glyph_run
,
&
descr
,
&
descr
,
NULL
);
run
->
effect
);
}
}
/* 2. Inline objects */
/* 2. Inline objects */
...
...
dlls/dwrite/tests/layout.c
View file @
2b5928b2
...
@@ -2998,7 +2998,7 @@ static void test_SetDrawingEffect(void)
...
@@ -2998,7 +2998,7 @@ static void test_SetDrawingEffect(void)
flush_sequence
(
sequences
,
RENDERER_ID
);
flush_sequence
(
sequences
,
RENDERER_ID
);
hr
=
IDWriteTextLayout_Draw
(
layout
,
NULL
,
&
testrenderer
,
0
.
0
,
0
.
0
);
hr
=
IDWriteTextLayout_Draw
(
layout
,
NULL
,
&
testrenderer
,
0
.
0
,
0
.
0
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok_sequence
(
sequences
,
RENDERER_ID
,
draweffect2_seq
,
"effect draw test 2"
,
TRU
E
);
ok_sequence
(
sequences
,
RENDERER_ID
,
draweffect2_seq
,
"effect draw test 2"
,
FALS
E
);
IDWriteTextLayout_Release
(
layout
);
IDWriteTextLayout_Release
(
layout
);
/* Inline object - effect set for same range */
/* Inline object - effect set for same range */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment