Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

5 files changed, 37 insertions, 14 deletions

diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index b2254c4826..078e16574f 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -1335,6 +1335,15 @@ QByteArray QFontEngine::convertToPostscriptFontFamilyName(const QByteArray &fami
     return f;
 }
 
+/**
+ * Some font engines like the windows font engine
+ * can not reliable create outline paths
+ */
+bool QFontEngine::hasUnreliableGlyphOutline() const
+{
+    return false;
+}
+
 QFixed QFontEngine::lastRightBearing(const QGlyphLayout &glyphs, bool round)
 {
     if (glyphs.numGlyphs >= 1) {
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index fe38755ffd..f5ca559d62 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -450,6 +450,7 @@ static void scaleOutline(FT_Face face, FT_GlyphSlot g, FT_Fixed x_scale, FT_Fixe
     }
 }
 
+#define GLYPH2PATH_DEBUG QT_NO_QDEBUG_MACRO // qDebug
 void QFreetypeFace::addGlyphToPath(FT_Face face, FT_GlyphSlot g, const QFixedPoint &point, QPainterPath *path, FT_Fixed x_scale, FT_Fixed y_scale)
 {
     const qreal factor = 1/64.;
@@ -461,22 +462,32 @@ void QFreetypeFace::addGlyphToPath(FT_Face face, FT_GlyphSlot g, const QFixedPoi
     int i = 0;
     for (int j = 0; j < g->outline.n_contours; ++j) {
         int last_point = g->outline.contours[j];
-        QPointF start = cp + QPointF(g->outline.points[i].x*factor, -g->outline.points[i].y*factor);
-        if(!(g->outline.tags[i] & 1)) {
-            start += cp + QPointF(g->outline.points[last_point].x*factor, -g->outline.points[last_point].y*factor);
-            start /= 2;
+        GLYPH2PATH_DEBUG() << "contour:" << i << "to" << last_point;
+        QPointF start = QPointF(g->outline.points[i].x*factor, -g->outline.points[i].y*factor);
+        if (!(g->outline.tags[i] & 1)) {               // start point is not on curve:
+            if (!(g->outline.tags[last_point] & 1)) {  // end point is not on curve:
+                GLYPH2PATH_DEBUG() << "  start and end point are not on curve";
+                start = (QPointF(g->outline.points[last_point].x*factor,
+                                -g->outline.points[last_point].y*factor) + start) / 2.0;
+            } else {
+                GLYPH2PATH_DEBUG() << "  end point is on curve, start is not";
+                start = QPointF(g->outline.points[last_point].x*factor,
+                               -g->outline.points[last_point].y*factor);
+            }
+            --i;   // to use original start point as control point below
         }
-//         qDebug("contour: %d -- %d", i, g->outline.contours[j]);
-//         qDebug("first point at %f %f", start.x(), start.y());
-        path->moveTo(start);
+        start += cp;
+        GLYPH2PATH_DEBUG() << "  start at" << start;
 
+        path->moveTo(start);
         QPointF c[4];
         c[0] = start;
         int n = 1;
         while (i < last_point) {
             ++i;
             c[n] = cp + QPointF(g->outline.points[i].x*factor, -g->outline.points[i].y*factor);
-//             qDebug() << "    i=" << i << " flag=" << (int)g->outline.tags[i] << "point=" << c[n];
+            GLYPH2PATH_DEBUG() << "    " << i << c[n] << "tag =" << (int)g->outline.tags[i]
+                               << ": on curve =" << (bool)(g->outline.tags[i] & 1);
             ++n;
             switch (g->outline.tags[i] & 3) {
             case 2:
@@ -498,7 +509,7 @@ void QFreetypeFace::addGlyphToPath(FT_Face face, FT_GlyphSlot g, const QFixedPoi
             case 1:
             case 3:
                 if (n == 2) {
-//                     qDebug() << "lineTo" << c[1];
+                    GLYPH2PATH_DEBUG() << "  lineTo" << c[1];
                     path->lineTo(c[1]);
                     c[0] = c[1];
                     n = 1;
@@ -510,13 +521,14 @@ void QFreetypeFace::addGlyphToPath(FT_Face face, FT_GlyphSlot g, const QFixedPoi
                 }
                 break;
             }
-//             qDebug() << "cubicTo" << c[1] << c[2] << c[3];
+            GLYPH2PATH_DEBUG() << "  cubicTo" << c[1] << c[2] << c[3];
             path->cubicTo(c[1], c[2], c[3]);
             c[0] = c[3];
             n = 1;
         }
+
         if (n == 1) {
-//             qDebug() << "closeSubpath";
+            GLYPH2PATH_DEBUG() << "  closeSubpath";
             path->closeSubpath();
         } else {
             c[3] = start;
@@ -524,7 +536,7 @@ void QFreetypeFace::addGlyphToPath(FT_Face face, FT_GlyphSlot g, const QFixedPoi
                 c[2] = (2*c[1] + c[3])/3;
                 c[1] = (2*c[1] + c[0])/3;
             }
-//             qDebug() << "cubicTo" << c[1] << c[2] << c[3];
+            GLYPH2PATH_DEBUG() << "  close cubicTo" << c[1] << c[2] << c[3];
             path->cubicTo(c[1], c[2], c[3]);
         }
         ++i;
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 5e40abbda6..fc849d788f 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -251,6 +251,8 @@ public:
 
     static QByteArray convertToPostscriptFontFamilyName(const QByteArray &fontFamily);
 
+    virtual bool hasUnreliableGlyphOutline() const;
+
     enum HintStyle {
         HintNone,
         HintLight,
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index ac9762b183..731b6adde8 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -132,7 +132,7 @@ QTextCursorPrivate::AdjustResult QTextCursorPrivate::adjustPosition(int position
 
 void QTextCursorPrivate::setX()
 {
-    if (priv->isInEditBlock()) {
+    if (priv->isInEditBlock() || priv->inContentsChange) {
         x = -1; // mark dirty
         return;
     }
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 34788dc4dc..67dedca760 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2057,7 +2057,7 @@ void QTextEngine::justify(const QScriptLine &line)
     // subtract one char more, as we can't justfy after the last character
     --line_length;
 
-    if (!line_length)
+    if (line_length <= 0)
         return;
 
     int firstItem = findItem(line.from);