r24022 by jghali - Revert changes introduced incorrectly in previous commit

[scribus-commit]

Author: jghali
Date: Tue Sep 15 21:45:23 2020
New Revision: 24022

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24022
Log:
Revert changes introduced incorrectly in previous commit

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24022&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Tue Sep 15 21:45:23 2020
@@ -1923,24 +1923,24 @@
 						else
 							current.yPos += (current.startOfCol ? 1 : style.lineSpacing());
 						lastLineY = maxYAsc;
-						/*if (current.startOfCol)
+						if (current.startOfCol)
 						{
-							double addAsce;
-							if (DropCmode)
-								addAsce = qMax(realAsce, asce + offset);
-							else
-								addAsce = asce + offset;
-							if (style.lineSpacingMode() != ParagraphStyle::BaselineGridLineSpacing)
-							{
-								if (firstLineOffset() == FLOPRealGlyphHeight)
-									addAsce = realAsce;
-								else if (firstLineOffset() == FLOPLineSpacing)
-									addAsce = style.lineSpacing();
-							}
+//							double addAsce;
+//							if (DropCmode)
+//								addAsce = qMax(realAsce, asce + offset);
+//							else
+//								addAsce = asce + offset;
+//							if (style.lineSpacingMode() != ParagraphStyle::BaselineGridLineSpacing)
+//							{
+//								if (firstLineOffset() == FLOPRealGlyphHeight)
+//									addAsce = realAsce;
+//								else if (firstLineOffset() == FLOPLineSpacing)
+//									addAsce = style.lineSpacing() + offset;
+//							}
 							maxYAsc = current.yPos - addAsce;
 						}
 						else
-							maxYAsc = current.yPos - realAsce;*/
+							maxYAsc = current.yPos - realAsce;
 						maxYDesc = current.yPos + realDesc;
 
 						if (style.lineSpacingMode() == ParagraphStyle::AutomaticLineSpacing)