Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
7020f47e
Commit
7020f47e
authored
Sep 14, 2017
by
Huw Davies
Committed by
Alexandre Julliard
Sep 14, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
riched20: Don't scale the picture size with dpi.
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e5345825
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
13 deletions
+10
-13
richole.c
dlls/riched20/richole.c
+10
-13
No files found.
dlls/riched20/richole.c
View file @
7020f47e
...
...
@@ -5294,6 +5294,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected)
SIZE
sz
;
BOOL
has_size
;
HBITMAP
old_bm
;
RECT
rc
;
assert
(
run
->
nFlags
&
MERF_GRAPHICS
);
assert
(
run
->
ole_obj
);
...
...
@@ -5331,8 +5332,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected)
{
convert_sizel
(
c
,
&
run
->
ole_obj
->
sizel
,
&
sz
);
}
else
{
sz
.
cx
=
MulDiv
(
dibsect
.
dsBm
.
bmWidth
,
c
->
dpi
.
cx
,
96
)
;
sz
.
cy
=
MulDiv
(
dibsect
.
dsBm
.
bmHeight
,
c
->
dpi
.
cy
,
96
)
;
sz
.
cx
=
dibsect
.
dsBm
.
bmWidth
;
sz
.
cy
=
dibsect
.
dsBm
.
bmHeight
;
}
if
(
c
->
editor
->
nZoomNumerator
!=
0
)
{
...
...
@@ -5351,8 +5352,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected)
{
convert_sizel
(
c
,
&
run
->
ole_obj
->
sizel
,
&
sz
);
}
else
{
sz
.
c
y
=
MulDiv
(
emh
.
rclBounds
.
bottom
-
emh
.
rclBounds
.
top
,
c
->
dpi
.
cx
,
96
)
;
sz
.
c
x
=
MulDiv
(
emh
.
rclBounds
.
right
-
emh
.
rclBounds
.
left
,
c
->
dpi
.
cy
,
96
)
;
sz
.
c
x
=
emh
.
rclBounds
.
right
-
emh
.
rclBounds
.
left
;
sz
.
c
y
=
emh
.
rclBounds
.
bottom
-
emh
.
rclBounds
.
top
;
}
if
(
c
->
editor
->
nZoomNumerator
!=
0
)
{
...
...
@@ -5360,15 +5361,11 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected)
sz
.
cy
=
MulDiv
(
sz
.
cy
,
c
->
editor
->
nZoomNumerator
,
c
->
editor
->
nZoomDenominator
);
}
{
RECT
rc
;
rc
.
left
=
x
;
rc
.
top
=
y
-
sz
.
cy
;
rc
.
right
=
x
+
sz
.
cx
;
rc
.
bottom
=
y
;
PlayEnhMetaFile
(
c
->
hDC
,
stgm
.
u
.
hEnhMetaFile
,
&
rc
);
}
rc
.
left
=
x
;
rc
.
top
=
y
-
sz
.
cy
;
rc
.
right
=
x
+
sz
.
cx
;
rc
.
bottom
=
y
;
PlayEnhMetaFile
(
c
->
hDC
,
stgm
.
u
.
hEnhMetaFile
,
&
rc
);
break
;
default:
FIXME
(
"Unsupported tymed %d
\n
"
,
stgm
.
tymed
);
...
...
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