Fix horizontal centered text drawing without word wrap

In this case we can't use line width to align the text, we have to
use the rectangle width given in QPainter::drawText for alignment
instead.

Reviewed-by: Eskil

1 files changed, 12 insertions, 5 deletions

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 14fb772..64ef549 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -8149,10 +8149,6 @@ start_lengthVariant:
     engine.option.setTextDirection(layout_direction);
     if (tf & Qt::AlignJustify)
         engine.option.setAlignment(Qt::AlignJustify);
-    else if (tf & Qt::AlignRight)
-        engine.option.setAlignment(Qt::AlignRight);
-    else if (tf & Qt::AlignHCenter)
-        engine.option.setAlignment(Qt::AlignHCenter);
     else
         engine.option.setAlignment(Qt::AlignLeft); // do not do alignment twice
 
@@ -8248,7 +8244,18 @@ start_lengthVariant:
 
         for (int i = 0; i < textLayout.lineCount(); i++) {
             QTextLine line = textLayout.lineAt(i);
-            line.draw(painter, QPointF(r.x(), r.y() + yoff));
+
+            qreal advance = line.horizontalAdvance();
+            xoff = 0;
+            if (tf & Qt::AlignRight) {
+                QTextEngine *eng = textLayout.engine();
+                xoff = r.width() - advance -
+                    eng->leadingSpaceWidth(eng->lines[line.lineNumber()]).toReal();
+            }
+            else if (tf & Qt::AlignHCenter)
+                xoff = (r.width() - advance) / 2;
+
+            line.draw(painter, QPointF(r.x() + xoff, r.y() + yoff));
         }
 
         if (restore) {