r21788 by jghali - #14632: "Adjust text frame height to text" does not take margins into account

[scribus-commit]

Author: jghali
Date: Sat Feb 18 21:06:36 2017
New Revision: 21788

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21788
Log:
#14632: "Adjust text frame height to text" does not take margins into account

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21788&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sat Feb 18 21:06:36 2017
@@ -5882,6 +5882,7 @@
 	{
 		textLayout.box()->moveTo(textLayout.box()->x(), 0);
 		double newHeight = textLayout.box()->naturalHeight();
+		newHeight += m_textDistanceMargins.bottom();
 
 		UndoTransaction undoTransaction;
 		if (UndoManager::undoEnabled())