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

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 metrics that are compatible with a certain paint device.
 */
 QFontMetrics::QFontMetrics(const QFont &font)
 : d(font.d.data())
 {
-d->ref.ref();
 }
 /*!
 Constructs a font metrics object for \a font and \a paintdevice.
 d = new QFontPrivate(*font.d);
 d->dpi = dpi;
 d->screen = screen;
 } else {
 d = font.d.data();
-d->ref.ref();
 }
 }
 /*!
 Constructs a copy of \a fm.
 */
 QFontMetrics::QFontMetrics(const QFontMetrics &fm)
-: d(fm.d)
+: d(fm.d.data())
-{ d->ref.ref(); }
+{
+}
 /*!
 Destroys the font metrics object and frees all allocated
 resources.
 */
 QFontMetrics::~QFontMetrics()
 {
-if (!d->ref.deref())
-delete d;
 }
 /*!
 Assigns the font metrics \a fm.
 */
 QFontMetrics &QFontMetrics::operator=(const QFontMetrics &fm)
 {
-qAtomicAssign(d, fm.d);
+d = fm.d.data();
 return *this;
 }
 /*!
 \overload
 len = text.length();
 }
 if (len == 0)
 return 0;
-QTextEngine layout(text, d);
+QTextEngine layout(text, d.data());
 layout.ignoreBidi = true;
 return qRound(layout.width(0, len));
 }
 /*!
 if (script != QUnicodeTables::Common) {
 // complex script shaping. Have to do some hard work
 int from = qMax(0, pos - 8);
 int to = qMin(text.length(), pos + 8);
 QString cstr = QString::fromRawData(text.unicode() + from, to - from);
-QTextEngine layout(cstr, d);
+QTextEngine layout(cstr, d.data());
 layout.ignoreBidi = true;
 layout.itemize();
 width = qRound(layout.width(pos-from, 1));
 } else if (QChar::category(ch.unicode()) == QChar::Mark_NonSpacing) {
 width = 0;
 QRect QFontMetrics::boundingRect(const QString &text) const
 {
 if (text.length() == 0)
 return QRect();
-QTextEngine layout(text, d);
+QTextEngine layout(text, d.data());
 layout.ignoreBidi = true;
 layout.itemize();
 glyph_metrics_t gm = layout.boundingBox(0, text.length());
 return QRect(qRound(gm.x), qRound(gm.y), qRound(gm.width), qRound(gm.height));
 }
 while (tabArray[tabArrayLen])
 tabArrayLen++;
 QRectF rb;
 QRectF rr(rect);
-qt_format_text(QFont(d), rr, flags | Qt::TextDontPrint, text, &rb, tabStops, tabArray,
+qt_format_text(QFont(d.data()), rr, flags | Qt::TextDontPrint, text, &rb, tabStops, tabArray,
 tabArrayLen, 0);
 return rb.toAlignedRect();
 }
 QRect QFontMetrics::tightBoundingRect(const QString &text) const
 {
 if (text.length() == 0)
 return QRect();
-QTextEngine layout(text, d);
+QTextEngine layout(text, d.data());
 layout.ignoreBidi = true;
 layout.itemize();
 glyph_metrics_t gm = layout.tightBoundingBox(0, text.length());
 return QRect(qRound(gm.x), qRound(gm.y), qRound(gm.width), qRound(gm.height));
 }
 posA = posB + 1;
 posB = _text.indexOf(QLatin1Char('\x9c'), posA);
 }
 _text = _text.mid(posA);
 }
-QStackTextEngine engine(_text, QFont(d));
+QStackTextEngine engine(_text, QFont(d.data()));
 return engine.elidedText(mode, width, flags);
 }
 /*!
 Returns the distance from the base line to where an underscore
 Constructs a font metrics object with floating point precision
 from the given \a fontMetrics object.
 */
 QFontMetricsF::QFontMetricsF(const QFontMetrics &fontMetrics)
-: d(fontMetrics.d)
+: d(fontMetrics.d.data())
 {
-d->ref.ref();
 }
 /*!
 \since 4.2
 Assigns \a other to this object.
 */
 QFontMetricsF &QFontMetricsF::operator=(const QFontMetrics &other)
 {
-qAtomicAssign(d, other.d);
+d = other.d.data();
 return *this;
 }
 /*!
 Constructs a font metrics object for \a font.
 metrics that are compatible with a certain paint device.
 */
 QFontMetricsF::QFontMetricsF(const QFont &font)
 : d(font.d.data())
 {
-d->ref.ref();
 }
 /*!
 Constructs a font metrics object for \a font and \a paintdevice.
 d = new QFontPrivate(*font.d);
 d->dpi = dpi;
 d->screen = screen;
 } else {
 d = font.d.data();
-d->ref.ref();
 }
 }
 /*!
 Constructs a copy of \a fm.
 */
 QFontMetricsF::QFontMetricsF(const QFontMetricsF &fm)
-: d(fm.d)
+: d(fm.d.data())
-{ d->ref.ref(); }
+{
+}
 /*!
 Destroys the font metrics object and frees all allocated
 resources.
 */
 QFontMetricsF::~QFontMetricsF()
 {
-if (!d->ref.deref())
-delete d;
 }
 /*!
 Assigns the font metrics \a fm to this font metrics object.
 */
 QFontMetricsF &QFontMetricsF::operator=(const QFontMetricsF &fm)
 {
-qAtomicAssign(d, fm.d);
+d = fm.d.data();
 return *this;
 }
 /*!
 \overload
 \sa boundingRect()
 */
 qreal QFontMetricsF::width(const QString &text) const
 {
-QTextEngine layout(text, d);
+int pos = text.indexOf(QLatin1Char('\x9c'));
+int len = (pos != -1) ? pos : text.length();
+QTextEngine layout(text, d.data());
 layout.ignoreBidi = true;
 layout.itemize();
-return layout.width(0, text.length()).toReal();
+return layout.width(0, len).toReal();
 }
 /*!
 \overload
 {
 int len = text.length();
 if (len == 0)
 return QRectF();
-QTextEngine layout(text, d);
+QTextEngine layout(text, d.data());
 layout.ignoreBidi = true;
 layout.itemize();
 glyph_metrics_t gm = layout.boundingBox(0, len);
 return QRectF(gm.x.toReal(), gm.y.toReal(),
 gm.width.toReal(), gm.height.toReal());
 if (tabArray)
 while (tabArray[tabArrayLen])
 tabArrayLen++;
 QRectF rb;
-qt_format_text(QFont(d), rect, flags | Qt::TextDontPrint, text, &rb, tabStops, tabArray,
+qt_format_text(QFont(d.data()), rect, flags | Qt::TextDontPrint, text, &rb, tabStops, tabArray,
 tabArrayLen, 0);
 return rb;
 }
 /*!
 \sa boundingRect()
 */
 QSizeF QFontMetricsF::size(int flags, const QString &text, int tabStops, int *tabArray) const
 {
-return boundingRect(QRectF(), flags, text, tabStops, tabArray).size();
+return boundingRect(QRectF(), flags | Qt::TextLongestVariant, text, tabStops, tabArray).size();
 }
 /*!
 \since 4.3
 QRectF QFontMetricsF::tightBoundingRect(const QString &text) const
 {
 if (text.length() == 0)
 return QRect();
-QTextEngine layout(text, d);
+QTextEngine layout(text, d.data());
 layout.ignoreBidi = true;
 layout.itemize();
 glyph_metrics_t gm = layout.tightBoundingBox(0, text.length());
 return QRectF(gm.x.toReal(), gm.y.toReal(), gm.width.toReal(), gm.height.toReal());
 }
 The \a flags argument is optional and currently only supports
 Qt::TextShowMnemonic as value.
 */
 QString QFontMetricsF::elidedText(const QString &text, Qt::TextElideMode mode, qreal width, int flags) const
 {
-QStackTextEngine engine(text, QFont(d));
+QString _text = text;
+if (!(flags & Qt::TextLongestVariant)) {
+int posA = 0;
+int posB = _text.indexOf(QLatin1Char('\x9c'));
+while (posB >= 0) {
+QString portion = _text.mid(posA, posB - posA);
+if (size(flags, portion).width() <= width)
+return portion;
+posA = posB + 1;
+posB = _text.indexOf(QLatin1Char('\x9c'), posA);
+}
+_text = _text.mid(posA);
+}
+QStackTextEngine engine(_text, QFont(d.data()));
 return engine.elidedText(mode, QFixed::fromReal(width), flags);
 }
 /*!
 Returns the distance from the base line to where an underscore

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