r21347 by jghali -

[scribus-commit]

Author: jghali
Date: Sun May 22 14:14:10 2016
New Revision: 21347

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21347
Log:
fix dropcap being sometime incorrectly layouted in first paragraph of linked frame

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21347&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sun May 22 14:14:10 2016
@@ -1659,7 +1659,7 @@
 					if (DropCmode && !current.afterOverflow)
 					{
 						DropLines = style.dropCapLines();
-						DropCapDrop = calculateLineSpacing (style, this) * (DropLines - 1);
+//						DropCapDrop = calculateLineSpacing (style, this) * (DropLines - 1);
 //						qDebug() << QString("dropcapdrop: y=%1+%2").arg(current.yPos).arg(DropCapDrop);
 					}
 					current.line.isFirstLine = true;
@@ -1668,7 +1668,7 @@
 			// find charsize factors
 			if (DropCmode)
 			{
-//				DropCapDrop = calculateLineSpacing (style, this) * (DropLines - 1);
+				DropCapDrop = calculateLineSpacing (style, this) * (DropLines - 1);
 
 				// FIXME : we should ensure that fonts are loaded before calls to layout()
 				// ScFace::realCharHeight()/Ascent() ensure font is loaded thanks to an indirect call to char2CMap()