revert some of the changes from 48a45d0c

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index d3ce567..9332e7c 100644 (file)
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2647,17 +2647,61 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, const QFixed &width, int
     return layoutData->string;
 }
 
+namespace {
+struct QScriptItemComparator {
+    bool operator()(const QScriptItem &a, const QScriptItem &b) { return a.position < b.position; }
+    bool operator()(int p, const QScriptItem &b) { return p < b.position; }
+    //bool operator()(const QScriptItem &a, int p) { return a.position < p; }
+};
+}
+
 void QTextEngine::setBoundary(int strPos) const
 {
-    const int item = findItem(strPos);
-    if (item < 0)
+    if (strPos <= 0 || strPos >= layoutData->string.length())
         return;
 
-    QScriptItem newItem = layoutData->items.at(item);
-    if (newItem.position != strPos) {
-        newItem.position = strPos;
-        layoutData->items.insert(item + 1, newItem);
+    const QScriptItem* it = qUpperBound(layoutData->items.constBegin(), layoutData->items.constEnd(),
+                                        strPos, QScriptItemComparator());
+    Q_ASSERT(it > layoutData->items.constBegin());
+    --it;
+    if (it->position == strPos) {
+        // already a split at the requested position
+        return;
     }
+    splitItem(it - layoutData->items.constBegin(), strPos - it->position);
+}
+
+void QTextEngine::splitItem(int item, int pos) const
+{
+    if (pos <= 0)
+        return;
+
+    layoutData->items.insert(item + 1, layoutData->items[item]);
+    QScriptItem &oldItem = layoutData->items[item];
+    QScriptItem &newItem = layoutData->items[item+1];
+    newItem.position += pos;
+
+    if (oldItem.num_glyphs) {
+        // already shaped, break glyphs aswell
+        int breakGlyph = logClusters(&oldItem)[pos];
+
+        newItem.num_glyphs = oldItem.num_glyphs - breakGlyph;
+        oldItem.num_glyphs = breakGlyph;
+        newItem.glyph_data_offset = oldItem.glyph_data_offset + breakGlyph;
+
+        for (int i = 0; i < newItem.num_glyphs; i++)
+            logClusters(&newItem)[i] -= breakGlyph;
+
+        QFixed w = 0;
+        const QGlyphLayout g = shapedGlyphs(&oldItem);
+        for(int j = 0; j < breakGlyph; ++j)
+            w += g.advances_x[j] * !g.attributes[j].dontPrint;
+
+        newItem.width = oldItem.width - w;
+        oldItem.width = w;
+    }
+
+//     qDebug("split at position %d itempos=%d", pos, item);
 }
 
 QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const

diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 886d189..abedf29 100644 (file)
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -618,6 +618,7 @@ private:
 #if defined(Q_WS_MAC)
     void shapeTextMac(int item) const;
 #endif
+    void splitItem(int item, int pos) const;
 
     void resolveAdditionalFormats() const;
     int endOfLine(int lineNum);