Author: jghali
Date: Tue Jul 4 11:59:53 2017
New Revision: 22097
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22097
Log:
#14894: Inserting Column-Break results in immediate crash
Modified:
trunk/Scribus/scribus/text/textlayout.cpp
Modified: trunk/Scribus/scribus/text/textlayout.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22097&path=/trunk/Scribus/scribus/text/textlayout.cpp
==============================================================================
--- trunk/Scribus/scribus/text/textlayout.cpp (original)
+++ trunk/Scribus/scribus/text/textlayout.cpp Tue Jul 4 11:59:53 2017
@@ -303,28 +303,41 @@
// TODO: move this branch to GroupBox::positionToPoint()
// last glyph box in last line
Box* column = m_box->boxes().last();
- Box* line = column->boxes().last();
- Box* glyph = line->boxes().empty()? NULL :
line->boxes().last();
- QChar ch = story()->text(line->lastChar());
- if (ch == SpecialChars::PARSEP || ch ==
SpecialChars::LINEBREAK)
+ if (column->boxes().count() > 0)
{
- // last character is a newline, draw the cursor
on the next line.
- if (isRTL)
- x = line->width();
+ Box* line = column->boxes().last();
+ Box* glyph = line->boxes().empty() ? NULL :
line->boxes().last();
+ QChar ch = story()->text(line->lastChar());
+ if (ch == SpecialChars::PARSEP || ch ==
SpecialChars::LINEBREAK)
+ {
+ // last character is a newline, draw
the cursor on the next line.
+ if (isRTL)
+ x = line->width();
+ else
+ x = 1;
+ y1 = line->y() + line->height();
+ y2 = y1 + line->height();
+ }
else
- x = 1;
- y1 = line->y() + line->height();
- y2 = y1 + line->height();
+ {
+ // draw the cursor at the end of last
line.
+ if (isRTL || glyph == NULL)
+ x = line->x();
+ else
+ x = line->x() + glyph->x() +
glyph->width();
+ y1 = line->y();
+ y2 = y1 + line->height();
+ }
}
else
{
- // draw the cursor at the end of last line.
- if (isRTL || glyph == NULL)
- x = line->x();
+ const ParagraphStyle&
pstyle(story()->paragraphStyle(qMin(pos, story()->length())));
+ if (isRTL)
+ x = column->width();
else
- x = line->x() + glyph->x() +
glyph->width();
- y1 = line->y();
- y2 = y1 + line->height();
+ x = 1;
+ y1 = 0;
+ y2 = pstyle.lineSpacing();
}
result.setLine(x, y1, x, y2);
result.translate(column->x(), column->y());
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
