summaryrefslogtreecommitdiffstats
path: root/scribus/pageitem_textframe.cpp
diff options
context:
space:
mode:
authorjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-01-05 21:49:14 +0000
committerjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-01-05 21:49:14 +0000
commita02b1b530a9b0c41ea40cf2d9c5f069eb500df30 (patch)
tree1d76f395661d2095132ed6030ec81189999399ad /scribus/pageitem_textframe.cpp
parentf115870d36585d4774f563ddb0498bc4521e09e9 (diff)
downloadscribus-a02b1b530a9b0c41ea40cf2d9c5f069eb500df30.tar.gz
scribus-a02b1b530a9b0c41ea40cf2d9c5f069eb500df30.tar.xz
scribus-a02b1b530a9b0c41ea40cf2d9c5f069eb500df30.zip
#10484: Align Text Right doesn't work in some situations
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17182 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/pageitem_textframe.cpp')
-rw-r--r--scribus/pageitem_textframe.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/scribus/pageitem_textframe.cpp b/scribus/pageitem_textframe.cpp
index ea9114b..890d7ef 100644
--- a/scribus/pageitem_textframe.cpp
+++ b/scribus/pageitem_textframe.cpp
@@ -2301,6 +2301,7 @@ void PageItem_TextFrame::layout()
}
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);