r17183 by jghali - #10484: Align Text Right doesn't work in some situations

scribus-commit scribus-commit at lists.scribus.net
Thu Jan 5 21:50:18 UTC 2012


Author: jghali
Date: Thu Jan  5 21:50:18 2012
New Revision: 17183

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17183
Log:
#10484: Align Text Right doesn't work in some situations

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17183&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Thu Jan  5 21:50:18 2012
@@ -2526,6 +2526,7 @@
 			}
 			else
 				maxYAsc = static_cast<int>(floor(current.yPos - qMax(realAsce, asce)));
+			maxYAsc = qMax(maxYAsc, 0);
 			maxYDesc = static_cast<int>(ceil(current.yPos + qMax(realDesc, desc)));
 
 			EndX = current.endOfLine(cl, style.rightMargin(), maxYAsc, maxYDesc);




More information about the scribus-commit mailing list