Author: jghali
Date: Mon Apr 25 19:37:20 2016
New Revision: 21242

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21242
Log:
#13981: Text line spacing sometimes not correct

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21242&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp        (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp        Mon Apr 25 19:37:20 2016
@@ -2100,7 +2100,7 @@
                                double diff = 0;
                                if (current.startOfCol || DropCmode)
                                        diff = realAsce - (current.yPos - 
lastLineY);
-                               else if (style.lineSpacingMode() == 
ParagraphStyle::BaselineGridLineSpacing)
+                               else if (style.lineSpacingMode() != 
ParagraphStyle::FixedLineSpacing)
                                {
                                        if (HasObject)
                                                diff = (currentObject->height() 
+ currentObject->lineWidth()) * scaleV + offset - (current.yPos - lastLineY);


_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to