FCL/sf/mw/qt: comparison src/gui/text/qtextlayout.cpp

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 static inline QFixed leadingSpaceWidth(QTextEngine *eng, const QScriptLine &line)
 {
 if (!line.hasTrailingSpaces
 || (eng->option.flags() & QTextOption::IncludeTrailingSpaces)
 || !(eng->option.alignment() & Qt::AlignRight)
-|| (eng->option.textDirection() != Qt::RightToLeft))
+|| !eng->isRightToLeft())
 return QFixed();
 int pos = line.length;
 const HB_CharAttributes *attributes = eng->attributes();
 while (pos > 0 && attributes[line.from + pos - 1].whiteSpace)
 QFixed x = 0;
 eng->justify(line);
 // if width is QFIXED_MAX that means we used setNumColumns() and that implicitly makes this line left aligned.
 if (!line.justified && line.width != QFIXED_MAX) {
 int align = eng->option.alignment();
-if (align & Qt::AlignJustify && eng->option.textDirection() == Qt::RightToLeft)
+if (align & Qt::AlignJustify && eng->isRightToLeft())
 align = Qt::AlignRight;
 if (align & Qt::AlignRight)
-x = line.width - (line.textWidth + leadingSpaceWidth(eng, line));
+x = line.width - (line.textAdvance + leadingSpaceWidth(eng, line));
 else if (align & Qt::AlignHCenter)
-x = (line.width - line.textWidth)/2;
+x = (line.width - line.textAdvance)/2;
 }
 return x;
 }
 /*!
 /*!
 \class QTextLayout
 \reentrant
-\brief The QTextLayout class is used to lay out and paint a single
+\brief The QTextLayout class is used to lay out and render text.
-paragraph of text.
 \ingroup richtext-processing
-It offers most features expected from a modern text layout
+It offers many features expected from a modern text layout
 engine, including Unicode compliant rendering, line breaking and
 handling of cursor positioning. It can also produce and render
 device independent layout, something that is important for WYSIWYG
 applications.
 The class has a rather low level API and unless you intend to
 implement your own text rendering for some specialized widget, you
 probably won't need to use it directly.
-QTextLayout can currently deal with plain text and rich text
+QTextLayout can be used with both plain and rich text.
-paragraphs that are part of a QTextDocument.
+QTextLayout can be used to create a sequence of QTextLine
-QTextLayout can be used to create a sequence of QTextLine's with
+instances with given widths and can position them independently
-given widths and can position them independently on the screen.
+on the screen. Once the layout is done, these lines can be drawn
-Once the layout is done, these lines can be drawn on a paint
+on a paint device.
-device.
+The text to be laid out can be provided in the constructor or set with
-Here's some code snippet that presents the layout phase:
+setText().
+The layout can be seen as a sequence of QTextLine objects; use createLine()
+to create a QTextLine instance, and lineAt() or lineForTextPosition() to retrieve
+created lines.
+Here is a code snippet that demonstrates the layout phase:
 \snippet doc/src/snippets/code/src_gui_text_qtextlayout.cpp 0
-The text can be drawn by calling the layout's draw() function:
+The text can then be rendered by calling the layout's draw() function:
 \snippet doc/src/snippets/code/src_gui_text_qtextlayout.cpp 1
-The text layout's text is set in the constructor or with
+For a given position in the text you can find a valid cursor position with
-setText(). The layout can be seen as a sequence of QTextLine
+isValidCursorPosition(), nextCursorPosition(), and previousCursorPosition().
-objects; use lineAt() or lineForTextPosition() to get a QTextLine,
-createLine() to create one. For a given position in the text you
+The QTextLayout itself can be positioned with setPosition(); it has a
-can find a valid cursor position with isValidCursorPosition(),
+boundingRect(), and a minimumWidth() and a maximumWidth().
-nextCursorPosition(), and previousCursorPosition(). The layout
-itself can be positioned with setPosition(); it has a
+\sa QStaticText
-boundingRect(), and a minimumWidth() and a maximumWidth(). A text
-layout can be drawn on a painter device using draw().
 */
 /*!
 \enum QTextLayout::CursorMode
 for (int i = 0; i < d->lines.size(); ++i) {
 const QScriptLine &si = d->lines[i];
 xmin = qMin(xmin, si.x);
 ymin = qMin(ymin, si.y);
-xmax = qMax(xmax, si.x+qMax(si.width, si.textWidth));
+QFixed lineWidth = si.width < QFIXED_MAX ? qMax(si.width, si.textWidth) : si.textWidth;
+xmax = qMax(xmax, si.x+lineWidth);
 // ### shouldn't the ascent be used in ymin???
 ymax = qMax(ymax, si.y+si.height());
 }
 return QRectF(xmin.toReal(), ymin.toReal(), (xmax-xmin).toReal(), (ymax-ymin).toReal());
 }
 qreal x = position.x() + l.cursorToX(cursorPosition);
 int itm = d->findItem(cursorPosition - 1);
 QFixed base = sl.base();
 QFixed descent = sl.descent;
-bool rightToLeft = (d->option.textDirection() == Qt::RightToLeft);
+bool rightToLeft = d->isRightToLeft();
 if (itm >= 0) {
 const QScriptItem &si = d->layoutData->items.at(itm);
 if (si.ascent > 0)
 base = si.ascent;
 if (si.descent > 0)
 struct LineBreakHelper
 {
 LineBreakHelper()
 : glyphCount(0), maxGlyphs(0), currentPosition(0), fontEngine(0), logClusters(0),
-manualWrap(false)
+manualWrap(false), whiteSpaceOrObject(true)
 {
 }
 QScriptLine tmpData;
 QFontEngine *fontEngine;
 const unsigned short *logClusters;
 bool manualWrap;
+bool whiteSpaceOrObject;
 bool checkFullOtherwiseExtend(QScriptLine &line);
 QFixed calculateNewWidth(const QScriptLine &line) const {
 return line.textWidth + tmpData.textWidth + spaceData.textWidth + softHyphenWidth
 - qMin(rightBearing, QFixed());
 }
 inline glyph_t currentGlyph() const
 {
 Q_ASSERT(currentPosition > 0);
+Q_ASSERT(logClusters[currentPosition - 1] < glyphs.numGlyphs);
 return glyphs.glyphs[logClusters[currentPosition - 1]];
 }
 inline void adjustRightBearing()
 {
 current.ascent);
 lbh.tmpData.ascent = qMax(lbh.tmpData.ascent, current.ascent);
 lbh.tmpData.descent = qMax(lbh.tmpData.descent, current.descent);
 if (current.analysis.flags == QScriptAnalysis::Tab && (alignment & (Qt::AlignLeft | Qt::AlignRight | Qt::AlignCenter | Qt::AlignJustify))) {
+lbh.whiteSpaceOrObject = true;
 if (lbh.checkFullOtherwiseExtend(line))
 goto found;
 QFixed x = line.x + line.textWidth + lbh.tmpData.textWidth + lbh.spaceData.textWidth;
 QFixed tabWidth = eng->calculateTabWidth(item, x);
 lbh.glyphCount += qRound(tabWidth / averageCharWidth);
 if (lbh.checkFullOtherwiseExtend(line))
 goto found;
 } else if (current.analysis.flags == QScriptAnalysis::LineOrParagraphSeparator) {
+lbh.whiteSpaceOrObject = true;
 // if the line consists only of the line separator make sure
 // we have a sane height
 if (!line.length && !lbh.tmpData.length)
 line.setDefaultHeight(eng);
 if (eng->option.flags() & QTextOption::ShowLineAndParagraphSeparators) {
 lbh.tmpData.length++;
 }
 line += lbh.tmpData;
 goto found;
 } else if (current.analysis.flags == QScriptAnalysis::Object) {
+lbh.whiteSpaceOrObject = true;
 lbh.tmpData.length++;
 QTextFormat format = eng->formats()->format(eng->formatIndex(&eng->layoutData->items[item]));
 if (eng->block.docHandle())
 eng->docLayout()->positionInlineObject(QTextInlineObject(item, eng), eng->block.position() + current.position, format);
 newItem = item + 1;
 ++lbh.glyphCount;
 if (lbh.checkFullOtherwiseExtend(line))
 goto found;
 } else if (attributes[lbh.currentPosition].whiteSpace) {
+lbh.whiteSpaceOrObject = true;
 while (lbh.currentPosition < end && attributes[lbh.currentPosition].whiteSpace)
 addNextCluster(lbh.currentPosition, end, lbh.spaceData, lbh.glyphCount,
 current, lbh.logClusters, lbh.glyphs);
 if (!lbh.manualWrap && lbh.spaceData.textWidth > line.width) {
 lbh.spaceData.textWidth = line.width; // ignore spaces that fall out of the line.
 goto found;
 }
 } else {
+lbh.whiteSpaceOrObject = false;
 bool sb_or_ws = false;
 do {
 addNextCluster(lbh.currentPosition, end, lbh.tmpData, lbh.glyphCount,
 current, lbh.logClusters, lbh.glyphs);
 // of the advance of the glyph, the bearing will be negative. We flip the sign
 // for the code to be more readable. Logic borrowed from qfontmetrics.cpp.
 // We ignore the right bearing if the minimum negative bearing is too little to
 // expand the text beyond the edge.
 if (sb_or_ws|breakany) {
-if (lbh.calculateNewWidth(line) + lbh.minimumRightBearing > line.width)
+if (lbh.calculateNewWidth(line) - lbh.minimumRightBearing > line.width)
 lbh.adjustRightBearing();
 if (lbh.checkFullOtherwiseExtend(line)) {
 if (!breakany) {
 line.textWidth += lbh.softHyphenWidth;
 }
 newItem = item + 1;
 }
 LB_DEBUG("reached end of line");
 lbh.checkFullOtherwiseExtend(line);
 found:
-if (lbh.rightBearing > 0) // If right bearing has not yet been adjusted
+if (lbh.rightBearing > 0 && !lbh.whiteSpaceOrObject) // If right bearing has not yet been adjusted
 lbh.adjustRightBearing();
 line.textAdvance = line.textWidth;
 line.textWidth -= qMin(QFixed(), lbh.rightBearing);
 if (line.length == 0) {

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613