anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert previous change as it's bollocks. Herbert, your infallibility is

Browse Source 
no-more ;-)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4103 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-05-01 11:12:02 +00:00
parent 7d3e67edc5
commit c83a7a13b8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/graphics/ChangeLog
View File

@ -1,8 +1,3 @@
2002-05-01 Herbert Voss <voss@lyx.org>
* GraphicsParams.C (GParams c-tor): use LyXLength::inBP rather than
LyXLength::inPixels + scaling factor.
2002-04-28 John Levon <moz@compsoc.man.ac.uk> 2002-04-28 John Levon <moz@compsoc.man.ac.uk>
* GraphicsImageXPM.C: understand convert's use of "opaque" * GraphicsImageXPM.C: understand convert's use of "opaque"

10
src/graphics/GraphicsParams.C
View File

@ -103,9 +103,15 @@ GParams::GParams(InsetGraphicsParams const & iparams, string const & filepath)
} else if (iparams.lyxsize_type == InsetGraphicsParams::WH) { } else if (iparams.lyxsize_type == InsetGraphicsParams::WH) {
if (!iparams.lyxwidth.zero()) if (!iparams.lyxwidth.zero())
width = iparams.lyxwidth.inBP(); width = iparams.lyxwidth.inPixels(1, 1);
if (!iparams.lyxheight.zero()) if (!iparams.lyxheight.zero())
height = iparams.lyxheight.inBP(); height = iparams.lyxheight.inPixels(1, 1);
// inPixels returns a value scaled by lyxrc.zoom.
// We want, therefore, to undo this.
double const scaling_factor = 100.0 / double(lyxrc.zoom);
width = uint(scaling_factor * width);
height = uint(scaling_factor * height);
} }
} }