r18523 by craig - #11758: Apply Cezary's patch

scribus-commit scribus-commit at lists.scribus.net
Thu Oct 3 20:31:17 UTC 2013


Author: craig
Date: Thu Oct  3 20:31:17 2013
New Revision: 18523

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18523
Log:
#11758: Apply Cezary's patch

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18523&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Thu Oct  3 20:31:17 2013
@@ -2164,7 +2164,7 @@
 
 //						regionMinY = static_cast<int>(floor(maxYAsc));
 //						regionMaxY = static_cast<int>(floor(maxYDesc));
-						regionMinY = static_cast<int>(floor(current.yPos - (asce + offset)));
+						regionMinY = qMax(0,static_cast<int>(floor(current.yPos - (asce + offset))));
 						regionMaxY = static_cast<int>(floor(current.yPos + desc));
 
 						pt.moveTopLeft(QPoint(static_cast<int>(floor(current.xPos)), regionMinY));
@@ -2972,7 +2972,7 @@
 
 //			regionMinY = static_cast<int>(floor(maxYAsc));
 //			regionMaxY = static_cast<int>(floor(maxYDesc));
-			regionMinY = static_cast<int>(floor(current.yPos - (asce + offset)));
+			regionMinY = qMax(0,static_cast<int>(floor(current.yPos - (asce + offset))));
 			regionMaxY = static_cast<int>(floor(current.yPos + desc));
 
 			EndX = current.endOfLine(m_availableRegion, style.rightMargin(), regionMinY, regionMaxY);




More information about the scribus-commit mailing list