r21422 by jghali -

[scribus-commit]

Author: jghali
Date: Mon Jul 25 22:33:02 2016
New Revision: 21422

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21422
Log:
#14236: empty first line has funky offsets

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21422&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Mon Jul 25 22:33:02 2016
@@ -1888,9 +1888,6 @@
 					if (current.startOfCol)
 					{
 						lastLineY = qMax(lastLineY, m_textDistanceMargins.top() + lineCorr);
-						//fix for proper rendering first empty line (only with PARSEP)
-						if (itemText.text(a) == SpecialChars::PARSEP)
-							current.yPos += style.lineSpacing();
 						if (style.lineSpacingMode() == ParagraphStyle::BaselineGridLineSpacing || FlopBaseline)
 						{
 							if (current.yPos <= lastLineY)
@@ -1906,7 +1903,7 @@
 						{
 							if (firstLineOffset() == FLOPRealGlyphHeight)
 							{
-								if (DropCmode)
+								if (DropCmode || (itemText.text(a) == SpecialChars::PARSEP))
 									current.yPos += asce;
 								else
 									current.yPos += realAsce;