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
cc49c40f
Commit
cc49c40f
authored
Aug 24, 2017
by
Nikolay Sivov
Committed by
Alexandre Julliard
Aug 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Set leading text alignment for default trimming sign.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d58166d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
0 deletions
+22
-0
layout.c
dlls/dwrite/layout.c
+2
-0
layout.c
dlls/dwrite/tests/layout.c
+20
-0
No files found.
dlls/dwrite/layout.c
View file @
cc49c40f
...
...
@@ -5148,6 +5148,8 @@ HRESULT create_trimmingsign(IDWriteFactory5 *factory, IDWriteTextFormat *format,
IDWriteTextLayout_SetWordWrapping
(
This
->
layout
,
DWRITE_WORD_WRAPPING_NO_WRAP
);
IDWriteTextLayout_SetParagraphAlignment
(
This
->
layout
,
DWRITE_PARAGRAPH_ALIGNMENT_NEAR
);
IDWriteTextLayout_SetTextAlignment
(
This
->
layout
,
DWRITE_TEXT_ALIGNMENT_LEADING
);
*
sign
=
&
This
->
IDWriteInlineObject_iface
;
return
S_OK
;
...
...
dlls/dwrite/tests/layout.c
View file @
cc49c40f
...
...
@@ -1237,6 +1237,7 @@ static void test_CreateEllipsisTrimmingSign(void)
static
const
WCHAR
engbW
[]
=
{
'e'
,
'n'
,
'-'
,
'G'
,
'B'
,
0
};
DWRITE_INLINE_OBJECT_METRICS
metrics
;
DWRITE_BREAK_CONDITION
before
,
after
;
struct
renderer_context
ctxt
;
IDWriteTextFormat
*
format
;
IDWriteInlineObject
*
sign
;
IDWriteFactory
*
factory
;
...
...
@@ -1300,6 +1301,25 @@ if (0) {/* crashes on native */
ok
(
hr
==
S_OK
,
"Failed to draw trimming sign, hr %#x.
\n
"
,
hr
);
ok_sequence
(
sequences
,
RENDERER_ID
,
drawellipsis_seq
,
"ellipsis sign draw with effect test"
,
FALSE
);
memset
(
&
ctxt
,
0
,
sizeof
(
ctxt
));
hr
=
IDWriteInlineObject_Draw
(
sign
,
&
ctxt
,
&
testrenderer
,
123
.
0
f
,
456
.
0
f
,
FALSE
,
FALSE
,
NULL
);
ok
(
hr
==
S_OK
,
"Failed to draw trimming sign, hr %#x.
\n
"
,
hr
);
ok
(
ctxt
.
originX
==
123
.
0
f
&&
ctxt
.
originY
==
456
.
0
f
,
"Unexpected drawing origin
\n
"
);
IDWriteInlineObject_Release
(
sign
);
/* Centered format */
hr
=
IDWriteTextFormat_SetTextAlignment
(
format
,
DWRITE_TEXT_ALIGNMENT_CENTER
);
ok
(
hr
==
S_OK
,
"Failed to set text alignment, hr %#x.
\n
"
,
hr
);
hr
=
IDWriteFactory_CreateEllipsisTrimmingSign
(
factory
,
format
,
&
sign
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
memset
(
&
ctxt
,
0
,
sizeof
(
ctxt
));
hr
=
IDWriteInlineObject_Draw
(
sign
,
&
ctxt
,
&
testrenderer
,
123
.
0
f
,
456
.
0
f
,
FALSE
,
FALSE
,
NULL
);
ok
(
hr
==
S_OK
,
"Failed to draw trimming sign, hr %#x.
\n
"
,
hr
);
ok
(
ctxt
.
originX
==
123
.
0
f
&&
ctxt
.
originY
==
456
.
0
f
,
"Unexpected drawing origin
\n
"
);
IDWriteInlineObject_Release
(
sign
);
/* non-orthogonal flow/reading combination */
...
...
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