r21177 by jghali -

[scribus-commit]

Author: jghali
Date: Sat Apr  9 16:04:06 2016
New Revision: 21177

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21177
Log:
#13933: Bottom-aligned text frames do not respect the bottom margin

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21177&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sat Apr  9 16:04:06 2016
@@ -2929,7 +2929,7 @@
 	MaxChars = itemText.length();
 	if ((verticalAlign > 0) && (NextBox == NULL))
 	{
-		double hAdjust = height() - textLayout.box()->naturalHeight();
+		double hAdjust = height() - textLayout.box()->naturalHeight() - m_textDistanceMargins.bottom();
 		if (hAdjust > 0)
 		{
 			if (verticalAlign == 1)