r14425 by jghali - #8642 (2nd round) : inconsistent use of gWidth versus Width when laying out lines with inline frames Adjust glyph advance when glyph horizontal scaling is applied

[scribus-commit]

Revision: 14425
Author: jghali
Date: 2009-12-17T10:56:32.719616Z
Commit message: #8642 (2nd round) : inconsistent use of gWidth versus Width when laying out lines with inline frames
Adjust glyph advance when glyph horizontal scaling is applied

Changeset: 
M  /branches/Version135/Scribus/scribus/pageitem_textframe.cpp

Diffs:
Index: scribus/pageitem_textframe.cpp
===================================================================
--- scribus/pageitem_textframe.cpp	(revision 14424)
+++ scribus/pageitem_textframe.cpp	(revision 14425)
@@ -1136,7 +1136,7 @@
 			if ((hl->ch == SpecialChars::OBJECT) && (hl->embedded.hasItem()))
 			{
 				wide = hl->embedded.getItem()->gWidth + hl->embedded.getItem()->lineWidth();
-				hl->glyph.xadvance = wide;
+				hl->glyph.xadvance = wide * hl->glyph.scaleH;
 			}
 			else
 			{