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
08c15246
Commit
08c15246
authored
Feb 19, 2018
by
Huw Davies
Committed by
Alexandre Julliard
Feb 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
riched20: Return the underline pen as the return value.
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ff8fba38
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
paint.c
dlls/riched20/paint.c
+5
-8
No files found.
dlls/riched20/paint.c
View file @
08c15246
...
...
@@ -216,9 +216,8 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight )
return
color
;
}
static
void
get_underline_pen
(
ME_Style
*
style
,
COLORREF
color
,
HPEN
*
pen
)
static
HPEN
get_underline_pen
(
ME_Style
*
style
,
COLORREF
color
)
{
*
pen
=
NULL
;
/* Choose the pen type for underlining the text. */
if
(
style
->
fmt
.
dwEffects
&
CFE_UNDERLINE
)
{
...
...
@@ -227,11 +226,9 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen )
case
CFU_UNDERLINE
:
case
CFU_UNDERLINEWORD
:
/* native seems to map it to simple underline (MSDN) */
case
CFU_UNDERLINEDOUBLE
:
/* native seems to map it to simple underline (MSDN) */
*
pen
=
CreatePen
(
PS_SOLID
,
1
,
color
);
break
;
return
CreatePen
(
PS_SOLID
,
1
,
color
);
case
CFU_UNDERLINEDOTTED
:
*
pen
=
CreatePen
(
PS_DOT
,
1
,
color
);
break
;
return
CreatePen
(
PS_DOT
,
1
,
color
);
default:
FIXME
(
"Unknown underline type (%u)
\n
"
,
style
->
fmt
.
bUnderlineType
);
/* fall through */
...
...
@@ -240,14 +237,14 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen )
break
;
}
}
return
;
return
NULL
;
}
static
void
draw_underline
(
ME_Context
*
c
,
ME_Run
*
run
,
int
x
,
int
y
,
COLORREF
color
)
{
HPEN
pen
;
get_underline_pen
(
run
->
style
,
color
,
&
pen
);
pen
=
get_underline_pen
(
run
->
style
,
color
);
if
(
pen
)
{
HPEN
old_pen
=
SelectObject
(
c
->
hDC
,
pen
);
...
...
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