r14417 by jghali - #8642 : inconsistent use of gWidth versus Width when laying out lines with inline frames
scribus-commit
scribus-commit at lists.scribus.net
Wed Dec 16 01:20:20 CET 2009
Revision: 14417
Author: jghali
Date: 2009-12-15T12:58:49.525835Z
Commit message: #8642 : inconsistent use of gWidth versus Width when laying out lines with inline frames
Changeset:
M /trunk/Scribus/scribus/pageitem_textframe.cpp
Diffs:
Index: scribus/pageitem_textframe.cpp
===================================================================
--- scribus/pageitem_textframe.cpp (revision 14416)
+++ scribus/pageitem_textframe.cpp (revision 14417)
@@ -1133,7 +1133,10 @@
oldCurY = layoutGlyphs(*hl, chstr, hl->glyph);
// find out width of char
if ((hl->ch == SpecialChars::OBJECT) && (hl->embedded.hasItem()))
+ {
wide = hl->embedded.getItem()->gWidth + hl->embedded.getItem()->lineWidth();
+ hl->glyph.xadvance = wide;
+ }
else
{
wide = hl->glyph.wide();
More information about the scribus-commit
mailing list