equal
deleted
inserted
replaced
854 |
854 |
855 x += si.width; |
855 x += si.width; |
856 } |
856 } |
857 } |
857 } |
858 |
858 |
859 extern int qt_defaultDpiY(); // in qfont.cpp |
859 Q_GUI_EXPORT extern int qt_defaultDpiY(); // in qfont.cpp |
860 |
860 |
861 void QTextEngine::shapeText(int item) const |
861 void QTextEngine::shapeText(int item) const |
862 { |
862 { |
863 Q_ASSERT(item < layoutData->items.size()); |
863 Q_ASSERT(item < layoutData->items.size()); |
864 QScriptItem &si = layoutData->items[item]; |
864 QScriptItem &si = layoutData->items[item]; |
1646 gm.xoff += m.xoff; |
1646 gm.xoff += m.xoff; |
1647 gm.yoff += m.yoff; |
1647 gm.yoff += m.yoff; |
1648 } |
1648 } |
1649 } |
1649 } |
1650 |
1650 |
1651 glyph_t glyph = glyphs.glyphs[logClusters[pos + ilen - 1]]; |
1651 glyph_t glyph = glyphs.glyphs[logClusters[ilen - 1]]; |
1652 glyph_metrics_t gi = fe->boundingBox(glyph); |
1652 glyph_metrics_t gi = fe->boundingBox(glyph); |
1653 if (gi.isValid()) |
1653 if (gi.isValid()) |
1654 gm.width -= qRound(gi.xoff - gi.x - gi.width); |
1654 gm.width -= qRound(gi.xoff - gi.x - gi.width); |
1655 } |
1655 } |
1656 } |
1656 } |
2493 } |
2493 } |
2494 |
2494 |
2495 // qDebug("split at position %d itempos=%d", pos, item); |
2495 // qDebug("split at position %d itempos=%d", pos, item); |
2496 } |
2496 } |
2497 |
2497 |
2498 extern int qt_defaultDpiY(); |
2498 Q_GUI_EXPORT extern int qt_defaultDpiY(); |
2499 |
2499 |
2500 QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const |
2500 QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const |
2501 { |
2501 { |
2502 const QScriptItem &si = layoutData->items[item]; |
2502 const QScriptItem &si = layoutData->items[item]; |
2503 |
2503 |