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
e27a13e3
Commit
e27a13e3
authored
Jun 29, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 29, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Always set canWrapLineAfter for last cluster.
parent
1002119a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
layout.c
dlls/dwrite/layout.c
+4
-1
layout.c
dlls/dwrite/tests/layout.c
+0
-4
No files found.
dlls/dwrite/layout.c
View file @
e27a13e3
...
...
@@ -825,8 +825,11 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout)
break
;
}
if
(
hr
==
S_OK
)
if
(
hr
==
S_OK
)
{
layout
->
cluster_count
=
cluster
;
if
(
cluster
)
layout
->
clustermetrics
[
cluster
-
1
].
canWrapLineAfter
=
TRUE
;
}
IDWriteTextAnalyzer_Release
(
analyzer
);
return
hr
;
...
...
dlls/dwrite/tests/layout.c
View file @
e27a13e3
...
...
@@ -1659,7 +1659,6 @@ todo_wine
ok
(
metrics
[
2
].
width
>
0
.
0
,
"got %.2f
\n
"
,
metrics
[
2
].
width
);
ok
(
metrics
[
2
].
length
==
1
,
"got %d
\n
"
,
metrics
[
2
].
length
);
todo_wine
ok
(
metrics
[
2
].
canWrapLineAfter
==
1
,
"got %d
\n
"
,
metrics
[
2
].
canWrapLineAfter
);
ok
(
metrics
[
2
].
isWhitespace
==
0
,
"got %d
\n
"
,
metrics
[
2
].
isWhitespace
);
ok
(
metrics
[
2
].
isNewline
==
0
,
"got %d
\n
"
,
metrics
[
2
].
isNewline
);
...
...
@@ -1686,7 +1685,6 @@ todo_wine
/* object sets a width to 123.0, but returns failure from GetMetrics() */
ok
(
metrics
[
0
].
width
==
0
.
0
,
"got %.2f
\n
"
,
metrics
[
0
].
width
);
ok
(
metrics
[
0
].
length
==
4
,
"got %d
\n
"
,
metrics
[
0
].
length
);
todo_wine
ok
(
metrics
[
0
].
canWrapLineAfter
==
1
,
"got %d
\n
"
,
metrics
[
0
].
canWrapLineAfter
);
ok
(
metrics
[
0
].
isWhitespace
==
0
,
"got %d
\n
"
,
metrics
[
0
].
isWhitespace
);
ok
(
metrics
[
0
].
isNewline
==
0
,
"got %d
\n
"
,
metrics
[
0
].
isNewline
);
...
...
@@ -1715,7 +1713,6 @@ todo_wine
ok
(
metrics
[
1
].
width
==
0
.
0
,
"got %.2f
\n
"
,
metrics
[
1
].
width
);
ok
(
metrics
[
1
].
length
==
2
,
"got %d
\n
"
,
metrics
[
1
].
length
);
todo_wine
ok
(
metrics
[
1
].
canWrapLineAfter
==
1
,
"got %d
\n
"
,
metrics
[
1
].
canWrapLineAfter
);
ok
(
metrics
[
1
].
isWhitespace
==
0
,
"got %d
\n
"
,
metrics
[
1
].
isWhitespace
);
ok
(
metrics
[
1
].
isNewline
==
0
,
"got %d
\n
"
,
metrics
[
1
].
isNewline
);
...
...
@@ -1763,7 +1760,6 @@ todo_wine
hr
=
IDWriteTextLayout_GetClusterMetrics
(
layout
,
metrics
,
2
,
&
count
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
count
==
1
,
"got %u
\n
"
,
count
);
todo_wine
ok
(
metrics
[
0
].
canWrapLineAfter
==
1
,
"got %d
\n
"
,
metrics
[
0
].
canWrapLineAfter
);
IDWriteTextLayout_Release
(
layout
);
...
...
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