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

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 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));
 // ### shouldn't the ascent be used in ymin???
-ymax = qMax(ymax, si.y+si.ascent+si.descent+1);
+ymax = qMax(ymax, si.y+si.height());
 }
 return QRectF(xmin.toReal(), ymin.toReal(), (xmax-xmin).toReal(), (ymax-ymin).toReal());
 }
 /*!
 {
 const QScriptLine &line = eng->lines[lineNumber];
 QTextLineItemIterator iterator(eng, lineNumber, pos, selection);
-const QFixed y = QFixed::fromReal(pos.y()) + line.y + line.ascent;
+const qreal selectionY = pos.y() + line.y.toReal();
 const qreal lineHeight = line.height().toReal();
-const qreal selectionY = (y - line.ascent).toReal();
 QFixed lastSelectionX = iterator.x;
 QFixed lastSelectionWidth;
 while (!iterator.atEnd()) {
 const QScriptLine &sl = d->lines[line];
 const qreal x = position.x() + l.cursorToX(cursorPosition);
 int itm = d->findItem(cursorPosition - 1);
-QFixed ascent = sl.ascent;
+QFixed base = sl.base();
 QFixed descent = sl.descent;
 bool rightToLeft = (d->option.textDirection() == Qt::RightToLeft);
 if (itm >= 0) {
 const QScriptItem &si = d->layoutData->items.at(itm);
 if (si.ascent > 0)
-ascent = si.ascent;
+base = si.ascent;
 if (si.descent > 0)
 descent = si.descent;
 rightToLeft = si.analysis.bidiLevel % 2;
 }
-qreal y = position.y() + (sl.y + sl.ascent - ascent).toReal();
+qreal y = position.y() + (sl.y + sl.base() - base).toReal();
 bool toggleAntialiasing = !(p->renderHints() & QPainter::Antialiasing)
 && (p->transform().type() > QTransform::TxTranslate);
 if (toggleAntialiasing)
 p->setRenderHint(QPainter::Antialiasing);
-p->fillRect(QRectF(x, y, qreal(width), (ascent + descent).toReal()), p->pen().brush());
+p->fillRect(QRectF(x, y, qreal(width), (base + descent + 1).toReal()), p->pen().brush());
 if (toggleAntialiasing)
 p->setRenderHint(QPainter::Antialiasing, false);
 if (d->layoutData->hasBidi) {
 const int arrow_extent = 4;
 int sign = rightToLeft ? -1 : 1;
 {
 return eng->lines[i].descent.toReal();
 }
 /*!
-Returns the line's height. This is equal to ascent() + descent() + 1.
+Returns the line's height. This is equal to ascent() + descent() + 1
+if leading is not included. If leading is included, this equals to
-\sa ascent() descent()
+ascent() + descent() + leading() + 1.
+\sa ascent() descent() leading() setLeadingIncluded()
 */
 qreal QTextLine::height() const
 {
 return eng->lines[i].height().toReal();
 }
+/*!
+\since 4.6
+Returns the line's leading.
+\sa ascent() descent() height()
+*/
+qreal QTextLine::leading() const
+{
+return eng->lines[i].leading.toReal();
+}
+/*! \since 4.6
+Includes positive leading into the line's height if \a included is true;
+otherwise does not include leading.
+By default, leading is not included.
+Note that negative leading is ignored, it must be handled
+in the code using the text lines by letting the lines overlap.
+\sa leadingIncluded()
+*/
+void QTextLine::setLeadingIncluded(bool included)
+{
+eng->lines[i].leadingIncluded= included;
+}
+/*! \since 4.6
+Returns true if positive leading is included into the line's height; otherwise returns false.
+By default, leading is not included.
+\sa setLeadingIncluded()
+*/
+bool QTextLine::leadingIncluded() const
+{
+return eng->lines[i].leadingIncluded;
+}
 /*!
 Returns the width of the line that is occupied by text. This is
 always \<= to width(), and is the minimum width that could be used
 by layout() without changing the line break position.
 end = current.position + eng->length(item);
 glyphs = eng->shapedGlyphs(&current);
 }
 const QScriptItem &current = eng->layoutData->items[item];
+lbh.tmpData.leading = qMax(lbh.tmpData.leading + lbh.tmpData.ascent,
+current.leading + current.ascent) - qMax(lbh.tmpData.ascent,
+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))) {
 if (lbh.checkFullOtherwiseExtend(line))
 return;
 }
 QTextLineItemIterator iterator(eng, i, pos, selection);
-const QFixed y = QFixed::fromReal(pos.y()) + line.y + line.ascent;
+QFixed lineBase = line.base();
+const QFixed y = QFixed::fromReal(pos.y()) + line.y + lineBase;
 bool suppressColors = (eng->option.flags() & QTextOption::SuppressColors);
 while (!iterator.atEnd()) {
 QScriptItem &si = iterator.next();
 if (!suppressColors)
 format = eng->format(&si);
 if (selection)
 format.merge(selection->format);
-setPenAndDrawBackground(p, pen, format, QRectF(iterator.x.toReal(), (y - line.ascent).toReal(),
+setPenAndDrawBackground(p, pen, format, QRectF(iterator.x.toReal(), (y - lineBase).toReal(),
 iterator.itemWidth.toReal(), line.height().toReal()));
 QTextCharFormat::VerticalAlignment valign = format.verticalAlignment();
 if (valign == QTextCharFormat::AlignSuperScript || valign == QTextCharFormat::AlignSubScript) {
 QFontEngine *fe = f.d->engineForScript(si.analysis.script);
 if (eng->hasFormats()) {
 p->save();
 if (si.analysis.flags == QScriptAnalysis::Object && eng->block.docHandle()) {
 QFixed itemY = y - si.ascent;
 if (format.verticalAlignment() == QTextCharFormat::AlignTop) {
-itemY = y - line.ascent;
+itemY = y - lineBase;
 }
 QRectF itemRect(iterator.x.toReal(), itemY.toReal(), iterator.itemWidth.toReal(), si.height().toReal());
 eng->docLayout()->drawInlineObject(p, itemRect,

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7